diff --git a/app/Api/V1/Controllers/TransactionController.php b/app/Api/V1/Controllers/TransactionController.php index 91210a8525..9df8330527 100644 --- a/app/Api/V1/Controllers/TransactionController.php +++ b/app/Api/V1/Controllers/TransactionController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Api\V1\Controllers; use FireflyIII\Api\V1\Requests\TransactionRequest; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -108,8 +108,8 @@ class TransactionController extends Controller /** @var User $admin */ $admin = auth()->user(); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($admin); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); @@ -123,7 +123,7 @@ class TransactionController extends Controller } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); $collector->setTypes($types); - $paginator = $collector->getPaginatedJournals(); + $paginator = $collector->getPaginatedTransactions(); $paginator->setPath(route('api.v1.transactions.index') . $this->buildParams()); $transactions = $paginator->getCollection(); @@ -155,7 +155,7 @@ class TransactionController extends Controller $manager->parseIncludes($include); // collect transactions using the journal collector - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. @@ -170,7 +170,7 @@ class TransactionController extends Controller $collector->addFilter(NegativeAmountFilter::class); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); @@ -201,7 +201,7 @@ class TransactionController extends Controller $manager->parseIncludes($include); // collect transactions using the journal collector - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. @@ -216,7 +216,7 @@ class TransactionController extends Controller $collector->addFilter(NegativeAmountFilter::class); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); @@ -247,7 +247,7 @@ class TransactionController extends Controller // needs a lot of extra data to match the journal collector. Or just expand that one. // collect transactions using the journal collector - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. @@ -262,7 +262,7 @@ class TransactionController extends Controller $collector->addFilter(NegativeAmountFilter::class); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $resource = new FractalCollection($transactions, new TransactionTransformer($this->parameters), 'transactions'); return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json'); diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php index 2c15573719..1734713aa0 100644 --- a/app/Export/ExpandedProcessor.php +++ b/app/Export/ExpandedProcessor.php @@ -32,7 +32,7 @@ use FireflyIII\Export\Collector\AttachmentCollector; use FireflyIII\Export\Collector\UploadCollector; use FireflyIII\Export\Entry\Entry; use FireflyIII\Export\Exporter\ExporterInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\AccountMeta; use FireflyIII\Models\ExportJob; @@ -107,13 +107,13 @@ class ExpandedProcessor implements ProcessorInterface public function collectJournals(): bool { // use journal collector thing. - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->job->user); $collector->setAccounts($this->accounts)->setRange($this->settings['startDate'], $this->settings['endDate']) ->withOpposingAccount()->withBudgetInformation()->withCategoryInformation() ->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // get some more meta data for each entry: $ids = $transactions->pluck('journal_id')->toArray(); $assetIds = $transactions->pluck('account_id')->toArray(); diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index 3dcaa08952..5a68b7e41f 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -28,7 +28,7 @@ namespace FireflyIII\Generator\Report\Audit; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Generator\Report\ReportGeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -201,10 +201,10 @@ class MonthReportGenerator implements ReportGeneratorInterface $accountRepository = app(AccountRepositoryInterface::class); $accountRepository->setUser($account->user); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($this->start, $this->end); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $journals = $journals->reverse(); $dayBeforeBalance = app('steam')->balance($account, $date); $startBalance = $dayBeforeBalance; diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index f613fd8f84..dcda49ed7a 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -27,7 +27,7 @@ namespace FireflyIII\Generator\Report\Budget; use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; use FireflyIII\Helpers\Filter\TransferFilter; @@ -196,8 +196,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this->expenses; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL]) ->setBudgets($this->budgets)->withOpposingAccount(); @@ -206,7 +206,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $this->expenses = $transactions; return $transactions; diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index d454d85dd8..02fa859ca8 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -27,7 +27,7 @@ namespace FireflyIII\Generator\Report\Category; use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -209,8 +209,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this->expenses; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount(); @@ -219,7 +219,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $this->expenses = $transactions; return $transactions; @@ -236,8 +236,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this->income; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($this->categories)->withOpposingAccount(); @@ -245,7 +245,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(NegativeAmountFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $this->income = $transactions; return $transactions; diff --git a/app/Generator/Report/Tag/MonthReportGenerator.php b/app/Generator/Report/Tag/MonthReportGenerator.php index 1b1294583c..0c83883786 100644 --- a/app/Generator/Report/Tag/MonthReportGenerator.php +++ b/app/Generator/Report/Tag/MonthReportGenerator.php @@ -28,7 +28,7 @@ namespace FireflyIII\Generator\Report\Tag; use Carbon\Carbon; use FireflyIII\Generator\Report\ReportGeneratorInterface; use FireflyIII\Generator\Report\Support; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -207,8 +207,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this->expenses; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setTags($this->tags)->withOpposingAccount(); @@ -217,7 +217,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $this->expenses = $transactions; @@ -235,8 +235,8 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $this->income; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setTags($this->tags)->withOpposingAccount(); @@ -244,7 +244,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(NegativeAmountFilter::class); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $this->income = $transactions; return $transactions; diff --git a/app/Helpers/Chart/MetaPieChart.php b/app/Helpers/Chart/MetaPieChart.php index f1082cda43..f60fe020a6 100644 --- a/app/Helpers/Chart/MetaPieChart.php +++ b/app/Helpers/Chart/MetaPieChart.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Helpers\Chart; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -108,12 +108,12 @@ class MetaPieChart implements MetaPieChartInterface // also collect all other transactions if ($this->collectOtherObjects && 'expense' === $direction) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::WITHDRAWAL]); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $sum = (string)$journals->sum('transaction_amount'); $sum = bcmul($sum, '-1'); $sum = bcsub($sum, $this->total); @@ -121,11 +121,11 @@ class MetaPieChart implements MetaPieChartInterface } if ($this->collectOtherObjects && 'income' === $direction) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->start, $this->end)->setTypes([TransactionType::DEPOSIT]); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $sum = (string)$journals->sum('transaction_amount'); $sum = bcsub($sum, $this->total); $chartData[$key] = $sum; @@ -271,8 +271,8 @@ class MetaPieChart implements MetaPieChartInterface */ protected function getTransactions(string $direction): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $types = [TransactionType::DEPOSIT, TransactionType::TRANSFER]; $collector->addFilter(NegativeAmountFilter::class); if ('expense' === $direction) { @@ -304,7 +304,7 @@ class MetaPieChart implements MetaPieChartInterface // @codeCoverageIgnoreEnd - return $collector->getJournals(); + return $collector->getTransactions(); } /** diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php deleted file mode 100644 index 26f481bdce..0000000000 --- a/app/Helpers/Collector/JournalCollector.php +++ /dev/null @@ -1,904 +0,0 @@ -. - */ -/** @noinspection PhpDynamicAsStaticMethodCallInspection */ -/** @noinspection PropertyCanBeStaticInspection */ -declare(strict_types=1); - -namespace FireflyIII\Helpers\Collector; - -use Carbon\Carbon; -use DB; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Filter\CountAttachmentsFilter; -use FireflyIII\Helpers\Filter\FilterInterface; -use FireflyIII\Helpers\Filter\InternalTransferFilter; -use FireflyIII\Helpers\Filter\NegativeAmountFilter; -use FireflyIII\Helpers\Filter\OpposingAccountFilter; -use FireflyIII\Helpers\Filter\PositiveAmountFilter; -use FireflyIII\Helpers\Filter\SplitIndicatorFilter; -use FireflyIII\Helpers\Filter\TransactionViewFilter; -use FireflyIII\Helpers\Filter\TransferFilter; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Category; -use FireflyIII\Models\Tag; -use FireflyIII\Models\Transaction; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Support\CacheProperties; -use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder as EloquentBuilder; -use Illuminate\Database\Query\JoinClause; -use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; -use Log; - -/** - * Maybe this is a good idea after all... - * - * Class JournalCollector - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - * - */ -class JournalCollector implements JournalCollectorInterface -{ - - /** @var array */ - private $accountIds = []; - /** @var int */ - private $count = 0; - - /** @var array */ - private $fields - = [ - 'transaction_journals.id as journal_id', - 'transaction_journals.description', - 'transaction_journals.date', - 'transaction_journals.encrypted', - 'transaction_journals.created_at', - 'transaction_journals.updated_at', - 'transaction_types.type as transaction_type_type', - 'transaction_journals.bill_id', - 'transaction_journals.updated_at', - 'bills.name as bill_name', - 'bills.name_encrypted as bill_name_encrypted', - - 'transactions.id as id', - 'transactions.description as transaction_description', - 'transactions.account_id', - 'transactions.reconciled', - 'transactions.identifier', - 'transactions.transaction_journal_id', - 'transactions.amount as transaction_amount', - 'transactions.transaction_currency_id as transaction_currency_id', - - 'transaction_currencies.code as transaction_currency_code', - 'transaction_currencies.symbol as transaction_currency_symbol', - 'transaction_currencies.decimal_places as transaction_currency_dp', - - 'transactions.foreign_amount as transaction_foreign_amount', - 'transactions.foreign_currency_id as foreign_currency_id', - - 'foreign_currencies.code as foreign_currency_code', - 'foreign_currencies.symbol as foreign_currency_symbol', - 'foreign_currencies.decimal_places as foreign_currency_dp', - - 'accounts.name as account_name', - 'accounts.encrypted as account_encrypted', - 'accounts.iban as account_iban', - 'account_types.type as account_type', - ]; - /** @var array */ - private $filters = [InternalTransferFilter::class]; - /** @var bool */ - private $ignoreCache = false; - /** @var bool */ - private $joinedBudget = false; - /** @var bool */ - private $joinedCategory = false; - /** @var bool */ - private $joinedOpposing = false; - /** @var bool */ - private $joinedTag = false; - /** @var int */ - private $limit; - /** @var int */ - private $offset; - /** @var int */ - private $page = 1; - /** @var EloquentBuilder */ - private $query; - /** @var bool */ - private $run = false; - /** @var User */ - private $user; - - /** - * @param string $filter - * - * @return JournalCollectorInterface - */ - public function addFilter(string $filter): JournalCollectorInterface - { - $interfaces = class_implements($filter); - if (\in_array(FilterInterface::class, $interfaces, true) && !\in_array($filter, $this->filters, true)) { - Log::debug(sprintf('Enabled filter %s', $filter)); - $this->filters[] = $filter; - } - - return $this; - } - - /** - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountIs(string $amount): JournalCollectorInterface - { - $this->query->where( - function (EloquentBuilder $q) use ($amount) { - $q->where('transactions.amount', $amount); - $q->orWhere('transactions.amount', bcmul($amount, '-1')); - } - ); - - return $this; - } - - /** - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountLess(string $amount): JournalCollectorInterface - { - $this->query->where( - function (EloquentBuilder $q1) use ($amount) { - $q1->where( - function (EloquentBuilder $q2) use ($amount) { - // amount < 0 and .amount > -$amount - $invertedAmount = bcmul($amount, '-1'); - $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '>', $invertedAmount); - } - ) - ->orWhere( - function (EloquentBuilder $q3) use ($amount) { - // amount > 0 and .amount < $amount - $q3->where('transactions.amount', '>', 0)->where('transactions.amount', '<', $amount); - } - ); - } - ); - - return $this; - } - - /** - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountMore(string $amount): JournalCollectorInterface - { - $this->query->where( - function (EloquentBuilder $q1) use ($amount) { - $q1->where( - function (EloquentBuilder $q2) use ($amount) { - // amount < 0 and .amount < -$amount - $invertedAmount = bcmul($amount, '-1'); - $q2->where('transactions.amount', '<', 0)->where('transactions.amount', '<', $invertedAmount); - } - ) - ->orWhere( - function (EloquentBuilder $q3) use ($amount) { - // amount > 0 and .amount > $amount - $q3->where('transactions.amount', '>', 0)->where('transactions.amount', '>', $amount); - } - ); - } - ); - - return $this; - } - - /** - * @return int - * - * @throws FireflyException - */ - public function count(): int - { - if (true === $this->run) { - throw new FireflyException('Cannot count after run in JournalCollector.'); - } - - $countQuery = clone $this->query; - - // dont need some fields: - $countQuery->getQuery()->limit = null; - $countQuery->getQuery()->offset = null; - $countQuery->getQuery()->unionLimit = null; - $countQuery->getQuery()->groups = null; - $countQuery->getQuery()->orders = null; - $countQuery->groupBy('accounts.user_id'); - $this->count = (int)$countQuery->count(); - - return $this->count; - } - - /** @noinspection MultipleReturnStatementsInspection */ - /** - * @return Collection - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - */ - public function getJournals(): Collection - { - $this->run = true; - - // find query set in cache. - $hash = hash('sha256', $this->query->toSql() . serialize($this->query->getBindings())); - $key = 'query-' . substr($hash, -8); - $cache = new CacheProperties; - $cache->addProperty($key); - foreach ($this->filters as $filter) { - $cache->addProperty((string)$filter); - } - if (false === $this->ignoreCache && $cache->has()) { - Log::debug(sprintf('Return cache of query with ID "%s".', $key)); - - return $cache->get(); // @codeCoverageIgnore - - } - /** @var Collection $set */ - $set = $this->query->get(array_values($this->fields)); - - // run all filters: - $set = $this->filter($set); - - // loop for decryption. - $set->each( - function (Transaction $transaction) { - $transaction->date = new Carbon($transaction->date); - $transaction->description = app('steam')->decrypt((int)$transaction->encrypted, $transaction->description); - - if (null !== $transaction->bill_name) { - $transaction->bill_name = app('steam')->decrypt((int)$transaction->bill_name_encrypted, $transaction->bill_name); - } - $transaction->account_name = app('steam')->tryDecrypt($transaction->account_name); - $transaction->opposing_account_name = app('steam')->tryDecrypt($transaction->opposing_account_name); - $transaction->account_iban = app('steam')->tryDecrypt($transaction->account_iban); - $transaction->opposing_account_iban = app('steam')->tryDecrypt($transaction->opposing_account_iban); - - // budget name - $transaction->transaction_journal_budget_name = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name); - $transaction->transaction_budget_name = app('steam')->tryDecrypt($transaction->transaction_budget_name); - // category name: - $transaction->transaction_journal_category_name = app('steam')->tryDecrypt($transaction->transaction_journal_category_name); - $transaction->transaction_category_name = app('steam')->tryDecrypt($transaction->transaction_category_name); - } - - ); - Log::debug(sprintf('Cached query with ID "%s".', $key)); - $cache->store($set); - - return $set; - } - - /** - * @return LengthAwarePaginator - * - * @throws FireflyException - */ - public function getPaginatedJournals(): LengthAwarePaginator - { - if (true === $this->run) { - throw new FireflyException('Cannot getPaginatedJournals after run in JournalCollector.'); - } - $this->count(); - $set = $this->getJournals(); - $journals = new LengthAwarePaginator($set, $this->count, $this->limit, $this->page); - - return $journals; - } - - /** - * @return EloquentBuilder - */ - public function getQuery(): EloquentBuilder - { - return $this->query; - } - - /** - * @return JournalCollectorInterface - */ - public function ignoreCache(): JournalCollectorInterface - { - $this->ignoreCache = true; - - return $this; - } - - /** - * @param string $filter - * - * @return JournalCollectorInterface - */ - public function removeFilter(string $filter): JournalCollectorInterface - { - $key = array_search($filter, $this->filters, true); - if (!(false === $key)) { - Log::debug(sprintf('Removed filter %s', $filter)); - unset($this->filters[$key]); - } - - return $this; - } - - /** - * @param Collection $accounts - * - * @return JournalCollectorInterface - */ - public function setAccounts(Collection $accounts): JournalCollectorInterface - { - if ($accounts->count() > 0) { - $accountIds = $accounts->pluck('id')->toArray(); - $this->query->whereIn('transactions.account_id', $accountIds); - Log::debug(sprintf('setAccounts: %s', implode(', ', $accountIds))); - $this->accountIds = $accountIds; - } - - if ($accounts->count() > 1) { - $this->addFilter(TransferFilter::class); - } - - return $this; - } - - /** - * @param Carbon $after - * - * @return JournalCollectorInterface - */ - public function setAfter(Carbon $after): JournalCollectorInterface - { - $afterStr = $after->format('Y-m-d 00:00:00'); - $this->query->where('transaction_journals.date', '>=', $afterStr); - Log::debug(sprintf('JournalCollector range is now after %s (inclusive)', $afterStr)); - - return $this; - } - - /** - * @return JournalCollectorInterface - */ - public function setAllAssetAccounts(): JournalCollectorInterface - { - /** @var AccountRepositoryInterface $repository */ - $repository = app(AccountRepositoryInterface::class); - $repository->setUser($this->user); - $accounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); - if ($accounts->count() > 0) { - $accountIds = $accounts->pluck('id')->toArray(); - $this->query->whereIn('transactions.account_id', $accountIds); - $this->accountIds = $accountIds; - } - - if ($accounts->count() > 1) { - $this->addFilter(TransferFilter::class); - } - - return $this; - } - - /** - * @param Carbon $before - * - * @return JournalCollectorInterface - */ - public function setBefore(Carbon $before): JournalCollectorInterface - { - $beforeStr = $before->format('Y-m-d 00:00:00'); - $this->query->where('transaction_journals.date', '<=', $beforeStr); - Log::debug(sprintf('JournalCollector range is now before %s (inclusive)', $beforeStr)); - - return $this; - } - - /** - * @param Collection $bills - * - * @return JournalCollectorInterface - */ - public function setBills(Collection $bills): JournalCollectorInterface - { - if ($bills->count() > 0) { - $billIds = $bills->pluck('id')->toArray(); - $this->query->whereIn('transaction_journals.bill_id', $billIds); - } - - return $this; - } - - /** - * @param Budget $budget - * - * @return JournalCollectorInterface - */ - public function setBudget(Budget $budget): JournalCollectorInterface - { - $this->joinBudgetTables(); - - $this->query->where( - function (EloquentBuilder $q) use ($budget) { - $q->where('budget_transaction.budget_id', $budget->id); - $q->orWhere('budget_transaction_journal.budget_id', $budget->id); - } - ); - - return $this; - } - - /** - * @param Collection $budgets - * - * @return JournalCollectorInterface - */ - public function setBudgets(Collection $budgets): JournalCollectorInterface - { - $budgetIds = $budgets->pluck('id')->toArray(); - if (0 !== \count($budgetIds)) { - $this->joinBudgetTables(); - Log::debug('Journal collector will filter for budgets', $budgetIds); - - $this->query->where( - function (EloquentBuilder $q) use ($budgetIds) { - $q->whereIn('budget_transaction.budget_id', $budgetIds); - $q->orWhereIn('budget_transaction_journal.budget_id', $budgetIds); - } - ); - } - - return $this; - } - - /** - * @param Collection $categories - * - * @return JournalCollectorInterface - */ - public function setCategories(Collection $categories): JournalCollectorInterface - { - $categoryIds = $categories->pluck('id')->toArray(); - if (0 !== \count($categoryIds)) { - $this->joinCategoryTables(); - - $this->query->where( - function (EloquentBuilder $q) use ($categoryIds) { - $q->whereIn('category_transaction.category_id', $categoryIds); - $q->orWhereIn('category_transaction_journal.category_id', $categoryIds); - } - ); - } - - return $this; - } - - /** - * @param Category $category - * - * @return JournalCollectorInterface - */ - public function setCategory(Category $category): JournalCollectorInterface - { - $this->joinCategoryTables(); - - $this->query->where( - function (EloquentBuilder $q) use ($category) { - $q->where('category_transaction.category_id', $category->id); - $q->orWhere('category_transaction_journal.category_id', $category->id); - } - ); - - return $this; - } - - /** - * @param Collection $journals - * - * @return JournalCollectorInterface - */ - public function setJournals(Collection $journals): JournalCollectorInterface - { - $ids = $journals->pluck('id')->toArray(); - $this->query->where( - function (EloquentBuilder $q) use ($ids) { - $q->whereIn('transaction_journals.id', $ids); - } - ); - - return $this; - } - - /** - * @param int $limit - * - * @return JournalCollectorInterface - */ - public function setLimit(int $limit): JournalCollectorInterface - { - $this->limit = $limit; - $this->query->limit($limit); - Log::debug(sprintf('Set limit to %d', $limit)); - - return $this; - } - - /** - * @param int $offset - * - * @return JournalCollectorInterface - */ - public function setOffset(int $offset): JournalCollectorInterface - { - $this->offset = $offset; - - return $this; - } - - /** - * @param Collection $accounts - * - * @return JournalCollectorInterface - */ - public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface - { - $this->withOpposingAccount(); - - $this->query->whereIn('opposing.account_id', $accounts->pluck('id')->toArray()); - - return $this; - } - - /** - * @param int $page - * - * @return JournalCollectorInterface - */ - public function setPage(int $page): JournalCollectorInterface - { - if ($page < 1) { - $page = 1; - } - - $this->page = $page; - - if ($page > 0) { - --$page; - } - Log::debug(sprintf('Page is %d', $page)); - - if (null !== $this->limit) { - $offset = ($this->limit * $page); - $this->offset = $offset; - $this->query->skip($offset); - Log::debug(sprintf('Changed offset to %d', $offset)); - } - - return $this; - } - - /** - * @param Carbon $start - * @param Carbon $end - * - * @return JournalCollectorInterface - */ - public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface - { - if ($start <= $end) { - $startStr = $start->format('Y-m-d 00:00:00'); - $endStr = $end->format('Y-m-d 23:59:59'); - $this->query->where('transaction_journals.date', '>=', $startStr); - $this->query->where('transaction_journals.date', '<=', $endStr); - Log::debug(sprintf('JournalCollector range is now %s - %s (inclusive)', $startStr, $endStr)); - } - - return $this; - } - - /** - * @param Tag $tag - * - * @return JournalCollectorInterface - */ - public function setTag(Tag $tag): JournalCollectorInterface - { - $this->joinTagTables(); - $this->query->where('tag_transaction_journal.tag_id', $tag->id); - - return $this; - } - - /** - * @param Collection $tags - * - * @return JournalCollectorInterface - */ - public function setTags(Collection $tags): JournalCollectorInterface - { - $this->joinTagTables(); - $tagIds = $tags->pluck('id')->toArray(); - $this->query->whereIn('tag_transaction_journal.tag_id', $tagIds); - - return $this; - } - - /** - * @param array $types - * - * @return JournalCollectorInterface - */ - public function setTypes(array $types): JournalCollectorInterface - { - if (\count($types) > 0) { - Log::debug('Set query collector types', $types); - $this->query->whereIn('transaction_types.type', $types); - } - - return $this; - } - - /** - * @param User $user - */ - public function setUser(User $user) - { - Log::debug(sprintf('Journal collector now collecting for user #%d', $user->id)); - $this->user = $user; - $this->startQuery(); - } - - /** - * - */ - public function startQuery(): void - { - Log::debug('journalCollector::startQuery'); - /** @var EloquentBuilder $query */ - $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') - ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id') - ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') - ->leftJoin('account_types', 'accounts.account_type_id', 'account_types.id') - ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transactions.transaction_currency_id') - ->leftJoin('transaction_currencies as foreign_currencies', 'foreign_currencies.id', 'transactions.foreign_currency_id') - ->whereNull('transactions.deleted_at') - ->whereNull('transaction_journals.deleted_at') - ->where('transaction_journals.user_id', $this->user->id) - ->orderBy('transaction_journals.date', 'DESC') - ->orderBy('transaction_journals.order', 'ASC') - ->orderBy('transaction_journals.id', 'DESC') - ->orderBy('transaction_journals.description', 'DESC') - ->orderBy('transactions.identifier', 'ASC') - ->orderBy('transactions.amount', 'DESC'); - - $this->query = $query; - } - - /** - * @return JournalCollectorInterface - */ - public function withBudgetInformation(): JournalCollectorInterface - { - $this->joinBudgetTables(); - - return $this; - } - - /** - * @return JournalCollectorInterface - */ - public function withCategoryInformation(): JournalCollectorInterface - { - $this->joinCategoryTables(); - - return $this; - } - - /** - * @return JournalCollectorInterface - */ - public function withOpposingAccount(): JournalCollectorInterface - { - $this->joinOpposingTables(); - - return $this; - } - - /** - * @return JournalCollectorInterface - */ - public function withoutBudget(): JournalCollectorInterface - { - $this->joinBudgetTables(); - - $this->query->where( - function (EloquentBuilder $q) { - $q->whereNull('budget_transaction.budget_id'); - $q->whereNull('budget_transaction_journal.budget_id'); - } - ); - - return $this; - } - - /** - * @return JournalCollectorInterface - */ - public function withoutCategory(): JournalCollectorInterface - { - $this->joinCategoryTables(); - - $this->query->where( - function (EloquentBuilder $q) { - $q->whereNull('category_transaction.category_id'); - $q->whereNull('category_transaction_journal.category_id'); - } - ); - - return $this; - } - - /** - * @param Collection $set - * - * @return Collection - */ - private function filter(Collection $set): Collection - { - // create all possible filters: - $filters = [ - InternalTransferFilter::class => new InternalTransferFilter($this->accountIds), - OpposingAccountFilter::class => new OpposingAccountFilter($this->accountIds), - TransferFilter::class => new TransferFilter, - PositiveAmountFilter::class => new PositiveAmountFilter, - NegativeAmountFilter::class => new NegativeAmountFilter, - SplitIndicatorFilter::class => new SplitIndicatorFilter, - CountAttachmentsFilter::class => new CountAttachmentsFilter, - TransactionViewFilter::class => new TransactionViewFilter, - ]; - Log::debug(sprintf('Will run %d filters on the set.', \count($this->filters))); - foreach ($this->filters as $enabled) { - if (isset($filters[$enabled])) { - Log::debug(sprintf('Before filter %s: %d', $enabled, $set->count())); - /** @var Collection $set */ - $set = $filters[$enabled]->filter($set); - Log::debug(sprintf('After filter %s: %d', $enabled, $set->count())); - } - } - - return $set; - } - - /** - * - */ - private function joinBudgetTables(): void - { - if (!$this->joinedBudget) { - // join some extra tables: - $this->joinedBudget = true; - $this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'); - $this->query->leftJoin('budgets as transaction_journal_budgets', 'transaction_journal_budgets.id', '=', 'budget_transaction_journal.budget_id'); - $this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id'); - $this->query->leftJoin('budgets as transaction_budgets', 'transaction_budgets.id', '=', 'budget_transaction.budget_id'); - $this->query->whereNull('transaction_journal_budgets.deleted_at'); - $this->query->whereNull('transaction_budgets.deleted_at'); - - $this->fields[] = 'budget_transaction_journal.budget_id as transaction_journal_budget_id'; - $this->fields[] = 'transaction_journal_budgets.encrypted as transaction_journal_budget_encrypted'; - $this->fields[] = 'transaction_journal_budgets.name as transaction_journal_budget_name'; - - $this->fields[] = 'budget_transaction.budget_id as transaction_budget_id'; - $this->fields[] = 'transaction_budgets.encrypted as transaction_budget_encrypted'; - $this->fields[] = 'transaction_budgets.name as transaction_budget_name'; - } - } - - /** - * - */ - private function joinCategoryTables(): void - { - if (!$this->joinedCategory) { - // join some extra tables: - $this->joinedCategory = true; - $this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'); - $this->query->leftJoin( - 'categories as transaction_journal_categories', - 'transaction_journal_categories.id', - '=', - 'category_transaction_journal.category_id' - ); - - $this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id'); - $this->query->leftJoin('categories as transaction_categories', 'transaction_categories.id', '=', 'category_transaction.category_id'); - $this->query->whereNull('transaction_journal_categories.deleted_at'); - $this->query->whereNull('transaction_categories.deleted_at'); - $this->fields[] = 'category_transaction_journal.category_id as transaction_journal_category_id'; - $this->fields[] = 'transaction_journal_categories.encrypted as transaction_journal_category_encrypted'; - $this->fields[] = 'transaction_journal_categories.name as transaction_journal_category_name'; - - $this->fields[] = 'category_transaction.category_id as transaction_category_id'; - $this->fields[] = 'transaction_categories.encrypted as transaction_category_encrypted'; - $this->fields[] = 'transaction_categories.name as transaction_category_name'; - } - } - - /** - * - */ - private function joinOpposingTables(): void - { - if (!$this->joinedOpposing) { - Log::debug('joinedOpposing is false'); - // join opposing transaction (hard): - $this->query->leftJoin( - 'transactions as opposing', - function (JoinClause $join) { - $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id') - ->where('opposing.identifier', '=', DB::raw('transactions.identifier')) - ->where('opposing.amount', '=', DB::raw('transactions.amount * -1')); - } - ); - $this->query->leftJoin('accounts as opposing_accounts', 'opposing.account_id', '=', 'opposing_accounts.id'); - $this->query->leftJoin('account_types as opposing_account_types', 'opposing_accounts.account_type_id', '=', 'opposing_account_types.id'); - $this->query->whereNull('opposing.deleted_at'); - - $this->fields[] = 'opposing.id as opposing_id'; - $this->fields[] = 'opposing.account_id as opposing_account_id'; - $this->fields[] = 'opposing_accounts.name as opposing_account_name'; - $this->fields[] = 'opposing_accounts.encrypted as opposing_account_encrypted'; - $this->fields[] = 'opposing_accounts.iban as opposing_account_iban'; - - $this->fields[] = 'opposing_account_types.type as opposing_account_type'; - $this->joinedOpposing = true; - Log::debug('joinedOpposing is now true!'); - } - } - - /** - * - */ - private function joinTagTables(): void - { - if (!$this->joinedTag) { - // join some extra tables: - $this->joinedTag = true; - $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id'); - } - } -} diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php deleted file mode 100644 index f3d3dbbb7b..0000000000 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ /dev/null @@ -1,329 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Helpers\Collector; - -use Carbon\Carbon; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Category; -use FireflyIII\Models\Tag; -use FireflyIII\User; -use Illuminate\Database\Eloquent\Builder as EloquentBuilder; -use Illuminate\Pagination\LengthAwarePaginator; -use Illuminate\Support\Collection; - -/** - * Interface JournalCollectorInterface. - */ -interface JournalCollectorInterface -{ - - /** - * Add a specific filter. - * - * @param string $filter - * - * @return JournalCollectorInterface - */ - public function addFilter(string $filter): JournalCollectorInterface; - - /** - * Get transactions with a specific amount. - * - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountIs(string $amount): JournalCollectorInterface; - - /** - * Get transactions where the amount is less than. - * - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountLess(string $amount): JournalCollectorInterface; - - /** - * Get transactions where the amount is more than. - * - * @param string $amount - * - * @return JournalCollectorInterface - */ - public function amountMore(string $amount): JournalCollectorInterface; - - /** - * Count the result. - * - * @return int - */ - public function count(): int; - - /** - * Get all journals. - * - * @return Collection - */ - public function getJournals(): Collection; - - /** - * Get a paginated result. - * - * @return LengthAwarePaginator - */ - public function getPaginatedJournals(): LengthAwarePaginator; - - /** - * Get the query. - * - * @return EloquentBuilder - */ - public function getQuery(): EloquentBuilder; - - /** - * Set to ignore the cache. - * - * @return JournalCollectorInterface - */ - public function ignoreCache(): JournalCollectorInterface; - - /** - * Remove a filter. - * - * @param string $filter - * - * @return JournalCollectorInterface - */ - public function removeFilter(string $filter): JournalCollectorInterface; - - /** - * Set the accounts to collect from. - * - * @param Collection $accounts - * - * @return JournalCollectorInterface - */ - public function setAccounts(Collection $accounts): JournalCollectorInterface; - - /** - * Collect journals after a specific date. - * - * @param Carbon $after - * - * @return JournalCollectorInterface - */ - public function setAfter(Carbon $after): JournalCollectorInterface; - - /** - * Include all asset accounts. - * - * @return JournalCollectorInterface - */ - public function setAllAssetAccounts(): JournalCollectorInterface; - - /** - * Collect journals before a specific date. - * - * @param Carbon $before - * - * @return JournalCollectorInterface - */ - public function setBefore(Carbon $before): JournalCollectorInterface; - - /** - * Set the bills to filter on. - * - * @param Collection $bills - * - * @return JournalCollectorInterface - */ - public function setBills(Collection $bills): JournalCollectorInterface; - - /** - * Set the budget to filter on. - * - * @param Budget $budget - * - * @return JournalCollectorInterface - */ - public function setBudget(Budget $budget): JournalCollectorInterface; - - /** - * Set the budgets to filter on. - * - * @param Collection $budgets - * - * @return JournalCollectorInterface - */ - public function setBudgets(Collection $budgets): JournalCollectorInterface; - - /** - * Set the categories to filter on. - * - * @param Collection $categories - * - * @return JournalCollectorInterface - */ - public function setCategories(Collection $categories): JournalCollectorInterface; - - /** - * Set the category to filter on. - * - * @param Category $category - * - * @return JournalCollectorInterface - */ - public function setCategory(Category $category): JournalCollectorInterface; - - /** - * Set the journals to filter on. - * - * @param Collection $journals - * - * @return JournalCollectorInterface - */ - public function setJournals(Collection $journals): JournalCollectorInterface; - - /** - * Set the page limit. - * - * @param int $limit - * - * @return JournalCollectorInterface - */ - public function setLimit(int $limit): JournalCollectorInterface; - - /** - * Set the offset. - * - * @param int $offset - * - * @return JournalCollectorInterface - */ - public function setOffset(int $offset): JournalCollectorInterface; - - /** - * Set the opposing accounts to collect from. - * - * @param Collection $accounts - * - * @return JournalCollectorInterface - */ - public function setOpposingAccounts(Collection $accounts): JournalCollectorInterface; - - /** - * Set the page to get. - * - * @param int $page - * - * @return JournalCollectorInterface - */ - public function setPage(int $page): JournalCollectorInterface; - - /** - * Set the date range. - * - * @param Carbon $start - * @param Carbon $end - * - * @return JournalCollectorInterface - */ - public function setRange(Carbon $start, Carbon $end): JournalCollectorInterface; - - /** - * Set the tag to collect from. - * - * @param Tag $tag - * - * @return JournalCollectorInterface - */ - public function setTag(Tag $tag): JournalCollectorInterface; - - /** - * Set the tags to collect from. - * - * @param Collection $tags - * - * @return JournalCollectorInterface - */ - public function setTags(Collection $tags): JournalCollectorInterface; - - /** - * Set the types to collect. - * - * @param array $types - * - * @return JournalCollectorInterface - */ - public function setTypes(array $types): JournalCollectorInterface; - - /** - * Set the user. - * - * @param User $user - * - * @return mixed - */ - public function setUser(User $user); - - /** - * Start the query. - */ - public function startQuery(); - - /** - * Include budget information. - * - * @return JournalCollectorInterface - */ - public function withBudgetInformation(): JournalCollectorInterface; - - /** - * Include category information. - * - * @return JournalCollectorInterface - */ - public function withCategoryInformation(): JournalCollectorInterface; - - /** - * Include opposing account information. - * - * @return JournalCollectorInterface - */ - public function withOpposingAccount(): JournalCollectorInterface; - - /** - * Include tranactions without a budget. - * - * @return JournalCollectorInterface - */ - public function withoutBudget(): JournalCollectorInterface; - - /** - * Include tranactions without a category. - * - * @return JournalCollectorInterface - */ - public function withoutCategory(): JournalCollectorInterface; -} diff --git a/app/Helpers/Collector/TransactionCollector.php b/app/Helpers/Collector/TransactionCollector.php index 3f4ca530a6..b397203fcd 100644 --- a/app/Helpers/Collector/TransactionCollector.php +++ b/app/Helpers/Collector/TransactionCollector.php @@ -223,7 +223,7 @@ class TransactionCollector implements TransactionCollectorInterface public function count(): int { if (true === $this->run) { - throw new FireflyException('Cannot count after run in JournalCollector.'); + throw new FireflyException('Cannot count after run in TransactionCollector.'); } $countQuery = clone $this->query; @@ -240,13 +240,10 @@ class TransactionCollector implements TransactionCollectorInterface return $this->count; } - /** @noinspection MultipleReturnStatementsInspection */ /** * @return Collection - * @SuppressWarnings(PHPMD.CyclomaticComplexity) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ - public function getJournals(): Collection + public function getTransactions(): Collection { $this->run = true; @@ -301,16 +298,15 @@ class TransactionCollector implements TransactionCollectorInterface /** * @return LengthAwarePaginator - * * @throws FireflyException */ - public function getPaginatedJournals(): LengthAwarePaginator + public function getPaginatedTransactions(): LengthAwarePaginator { if (true === $this->run) { - throw new FireflyException('Cannot getPaginatedJournals after run in JournalCollector.'); + throw new FireflyException('Cannot getPaginatedTransactions after run in TransactionCollector.'); } $this->count(); - $set = $this->getJournals(); + $set = $this->getTransactions(); $journals = new LengthAwarePaginator($set, $this->count, $this->limit, $this->page); return $journals; @@ -380,7 +376,7 @@ class TransactionCollector implements TransactionCollectorInterface { $afterStr = $after->format('Y-m-d 00:00:00'); $this->query->where('transaction_journals.date', '>=', $afterStr); - Log::debug(sprintf('JournalCollector range is now after %s (inclusive)', $afterStr)); + Log::debug(sprintf('TransactionCollector range is now after %s (inclusive)', $afterStr)); return $this; } @@ -416,7 +412,7 @@ class TransactionCollector implements TransactionCollectorInterface { $beforeStr = $before->format('Y-m-d 00:00:00'); $this->query->where('transaction_journals.date', '<=', $beforeStr); - Log::debug(sprintf('JournalCollector range is now before %s (inclusive)', $beforeStr)); + Log::debug(sprintf('TransactionCollector range is now before %s (inclusive)', $beforeStr)); return $this; } @@ -617,7 +613,7 @@ class TransactionCollector implements TransactionCollectorInterface $endStr = $end->format('Y-m-d 23:59:59'); $this->query->where('transaction_journals.date', '>=', $startStr); $this->query->where('transaction_journals.date', '<=', $endStr); - Log::debug(sprintf('JournalCollector range is now %s - %s (inclusive)', $startStr, $endStr)); + Log::debug(sprintf('TransactionCollector range is now %s - %s (inclusive)', $startStr, $endStr)); } return $this; @@ -680,7 +676,7 @@ class TransactionCollector implements TransactionCollectorInterface */ public function startQuery(): void { - Log::debug('journalCollector::startQuery'); + Log::debug('TransactionCollector::startQuery'); /** @var EloquentBuilder $query */ $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') diff --git a/app/Helpers/Collector/TransactionCollectorInterface.php b/app/Helpers/Collector/TransactionCollectorInterface.php index 4d690e74ba..ef42ffbc9c 100644 --- a/app/Helpers/Collector/TransactionCollectorInterface.php +++ b/app/Helpers/Collector/TransactionCollectorInterface.php @@ -83,18 +83,18 @@ interface TransactionCollectorInterface public function count(): int; /** - * Get all journals. + * Get all transactions. * * @return Collection */ - public function getJournals(): Collection; + public function getTransactions(): Collection; /** * Get a paginated result. * * @return LengthAwarePaginator */ - public function getPaginatedJournals(): LengthAwarePaginator; + public function getPaginatedTransactions(): LengthAwarePaginator; /** * Get the query. @@ -129,7 +129,7 @@ interface TransactionCollectorInterface public function setAccounts(Collection $accounts): TransactionCollectorInterface; /** - * Collect journals after a specific date. + * Collect transactions after a specific date. * * @param Carbon $after * @@ -145,7 +145,7 @@ interface TransactionCollectorInterface public function setAllAssetAccounts(): TransactionCollectorInterface; /** - * Collect journals before a specific date. + * Collect transactions before a specific date. * * @param Carbon $before * diff --git a/app/Helpers/Report/PopupReport.php b/app/Helpers/Report/PopupReport.php index c0dac93458..0448529e83 100644 --- a/app/Helpers/Report/PopupReport.php +++ b/app/Helpers/Report/PopupReport.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Helpers\Report; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Budget; use FireflyIII\Models\Category; @@ -47,11 +47,11 @@ class PopupReport implements PopupReportInterface */ public function balanceForBudget(Budget $budget, Account $account, array $attributes): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate'])->setBudget($budget); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -64,15 +64,15 @@ class PopupReport implements PopupReportInterface */ public function balanceForNoBudget(Account $account, array $attributes): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector ->setAccounts(new Collection([$account])) ->setTypes([TransactionType::WITHDRAWAL]) ->setRange($attributes['startDate'], $attributes['endDate']) ->withoutBudget(); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -85,8 +85,8 @@ class PopupReport implements PopupReportInterface */ public function byBudget(Budget $budget, array $attributes): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($attributes['accounts'])->setRange($attributes['startDate'], $attributes['endDate']); @@ -97,7 +97,7 @@ class PopupReport implements PopupReportInterface $collector->setBudget($budget); } - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -110,13 +110,13 @@ class PopupReport implements PopupReportInterface */ public function byCategory(Category $category, array $attributes): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($attributes['accounts'])->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setRange($attributes['startDate'], $attributes['endDate'])->withOpposingAccount() ->setCategory($category); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -133,12 +133,12 @@ class PopupReport implements PopupReportInterface $repository = app(JournalRepositoryInterface::class); $repository->setUser($account->user); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate']) ->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report @@ -169,11 +169,11 @@ class PopupReport implements PopupReportInterface /** @var JournalRepositoryInterface $repository */ $repository = app(JournalRepositoryInterface::class); $repository->setUser($account->user); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($attributes['startDate'], $attributes['endDate']) ->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $report = $attributes['accounts']->pluck('id')->toArray(); // accounts used in this report // filter the set so the destinations outside of $attributes['accounts'] are not included. diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php index 8f1cad60b1..7478874bd8 100644 --- a/app/Helpers/Report/ReportHelper.php +++ b/app/Helpers/Report/ReportHelper.php @@ -25,7 +25,7 @@ namespace FireflyIII\Helpers\Report; use Carbon\Carbon; use FireflyIII\Helpers\Collection\Bill as BillCollection; use FireflyIII\Helpers\Collection\BillLine; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\FiscalHelperInterface; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; @@ -83,10 +83,10 @@ class ReportHelper implements ReportHelperInterface foreach ($expectedDates as $payDate) { $endOfPayPeriod = app('navigation')->endOfX($payDate, $bill->repeat_freq, null); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($payDate, $endOfPayPeriod)->setBills($bills); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $billLine = new BillLine; $billLine->setBill($bill); diff --git a/app/Http/Controllers/Account/ShowController.php b/app/Http/Controllers/Account/ShowController.php index 5768320ee5..db7adc3e5f 100644 --- a/app/Http/Controllers/Account/ShowController.php +++ b/app/Http/Controllers/Account/ShowController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Account; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -114,11 +114,11 @@ class ShowController extends Controller $subTitle = (string)trans('firefly.journals_in_period_for_account', ['name' => $account->name, 'start' => $fStart, 'end' => $fEnd]); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $periods = $this->getAccountPeriodOverview($account, $end); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); $collector->setRange($start, $end); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('accounts.show', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')])); $showAll = false; @@ -157,10 +157,10 @@ class ShowController extends Controller } $subTitle = (string)trans('firefly.all_journals_for_account', ['name' => $account->name]); $periods = new Collection; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('accounts.show.all', [$account->id])); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); $showAll = true; diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 767d9cea49..539c2e2441 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -24,7 +24,7 @@ namespace FireflyIII\Http\Controllers; use Carbon\Carbon; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Requests\BillFormRequest; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -295,11 +295,11 @@ class BillController extends Controller $object = $manager->createData($resource)->toArray(); // use collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->setLimit($pageSize)->setPage($page)->withBudgetInformation() ->withCategoryInformation(); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('bills.show', [$bill->id])); diff --git a/app/Http/Controllers/Budget/AmountController.php b/app/Http/Controllers/Budget/AmountController.php index 0b9e223dd2..cccc4682cc 100644 --- a/app/Http/Controllers/Budget/AmountController.php +++ b/app/Http/Controllers/Budget/AmountController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Budget; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\BudgetIncomeRequest; use FireflyIII\Models\Budget; @@ -161,19 +161,19 @@ class AmountController extends Controller $available = bcmul($average, (string)$daysInPeriod); // amount earned in this period: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($searchBegin, $searchEnd)->setTypes([TransactionType::DEPOSIT])->withOpposingAccount(); - $earned = (string)$collector->getJournals()->sum('transaction_amount'); + $earned = (string)$collector->getTransactions()->sum('transaction_amount'); // Total amount earned divided by the number of days in the whole search period is the average amount earned per day. // This is multiplied by the number of days in the current period, showing you the average. $earnedAverage = bcmul(bcdiv($earned, (string)$daysInSearchPeriod), (string)$daysInPeriod); // amount spent in period - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($searchBegin, $searchEnd)->setTypes([TransactionType::WITHDRAWAL])->withOpposingAccount(); - $spent = (string)$collector->getJournals()->sum('transaction_amount'); + $spent = (string)$collector->getTransactions()->sum('transaction_amount'); $spentAverage = app('steam')->positive(bcmul(bcdiv($spent, (string)$daysInSearchPeriod), (string)$daysInPeriod)); // the default suggestion is the money the user has spent, on average, over this period. diff --git a/app/Http/Controllers/Budget/ShowController.php b/app/Http/Controllers/Budget/ShowController.php index 8aee78d8b7..7b0e62bffd 100644 --- a/app/Http/Controllers/Budget/ShowController.php +++ b/app/Http/Controllers/Budget/ShowController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Budget; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; @@ -92,11 +92,11 @@ class ShowController extends Controller $page = (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) ->withoutBudget()->withOpposingAccount(); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('budgets.no-budget')); return view('budgets.no-budget', compact('transactions', 'subTitle', 'periods', 'start', 'end')); @@ -121,11 +121,11 @@ class ShowController extends Controller $page = (int)$request->get('page'); $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setLimit($pageSize)->setPage($page) ->withoutBudget()->withOpposingAccount(); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('budgets.no-budget')); return view('budgets.no-budget', compact('transactions', 'subTitle', 'start', 'end')); @@ -151,10 +151,10 @@ class ShowController extends Controller $repetition = null; // collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('budgets.show', [$budget->id])); $subTitle = (string)trans('firefly.all_journals_for_budget', ['name' => $budget->name]); @@ -190,11 +190,11 @@ class ShowController extends Controller ); // collector: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($budgetLimit->start_date, $budgetLimit->end_date) ->setBudget($budget)->setLimit($pageSize)->setPage($page)->withBudgetInformation(); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('budgets.show', [$budget->id, $budgetLimit->id])); /** @var Carbon $start */ $start = session('first', Carbon::now()->startOfYear()); diff --git a/app/Http/Controllers/Category/NoCategoryController.php b/app/Http/Controllers/Category/NoCategoryController.php index 19ab68dd4e..1f438869e2 100644 --- a/app/Http/Controllers/Category/NoCategoryController.php +++ b/app/Http/Controllers/Category/NoCategoryController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Category; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\TransactionType; @@ -90,12 +90,12 @@ class NoCategoryController extends Controller Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d'))); Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d'))); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('categories.no-category')); return view('categories.no-category', compact('transactions', 'subTitle', 'periods', 'start', 'end')); @@ -125,12 +125,12 @@ class NoCategoryController extends Controller Log::debug(sprintf('Start for noCategory() is %s', $start->format('Y-m-d'))); Log::debug(sprintf('End for noCategory() is %s', $end->format('Y-m-d'))); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount() ->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath(route('categories.no-category')); return view('categories.no-category', compact('transactions', 'subTitle', 'periods', 'start', 'end')); @@ -172,36 +172,36 @@ class NoCategoryController extends Controller foreach ($dates as $date) { // count journals without category in this period: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() ->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $count = $collector->getJournals()->count(); + $count = $collector->getTransactions()->count(); // amount transferred - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory() ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); + $transferred = app('steam')->positive((string)$collector->getTransactions()->sum('transaction_amount')); // amount spent - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( [TransactionType::WITHDRAWAL] ); - $spent = $collector->getJournals()->sum('transaction_amount'); + $spent = $collector->getTransactions()->sum('transaction_amount'); // amount earned - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutCategory()->withOpposingAccount()->setTypes( [TransactionType::DEPOSIT] ); - $earned = $collector->getJournals()->sum('transaction_amount'); + $earned = $collector->getTransactions()->sum('transaction_amount'); /** @noinspection PhpUndefinedMethodInspection */ $dateStr = $date['end']->format('Y-m-d'); $dateName = app('navigation')->periodShow($date['end'], $date['period']); diff --git a/app/Http/Controllers/Category/ShowController.php b/app/Http/Controllers/Category/ShowController.php index e226c943ee..42826046e4 100644 --- a/app/Http/Controllers/Category/ShowController.php +++ b/app/Http/Controllers/Category/ShowController.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Category; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; @@ -102,12 +102,12 @@ class ShowController extends Controller 'end' => $end->formatLocalized($this->monthAndDayFormat),] ); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); Log::debug('End of show()'); @@ -141,12 +141,12 @@ class ShowController extends Controller $path = route('categories.show.all', [$category->id]); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->setCategory($category)->withBudgetInformation()->withCategoryInformation(); $collector->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); return view('categories.show', compact('category', 'transactions', 'periods', 'subTitle', 'subTitleIcon', 'start', 'end')); diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php index 024b5a0835..b9d6b00430 100644 --- a/app/Http/Controllers/Chart/AccountController.php +++ b/app/Http/Controllers/Chart/AccountController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -128,10 +128,10 @@ class AccountController extends Controller if ($cache->has()) { return response()->json($cache->get()); // @codeCoverageIgnore } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withBudgetInformation()->setTypes([TransactionType::WITHDRAWAL]); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $chartData = []; $result = []; @@ -192,10 +192,10 @@ class AccountController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::WITHDRAWAL]); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = []; $chartData = []; /** @var Transaction $transaction */ @@ -284,10 +284,10 @@ class AccountController extends Controller } // grab all journals: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->withCategoryInformation()->setTypes([TransactionType::DEPOSIT]); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = []; $chartData = []; /** @var Transaction $transaction */ diff --git a/app/Http/Controllers/Chart/BillController.php b/app/Http/Controllers/Chart/BillController.php index 55ea1819ff..c0477edcba 100644 --- a/app/Http/Controllers/Chart/BillController.php +++ b/app/Http/Controllers/Chart/BillController.php @@ -24,7 +24,7 @@ namespace FireflyIII\Http\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Bill; use FireflyIII\Models\Transaction; @@ -87,12 +87,12 @@ class BillController extends Controller /** * Shows overview for a single bill. * - * @param JournalCollectorInterface $collector + * @param TransactionCollectorInterface $collector * @param Bill $bill * * @return JsonResponse */ - public function single(JournalCollectorInterface $collector, Bill $bill): JsonResponse + public function single(TransactionCollectorInterface $collector, Bill $bill): JsonResponse { $cache = new CacheProperties; $cache->addProperty('chart.bill.single'); @@ -101,7 +101,7 @@ class BillController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getJournals(); + $results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getTransactions(); /** @var Collection $results */ $results = $results->sortBy( function (Transaction $transaction) { diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 3b3fe04310..41711ebf6a 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -25,7 +25,7 @@ namespace FireflyIII\Http\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; @@ -189,14 +189,14 @@ class BudgetController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setBudget($budget); if (null !== $budgetLimit) { $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = []; $chartData = []; /** @var Transaction $transaction */ @@ -239,14 +239,14 @@ class BudgetController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setBudget($budget)->withCategoryInformation(); if (null !== $budgetLimit) { $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = []; $chartData = []; /** @var Transaction $transaction */ @@ -290,14 +290,14 @@ class BudgetController extends Controller return response()->json($cache->get()); // @codeCoverageIgnore } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setTypes([TransactionType::WITHDRAWAL])->setBudget($budget)->withOpposingAccount(); if (null !== $budgetLimit) { $collector->setRange($budgetLimit->start_date, $budgetLimit->end_date); } - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = []; $chartData = []; /** @var Transaction $transaction */ @@ -597,11 +597,11 @@ class BudgetController extends Controller protected function spentInPeriodWithout(Carbon $start, Carbon $end): string // get data + augment with info { // collector - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $types = [TransactionType::WITHDRAWAL]; $collector->setAllAssetAccounts()->setTypes($types)->setRange($start, $end)->withoutBudget(); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $sum = '0'; /** @var Transaction $entry */ foreach ($journals as $entry) { diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c087184932..804deca82b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -24,7 +24,7 @@ namespace FireflyIII\Http\Controllers; use Carbon\Carbon; use FireflyIII\Events\RequestedVersionCheckStatus; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Middleware\Installer; use FireflyIII\Models\AccountType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -124,9 +124,9 @@ class HomeController extends Controller $billCount = $billRepository->getBills()->count(); foreach ($accounts as $account) { - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit(10)->setPage(1); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $transactions[] = [$set, $account]; } diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index a2b1aba242..d6c758bb0d 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -68,14 +68,14 @@ class AutoCompleteController extends Controller /** * List of all journals. * - * @param JournalCollectorInterface $collector + * @param TransactionCollectorInterface $collector * * @return JsonResponse */ - public function allTransactionJournals(JournalCollectorInterface $collector): JsonResponse + public function allTransactionJournals(TransactionCollectorInterface $collector): JsonResponse { $collector->setLimit(250)->setPage(1); - $return = array_unique($collector->getJournals()->pluck('description')->toArray()); + $return = array_unique($collector->getTransactions()->pluck('description')->toArray()); sort($return); return response()->json($return); @@ -173,12 +173,12 @@ class AutoCompleteController extends Controller /** * List of journals with their ID. * - * @param JournalCollectorInterface $collector + * @param TransactionCollectorInterface $collector * @param TransactionJournal $except * * @return JsonResponse */ - public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except): JsonResponse + public function journalsWithId(TransactionCollectorInterface $collector, TransactionJournal $except): JsonResponse { $cache = new CacheProperties; $cache->addProperty('recent-journals-id'); @@ -188,7 +188,7 @@ class AutoCompleteController extends Controller } $collector->setLimit(400)->setPage(1); - $set = $collector->getJournals()->pluck('description', 'journal_id')->toArray(); + $set = $collector->getTransactions()->pluck('description', 'journal_id')->toArray(); $return = []; foreach ($set as $id => $description) { $id = (int)$id; @@ -248,18 +248,18 @@ class AutoCompleteController extends Controller /** * List of journals by type. * - * @param JournalCollectorInterface $collector + * @param TransactionCollectorInterface $collector * @param string $what * * @return JsonResponse */ - public function transactionJournals(JournalCollectorInterface $collector, string $what): JsonResponse + public function transactionJournals(TransactionCollectorInterface $collector, string $what): JsonResponse { $type = config('firefly.transactionTypesByWhat.' . $what); $types = [$type]; $collector->setTypes($types)->setLimit(250)->setPage(1); - $return = array_unique($collector->getJournals()->pluck('description')->toArray()); + $return = array_unique($collector->getTransactions()->pluck('description')->toArray()); sort($return); return response()->json($return); diff --git a/app/Http/Controllers/Json/BoxController.php b/app/Http/Controllers/Json/BoxController.php index 6e162f4640..bbeba6146f 100644 --- a/app/Http/Controllers/Json/BoxController.php +++ b/app/Http/Controllers/Json/BoxController.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Json; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -132,12 +132,12 @@ class BoxController extends Controller $sums = []; // collect income of user: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end) ->setTypes([TransactionType::DEPOSIT]) ->withOpposingAccount(); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); /** @var Transaction $transaction */ foreach ($set as $transaction) { $currencyId = (int)$transaction->transaction_currency_id; @@ -148,12 +148,12 @@ class BoxController extends Controller } // collect expenses - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end) ->setTypes([TransactionType::WITHDRAWAL]) ->withOpposingAccount(); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); /** @var Transaction $transaction */ foreach ($set as $transaction) { $currencyId = (int)$transaction->transaction_currency_id; diff --git a/app/Http/Controllers/Json/ReconcileController.php b/app/Http/Controllers/Json/ReconcileController.php index 92a6aebfc5..87f0f62f3b 100644 --- a/app/Http/Controllers/Json/ReconcileController.php +++ b/app/Http/Controllers/Json/ReconcileController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers\Json; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -185,11 +185,11 @@ class ReconcileController extends Controller $selectionEnd->addDays(3); // grab transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account])) ->setRange($selectionStart, $selectionEnd)->withBudgetInformation()->withOpposingAccount()->withCategoryInformation(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); try { $html = view( 'accounts.reconcile.transactions', compact('account', 'transactions', 'currency', 'start', 'end', 'selectionStart', 'selectionEnd') diff --git a/app/Http/Controllers/Report/ExpenseController.php b/app/Http/Controllers/Report/ExpenseController.php index 62d4b738ed..2e2b3a9429 100644 --- a/app/Http/Controllers/Report/ExpenseController.php +++ b/app/Http/Controllers/Report/ExpenseController.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; @@ -259,11 +259,11 @@ class ExpenseController extends Controller $all = $all->merge($combi); } // get all expenses in period: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAccounts($accounts); $collector->setOpposingAccounts($all); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sorted = $set->sortBy( function (Transaction $transaction) { return (float)$transaction->transaction_amount; @@ -308,11 +308,11 @@ class ExpenseController extends Controller $all = $all->merge($combi); } // get all expenses in period: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAccounts($accounts); $collector->setOpposingAccounts($all); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sorted = $set->sortByDesc( function (Transaction $transaction) { return (float)$transaction->transaction_amount; @@ -347,11 +347,11 @@ class ExpenseController extends Controller */ protected function earnedByCategory(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAccounts($assets); $collector->setOpposingAccounts($opposing)->withCategoryInformation(); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = []; // loop to support multi currency foreach ($set as $transaction) { @@ -411,11 +411,11 @@ class ExpenseController extends Controller */ protected function earnedInPeriod(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAccounts($assets); $collector->setOpposingAccounts($opposing); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = [ 'grand_sum' => '0', 'per_currency' => [], @@ -458,11 +458,11 @@ class ExpenseController extends Controller */ protected function spentByBudget(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAccounts($assets); $collector->setOpposingAccounts($opposing)->withBudgetInformation(); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = []; // loop to support multi currency foreach ($set as $transaction) { @@ -525,11 +525,11 @@ class ExpenseController extends Controller */ protected function spentByCategory(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAccounts($assets); $collector->setOpposingAccounts($opposing)->withCategoryInformation(); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = []; // loop to support multi currency foreach ($set as $transaction) { @@ -589,11 +589,11 @@ class ExpenseController extends Controller */ protected function spentInPeriod(Collection $assets, Collection $opposing, Carbon $start, Carbon $end): array // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAccounts($assets); $collector->setOpposingAccounts($opposing); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = [ 'grand_sum' => '0', 'per_currency' => [], diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index e32cc3c384..a2731043dc 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Http\Requests\TagFormRequest; use FireflyIII\Models\Tag; @@ -195,11 +195,11 @@ class TagController extends Controller $periods = $this->getTagPeriodOverview($tag); $path = route('tags.show', [$tag->id, $start->format('Y-m-d'), $end->format('Y-m-d')]); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->setTag($tag)->withBudgetInformation()->withCategoryInformation()->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); $sums = $this->repository->sumsOfTag($tag, $start, $end); @@ -229,11 +229,11 @@ class TagController extends Controller $start = $this->repository->firstUseDate($tag) ?? new Carbon; $end = new Carbon; $path = route('tags.show', [$tag->id, 'all']); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->setTag($tag)->withBudgetInformation()->withCategoryInformation()->removeFilter(InternalTransferFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); $sums = $this->repository->sumsOfTag($tag, $start, $end); diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 9fdf5b8437..afd7c3bda1 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\TransactionViewFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\MassDeleteJournalRequest; @@ -141,13 +141,13 @@ class MassController extends Controller $this->rememberPreviousUri('transactions.mass-edit.uri'); $transformer = new TransactionTransformer(new ParameterBag); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals($journals); $collector->addFilter(TransactionViewFilter::class); - $collection = $collector->getJournals(); + $collection = $collector->getTransactions(); $transactions = $collection->map( function (Transaction $transaction) use ($transformer) { $transformed = $transformer->transform($transaction); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 96fea54c56..e6f19afc26 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -26,7 +26,7 @@ namespace FireflyIII\Http\Controllers; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\CountAttachmentsFilter; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Helpers\Filter\SplitIndicatorFilter; @@ -109,15 +109,15 @@ class TransactionController extends Controller $subTitle = (string)trans('firefly.title_' . $what . '_between', ['start' => $startStr, 'end' => $endStr]); $periods = $this->getTransactionPeriodOverview($what, $end); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end) ->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->withBudgetInformation()->withCategoryInformation(); $collector->removeFilter(InternalTransferFilter::class); $collector->addFilter(SplitIndicatorFilter::class); $collector->addFilter(CountAttachmentsFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'periods', 'start', 'end')); @@ -143,15 +143,15 @@ class TransactionController extends Controller $end = new Carbon; $subTitle = (string)trans('firefly.all_' . $what); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($start, $end) ->setTypes($types)->setLimit($pageSize)->setPage($page)->withOpposingAccount() ->withBudgetInformation()->withCategoryInformation(); $collector->removeFilter(InternalTransferFilter::class); $collector->addFilter(SplitIndicatorFilter::class); $collector->addFilter(CountAttachmentsFilter::class); - $transactions = $collector->getPaginatedJournals(); + $transactions = $collector->getPaginatedTransactions(); $transactions->setPath($path); return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'transactions', 'start', 'end')); @@ -229,12 +229,12 @@ class TransactionController extends Controller $links = $linkTypeRepository->getLinks($journal); // get transactions using the collector: - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. $collector->setJournals(new Collection([$journal])); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $transactions = []; $transformer = new TransactionTransformer(new ParameterBag); /** @var Transaction $transaction */ diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index ebe5eeb859..0caabbaa1e 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -28,7 +28,7 @@ use Carbon\Carbon; use DB; use FireflyIII\Events\RequestedReportOnJournals; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -226,7 +226,7 @@ class ImportArrayStorage private function getTransactionFromJournal($journal): Transaction { // collect transactions using the journal collector - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->importJob->user); $collector->withOpposingAccount(); // filter on specific journals. @@ -241,7 +241,7 @@ class ImportArrayStorage $collector->addFilter(NegativeAmountFilter::class); } /** @var Transaction $result */ - $result = $collector->getJournals()->first(); + $result = $collector->getTransactions()->first(); Log::debug(sprintf('Return transaction #%d with journal id #%d based on ID #%d', $result->id, $result->journal_id, $journal->id)); return $result; @@ -255,15 +255,15 @@ class ImportArrayStorage Log::debug('Now in getTransfers()'); app('preferences')->mark(); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->importJob->user); $collector->setAllAssetAccounts() ->ignoreCache() ->setTypes([TransactionType::TRANSFER]) ->withOpposingAccount(); $collector->removeFilter(InternalTransferFilter::class); - $this->transfers = $collector->getJournals(); + $this->transfers = $collector->getTransactions(); Log::debug(sprintf('Count of getTransfers() is %d', $this->transfers->count())); } diff --git a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php index f2676061f6..e0e43ca70a 100644 --- a/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleGroupOnExistingTransactions.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Jobs; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\RuleGroup; use FireflyIII\TransactionRules\Processor; use FireflyIII\User; @@ -174,12 +174,12 @@ class ExecuteRuleGroupOnExistingTransactions extends Job implements ShouldQueue */ protected function collectJournals(): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate); - return $collector->getJournals(); + return $collector->getTransactions(); } /** diff --git a/app/Jobs/ExecuteRuleOnExistingTransactions.php b/app/Jobs/ExecuteRuleOnExistingTransactions.php index 7cfea5706e..29b101035e 100644 --- a/app/Jobs/ExecuteRuleOnExistingTransactions.php +++ b/app/Jobs/ExecuteRuleOnExistingTransactions.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Jobs; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Rule; use FireflyIII\TransactionRules\Processor; use FireflyIII\User; @@ -192,11 +192,11 @@ class ExecuteRuleOnExistingTransactions extends Job implements ShouldQueue */ protected function collectJournals(): Collection { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setAccounts($this->accounts)->setRange($this->startDate, $this->endDate); - return $collector->getJournals(); + return $collector->getTransactions(); } } diff --git a/app/Providers/JournalServiceProvider.php b/app/Providers/JournalServiceProvider.php index e9f47fb414..89bec86527 100644 --- a/app/Providers/JournalServiceProvider.php +++ b/app/Providers/JournalServiceProvider.php @@ -22,8 +22,8 @@ declare(strict_types=1); namespace FireflyIII\Providers; -use FireflyIII\Helpers\Collector\JournalCollector; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollector; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Repositories\Journal\JournalRepository; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use Illuminate\Foundation\Application; @@ -57,10 +57,10 @@ class JournalServiceProvider extends ServiceProvider private function registerCollector(): void { $this->app->bind( - JournalCollectorInterface::class, + TransactionCollectorInterface::class, function (Application $app) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollector::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollector::class); if ($app->auth->check()) { $collector->setUser(auth()->user()); } diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 931b46747e..679369d7d7 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Account; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\User; @@ -108,12 +108,12 @@ class AccountTasker implements AccountTaskerInterface // get all expenses for the given accounts in the given period! // also transfers! // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->withOpposingAccount(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $transactions = $transactions->filter( function (Transaction $transaction) { // return negative amounts only. @@ -150,12 +150,12 @@ class AccountTasker implements AccountTaskerInterface // get all expenses for the given accounts in the given period! // also transfers! // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->withOpposingAccount(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $transactions = $transactions->filter( function (Transaction $transaction) { // return positive amounts only. diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 2bbb0fd169..4b3da1a5b4 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -25,7 +25,7 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use Exception; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\AccountType; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\Budget; @@ -514,11 +514,11 @@ class BudgetRepository implements BudgetRepositoryInterface } // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setBudgets($budgets); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // loop transactions: /** @var Transaction $transaction */ @@ -587,12 +587,12 @@ class BudgetRepository implements BudgetRepositoryInterface public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array { $carbonFormat = Navigation::preferredCarbonFormat($start, $end); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setTypes([TransactionType::WITHDRAWAL]); $collector->withoutBudget(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = [ 'entries' => [], 'name' => (string)trans('firefly.no_budget'), @@ -658,8 +658,8 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function spentInPeriod(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setBudgets($budgets)->withBudgetInformation(); @@ -670,7 +670,7 @@ class BudgetRepository implements BudgetRepositoryInterface $collector->setAllAssetAccounts(); } - $set = $collector->getJournals(); + $set = $collector->getTransactions(); return (string)$set->sum('transaction_amount'); } @@ -684,8 +684,8 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function spentInPeriodWoBudget(Collection $accounts, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->withoutBudget(); @@ -696,7 +696,7 @@ class BudgetRepository implements BudgetRepositoryInterface $collector->setAllAssetAccounts(); } - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $set = $set->filter( function (Transaction $transaction) { if (bccomp($transaction->transaction_amount, '0') === -1) { diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index f35b77f0e4..a48c25bef7 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -24,7 +24,7 @@ namespace FireflyIII\Repositories\Category; use Carbon\Carbon; use FireflyIII\Factory\CategoryFactory; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Category; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; @@ -74,11 +74,11 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function earnedInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAccounts($accounts)->setCategories($categories); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); return (string)$set->sum('transaction_amount'); } @@ -226,12 +226,12 @@ class CategoryRepository implements CategoryRepositoryInterface } // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setCategories($categories)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->withOpposingAccount(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // loop transactions: /** @var Transaction $transaction */ @@ -258,12 +258,12 @@ class CategoryRepository implements CategoryRepositoryInterface public function periodExpensesNoCategory(Collection $accounts, Carbon $start, Carbon $end): array { $carbonFormat = Navigation::preferredCarbonFormat($start, $end); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount(); $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]); $collector->withoutCategory(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = [ 'entries' => [], 'name' => (string)trans('firefly.no_category'), @@ -310,12 +310,12 @@ class CategoryRepository implements CategoryRepositoryInterface } // get all transactions: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end); $collector->setCategories($categories)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->withOpposingAccount(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // loop transactions: /** @var Transaction $transaction */ @@ -343,12 +343,12 @@ class CategoryRepository implements CategoryRepositoryInterface { Log::debug('Now in periodIncomeNoCategory()'); $carbonFormat = Navigation::preferredCarbonFormat($start, $end); - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->withOpposingAccount(); $collector->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]); $collector->withoutCategory(); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); $result = [ 'entries' => [], 'name' => (string)trans('firefly.no_category'), @@ -392,8 +392,8 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function spentInPeriod(Collection $categories, Collection $accounts, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setCategories($categories); @@ -404,7 +404,7 @@ class CategoryRepository implements CategoryRepositoryInterface $collector->setAllAssetAccounts(); } - $set = $collector->getJournals(); + $set = $collector->getTransactions(); return (string)$set->sum('transaction_amount'); } @@ -418,8 +418,8 @@ class CategoryRepository implements CategoryRepositoryInterface */ public function spentInPeriodWithoutCategory(Collection $accounts, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->withoutCategory(); @@ -430,7 +430,7 @@ class CategoryRepository implements CategoryRepositoryInterface $collector->setAllAssetAccounts(); } - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $set = $set->filter( function (Transaction $transaction) { if (bccomp($transaction->transaction_amount, '0') === -1) { diff --git a/app/Repositories/Recurring/RecurringRepository.php b/app/Repositories/Recurring/RecurringRepository.php index a6482b34f1..86157afce5 100644 --- a/app/Repositories/Recurring/RecurringRepository.php +++ b/app/Repositories/Recurring/RecurringRepository.php @@ -26,7 +26,7 @@ namespace FireflyIII\Repositories\Recurring; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\RecurrenceFactory; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Note; use FireflyIII\Models\Preference; @@ -266,15 +266,15 @@ class RecurringRepository implements RecurringRepositoryInterface foreach ($journalMeta as $journalId) { $search[] = ['id' => (int)$journalId]; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($recurrence->user); $collector->withOpposingAccount()->setAllAssetAccounts()->withCategoryInformation()->withBudgetInformation()->setLimit($pageSize)->setPage($page); // filter on specific journals. $collector->removeFilter(InternalTransferFilter::class); $collector->setJournals(new Collection($search)); - return $collector->getPaginatedJournals(); + return $collector->getPaginatedTransactions(); } /** @@ -295,15 +295,15 @@ class RecurringRepository implements RecurringRepositoryInterface foreach ($journalMeta as $journalId) { $search[] = ['id' => (int)$journalId]; } - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($recurrence->user); $collector->withOpposingAccount()->setAllAssetAccounts()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. $collector->removeFilter(InternalTransferFilter::class); $collector->setJournals(new Collection($search)); - return $collector->getJournals(); + return $collector->getTransactions(); } /** diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 60b2989fcd..ab95121d7d 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -24,7 +24,7 @@ namespace FireflyIII\Repositories\Tag; use Carbon\Carbon; use DB; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionType; @@ -73,11 +73,11 @@ class TagRepository implements TagRepositoryInterface */ public function earnedInPeriod(Tag $tag, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); return (string)$set->sum('transaction_amount'); } @@ -191,11 +191,11 @@ class TagRepository implements TagRepositoryInterface */ public function spentInPeriod(Tag $tag, Carbon $start, Carbon $end): string { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($this->user); $collector->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setAllAssetAccounts()->setTag($tag); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); return (string)$set->sum('transaction_amount'); } @@ -231,8 +231,8 @@ class TagRepository implements TagRepositoryInterface */ public function sumsOfTag(Tag $tag, ?Carbon $start, ?Carbon $end): array { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); if (null !== $start && null !== $end) { $collector->setRange($start, $end); @@ -240,7 +240,7 @@ class TagRepository implements TagRepositoryInterface $collector->setAllAssetAccounts()->setTag($tag)->withOpposingAccount(); $collector->removeFilter(InternalTransferFilter::class); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); $sums = [ TransactionType::WITHDRAWAL => '0', diff --git a/app/Support/Http/Controllers/PeriodOverview.php b/app/Support/Http/Controllers/PeriodOverview.php index 4971c89f9b..976a2da7b6 100644 --- a/app/Support/Http/Controllers/PeriodOverview.php +++ b/app/Support/Http/Controllers/PeriodOverview.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; @@ -100,18 +100,18 @@ trait PeriodOverview foreach ($dates as $currentDate) { // try a collector for income: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($currentDate['start'], $currentDate['end'])->setTypes([TransactionType::DEPOSIT]) ->withOpposingAccount(); - $earned = (string)$collector->getJournals()->sum('transaction_amount'); + $earned = (string)$collector->getTransactions()->sum('transaction_amount'); // try a collector for expenses: - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts(new Collection([$account]))->setRange($currentDate['start'], $currentDate['end'])->setTypes([TransactionType::WITHDRAWAL]) ->withOpposingAccount(); - $spent = (string)$collector->getJournals()->sum('transaction_amount'); + $spent = (string)$collector->getTransactions()->sum('transaction_amount'); $dateName = app('navigation')->periodShow($currentDate['start'], $currentDate['period']); /** @noinspection PhpUndefinedMethodInspection */ @@ -158,12 +158,12 @@ trait PeriodOverview } $dates = app('navigation')->blockPeriods($start, $end, $range); foreach ($dates as $date) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($date['start'], $date['end'])->withoutBudget()->withOpposingAccount()->setTypes( [TransactionType::WITHDRAWAL] ); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $sum = (string)($set->sum('transaction_amount') ?? '0'); $journals = $set->count(); /** @noinspection PhpUndefinedMethodInspection */ @@ -229,12 +229,12 @@ trait PeriodOverview $dateName = app('navigation')->periodShow($currentDate['end'], $currentDate['period']); // amount transferred - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->setCategory($category) ->withOpposingAccount()->setTypes([TransactionType::TRANSFER]); $collector->removeFilter(InternalTransferFilter::class); - $transferred = app('steam')->positive((string)$collector->getJournals()->sum('transaction_amount')); + $transferred = app('steam')->positive((string)$collector->getTransactions()->sum('transaction_amount')); $entries->push( [ @@ -342,11 +342,11 @@ trait PeriodOverview $dates = app('navigation')->blockPeriods($start, $date, $range); foreach ($dates as $currentDate) { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setRange($currentDate['start'], $currentDate['end'])->withOpposingAccount()->setTypes($types); $collector->removeFilter(InternalTransferFilter::class); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); if ($journals->count() > 0) { $sums = $this->sumPerCurrency($journals); diff --git a/app/Support/Http/Controllers/RequestInformation.php b/app/Support/Http/Controllers/RequestInformation.php index 3c808cce23..32fdba78b1 100644 --- a/app/Support/Http/Controllers/RequestInformation.php +++ b/app/Support/Http/Controllers/RequestInformation.php @@ -26,7 +26,7 @@ namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\ValidationException; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Help\HelpInterface; use FireflyIII\Http\Requests\SplitJournalFormRequest; use FireflyIII\Http\Requests\TestRuleFormRequest; @@ -219,12 +219,12 @@ trait RequestInformation protected function getTransactionDataFromJournal(TransactionJournal $journal): array // convert object { // use collector to collect transactions. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); // filter on specific journals. $collector->setJournals(new Collection([$journal])); - $set = $collector->getJournals(); + $set = $collector->getTransactions(); $transactions = []; $transformer = new TransactionTransformer(new ParameterBag); /** @var Transaction $transaction */ diff --git a/app/Support/Http/Controllers/TransactionCalculation.php b/app/Support/Http/Controllers/TransactionCalculation.php index 5ae4cb4050..6c318fa90b 100644 --- a/app/Support/Http/Controllers/TransactionCalculation.php +++ b/app/Support/Http/Controllers/TransactionCalculation.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Http\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -50,11 +50,11 @@ trait TransactionCalculation */ protected function getExpensesForOpposing(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL])->setOpposingAccounts($opposing); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -70,8 +70,8 @@ trait TransactionCalculation */ protected function getExpensesForTags(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setTags($tags)->withOpposingAccount(); $collector->removeFilter(TransferFilter::class); @@ -79,7 +79,7 @@ trait TransactionCalculation $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -94,8 +94,8 @@ trait TransactionCalculation */ protected function getExpensesInBudgets(Collection $accounts, Collection $budgets, Carbon $start, Carbon $end): Collection // get data + augment with info { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setBudgets($budgets)->withOpposingAccount(); $collector->removeFilter(TransferFilter::class); @@ -103,7 +103,7 @@ trait TransactionCalculation $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -120,8 +120,8 @@ trait TransactionCalculation */ protected function getExpensesInCategories(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount(); $collector->removeFilter(TransferFilter::class); @@ -129,7 +129,7 @@ trait TransactionCalculation $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(PositiveAmountFilter::class); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -144,15 +144,15 @@ trait TransactionCalculation */ protected function getIncomeForCategories(Collection $accounts, Collection $categories, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setCategories($categories)->withOpposingAccount(); $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(NegativeAmountFilter::class); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -167,11 +167,11 @@ trait TransactionCalculation */ protected function getIncomeForOpposing(Collection $accounts, Collection $opposing, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT])->setOpposingAccounts($opposing); - return $collector->getJournals(); + return $collector->getTransactions(); } /** @@ -188,15 +188,15 @@ trait TransactionCalculation */ protected function getIncomeForTags(Collection $accounts, Collection $tags, Carbon $start, Carbon $end): Collection // get data + augument { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAccounts($accounts)->setRange($start, $end)->setTypes([TransactionType::DEPOSIT, TransactionType::TRANSFER]) ->setTags($tags)->withOpposingAccount(); $collector->addFilter(OpposingAccountFilter::class); $collector->addFilter(NegativeAmountFilter::class); - return $collector->getJournals(); + return $collector->getTransactions(); } } \ No newline at end of file diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 85fb5ccf48..794b572f06 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Search; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Transaction; use FireflyIII\User; @@ -111,8 +111,8 @@ class Search implements SearchInterface $result = new Collection(); $startTime = microtime(true); do { - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->withOpposingAccount(); if ($this->hasModifiers()) { $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); @@ -185,12 +185,12 @@ class Search implements SearchInterface } /** - * @param JournalCollectorInterface $collector + * @param TransactionCollectorInterface $collector * - * @return JournalCollectorInterface + * @return TransactionCollectorInterface * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ - private function applyModifiers(JournalCollectorInterface $collector): JournalCollectorInterface + private function applyModifiers(TransactionCollectorInterface $collector): TransactionCollectorInterface { foreach ($this->modifiers as $modifier) { switch ($modifier['type']) { diff --git a/app/TransactionRules/TransactionMatcher.php b/app/TransactionRules/TransactionMatcher.php index 3d1ba9d317..23766655e3 100644 --- a/app/TransactionRules/TransactionMatcher.php +++ b/app/TransactionRules/TransactionMatcher.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace FireflyIII\TransactionRules; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\Transaction; @@ -236,8 +236,8 @@ class TransactionMatcher $result = new Collection(); do { // Fetch a batch of transactions from the database - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser(auth()->user()); $collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->setTypes($this->transactionTypes); if (null !== $this->maxAmount) { @@ -254,7 +254,7 @@ class TransactionMatcher } - $set = $collector->getPaginatedJournals(); + $set = $collector->getPaginatedTransactions(); Log::debug(sprintf('Found %d journals to check. ', $set->count())); // Filter transactions that match the given triggers. diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index c6cc0e3af2..e217528d15 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -25,7 +25,7 @@ namespace FireflyIII\Transformers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionCurrency; @@ -104,7 +104,7 @@ class AccountTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($account->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($account->user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); if ($account->accountType->type === AccountType::ASSET) { @@ -116,7 +116,7 @@ class AccountTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/BillTransformer.php b/app/Transformers/BillTransformer.php index 2654d304d8..13d6db0146 100644 --- a/app/Transformers/BillTransformer.php +++ b/app/Transformers/BillTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; @@ -129,7 +129,7 @@ class BillTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($bill->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($bill->user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); @@ -138,7 +138,7 @@ class BillTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/BudgetTransformer.php b/app/Transformers/BudgetTransformer.php index e09170a54a..9d2aa953da 100644 --- a/app/Transformers/BudgetTransformer.php +++ b/app/Transformers/BudgetTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Budget; use Illuminate\Support\Collection; use League\Fractal\Resource\Collection as FractalCollection; @@ -78,7 +78,7 @@ class BudgetTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($budget->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($budget->user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); @@ -87,7 +87,7 @@ class BudgetTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/CategoryTransformer.php b/app/Transformers/CategoryTransformer.php index 421946e6b2..436e98016d 100644 --- a/app/Transformers/CategoryTransformer.php +++ b/app/Transformers/CategoryTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Category; use Illuminate\Support\Collection; use League\Fractal\Resource\Collection as FractalCollection; @@ -78,7 +78,7 @@ class CategoryTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($category->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($category->user); $collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation(); $collector->setAllAssetAccounts(); @@ -87,7 +87,7 @@ class CategoryTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/JournalLinkTransformer.php b/app/Transformers/JournalLinkTransformer.php index f05d6807b8..43e5f386dd 100644 --- a/app/Transformers/JournalLinkTransformer.php +++ b/app/Transformers/JournalLinkTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournalLink; use Illuminate\Support\Collection; @@ -75,12 +75,12 @@ class JournalLinkTransformer extends TransformerAbstract { // need to use the collector to get the transaction :( // journals always use collector and limited using URL parameters. - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($link->source->user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals(new Collection([$link->source])); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); return $this->item($transactions->first(), new TransactionTransformer($this->parameters), 'transactions'); } @@ -104,12 +104,12 @@ class JournalLinkTransformer extends TransformerAbstract { // need to use the collector to get the transaction :( // journals always use collector and limited using URL parameters. - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($link->source->user); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals(new Collection([$link->destination])); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); return $this->item($transactions->first(), new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/JournalMetaTransformer.php b/app/Transformers/JournalMetaTransformer.php index 6f54be2e2e..6c5fb64bc3 100644 --- a/app/Transformers/JournalMetaTransformer.php +++ b/app/Transformers/JournalMetaTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\TransactionJournalMeta; use Illuminate\Support\Collection; use League\Fractal\Resource\Collection as FractalCollection; @@ -78,7 +78,7 @@ class JournalMetaTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($journal->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($journal->user); $collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation(); $collector->setAllAssetAccounts(); @@ -87,7 +87,7 @@ class JournalMetaTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/PiggyBankEventTransformer.php b/app/Transformers/PiggyBankEventTransformer.php index 420a761899..0aa6f50762 100644 --- a/app/Transformers/PiggyBankEventTransformer.php +++ b/app/Transformers/PiggyBankEventTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; @@ -95,8 +95,8 @@ class PiggyBankEventTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($journal->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - /** @var JournalCollectorInterface $collector */ - $collector = app(JournalCollectorInterface::class); + /** @var TransactionCollectorInterface $collector */ + $collector = app(TransactionCollectorInterface::class); $collector->setUser($journal->user); $collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation(); $collector->setAllAssetAccounts(); @@ -105,7 +105,7 @@ class PiggyBankEventTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->item($journals->first(), new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/app/Transformers/TagTransformer.php b/app/Transformers/TagTransformer.php index 3b926de80a..a8b1a14ece 100644 --- a/app/Transformers/TagTransformer.php +++ b/app/Transformers/TagTransformer.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Transformers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Tag; use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Item; @@ -77,7 +77,7 @@ class TagTransformer extends TransformerAbstract $pageSize = (int)app('preferences')->getForUser($tag->user, 'listPageSize', 50)->data; // journals always use collector and limited using URL parameters. - $collector = app(JournalCollectorInterface::class); + $collector = app(TransactionCollectorInterface::class); $collector->setUser($tag->user); $collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation(); $collector->setAllAssetAccounts(); @@ -86,7 +86,7 @@ class TagTransformer extends TransformerAbstract $collector->setRange($this->parameters->get('start'), $this->parameters->get('end')); } $collector->setLimit($pageSize)->setPage($this->parameters->get('page')); - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $this->collection($journals, new TransactionTransformer($this->parameters), 'transactions'); } diff --git a/tests/Api/V1/Controllers/JournalLinkControllerTest.php b/tests/Api/V1/Controllers/JournalLinkControllerTest.php index c56849f751..ea176dc744 100644 --- a/tests/Api/V1/Controllers/JournalLinkControllerTest.php +++ b/tests/Api/V1/Controllers/JournalLinkControllerTest.php @@ -25,7 +25,7 @@ namespace Tests\Api\V1\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournalLink; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; @@ -87,7 +87,7 @@ class JournalLinkControllerTest extends TestCase // mock stuff: $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // mock calls: $repository->shouldReceive('setUser')->once(); @@ -101,7 +101,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); // call API $response = $this->get('/api/v1/journal_links'); @@ -122,7 +122,7 @@ class JournalLinkControllerTest extends TestCase // mock stuff: $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // mock calls: $repository->shouldReceive('setUser')->once(); @@ -132,7 +132,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); // call API $response = $this->get('/api/v1/journal_links/' . $journalLink->id); @@ -155,7 +155,7 @@ class JournalLinkControllerTest extends TestCase // mock stuff: $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // mock calls: $repository->shouldReceive('setUser')->once(); @@ -167,7 +167,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $journalRepos->shouldReceive('findNull')->andReturn($journal); $repository->shouldReceive('storeLink')->once()->andReturn($journalLink); @@ -203,7 +203,7 @@ class JournalLinkControllerTest extends TestCase // mock stuff: $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // mock calls: $repository->shouldReceive('setUser')->once(); @@ -215,7 +215,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $journalRepos->shouldReceive('findNull')->andReturn(null); @@ -245,7 +245,7 @@ class JournalLinkControllerTest extends TestCase // mock repositories $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalLink = TransactionJournalLink::first(); $journal = $this->user()->transactionJournals()->find(1); @@ -264,7 +264,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $journalRepos->shouldReceive('findNull')->andReturn($journal); $repository->shouldReceive('updateLink')->once()->andReturn($journalLink); @@ -294,7 +294,7 @@ class JournalLinkControllerTest extends TestCase // mock repositories $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalLink = TransactionJournalLink::first(); $journal = $this->user()->transactionJournals()->find(1); @@ -313,7 +313,7 @@ class JournalLinkControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setJournals')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $journalRepos->shouldReceive('findNull')->andReturn(null); diff --git a/tests/Api/V1/Controllers/TransactionControllerTest.php b/tests/Api/V1/Controllers/TransactionControllerTest.php index 738c5be471..876e83f842 100644 --- a/tests/Api/V1/Controllers/TransactionControllerTest.php +++ b/tests/Api/V1/Controllers/TransactionControllerTest.php @@ -25,8 +25,8 @@ namespace Tests\Api\V1\Controllers; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollector; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollector; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; @@ -1215,20 +1215,20 @@ class TransactionControllerTest extends TestCase ->andReturn($this->user()->accounts()->where('account_type_id', 3)->get()); // get some transactions using the collector: - $collector = new JournalCollector; + $collector = new TransactionCollector; $collector->setUser($this->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setLimit(5)->setPage(1); try { - $paginator = $collector->getPaginatedJournals(); + $paginator = $collector->getPaginatedTransactions(); } catch (FireflyException $e) { $this->assertTrue(false, $e->getMessage()); } // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('setUser'); @@ -1241,7 +1241,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn($paginator); + $collector->shouldReceive('getPaginatedTransactions')->andReturn($paginator); // mock some calls: @@ -1268,20 +1268,20 @@ class TransactionControllerTest extends TestCase ->andReturn($this->user()->accounts()->where('account_type_id', 3)->get()); // get some transactions using the collector: - $collector = new JournalCollector; + $collector = new TransactionCollector; $collector->setUser($this->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setLimit(5)->setPage(1); try { - $paginator = $collector->getPaginatedJournals(); + $paginator = $collector->getPaginatedTransactions(); } catch (FireflyException $e) { $this->assertTrue(false, $e->getMessage()); } // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('setUser'); $collector->shouldReceive('setUser')->andReturnSelf(); @@ -1294,7 +1294,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn($paginator); + $collector->shouldReceive('getPaginatedTransactions')->andReturn($paginator); // mock some calls: @@ -1346,17 +1346,17 @@ class TransactionControllerTest extends TestCase // get some transactions using the collector: - $collector = new JournalCollector; + $collector = new TransactionCollector; $collector->setUser($this->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setJournals(new Collection([$journal])); $collector->setLimit(5)->setPage(1); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('setUser'); $collector->shouldReceive('setUser')->andReturnSelf(); @@ -1365,7 +1365,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('setJournals')->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); // test API $response = $this->get('/api/v1/transactions/' . $transaction->id); @@ -1413,17 +1413,17 @@ class TransactionControllerTest extends TestCase // get some transactions using the collector: - $collector = new JournalCollector; + $collector = new TransactionCollector; $collector->setUser($this->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setJournals(new Collection([$journal])); $collector->setLimit(5)->setPage(1); - $transactions = $collector->getJournals(); + $transactions = $collector->getTransactions(); // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('setUser'); $collector->shouldReceive('setUser')->andReturnSelf(); @@ -1432,7 +1432,7 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('setJournals')->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); // test API $response = $this->get('/api/v1/transactions/' . $transaction->id); diff --git a/tests/Feature/Controllers/Account/ShowControllerTest.php b/tests/Feature/Controllers/Account/ShowControllerTest.php index 288eed03a5..a6d3edf92b 100644 --- a/tests/Feature/Controllers/Account/ShowControllerTest.php +++ b/tests/Feature/Controllers/Account/ShowControllerTest.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Account; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; @@ -81,15 +81,15 @@ class ShowControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([$transaction], 0, 10)); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -128,15 +128,15 @@ class ShowControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([$transaction], 0, 10)); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -193,7 +193,7 @@ class ShowControllerTest extends TestCase public function testShowByDateEmpty(string $range): void { // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -201,7 +201,7 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $repository = $this->mock(AccountRepositoryInterface::class); $repository->shouldReceive('oldestJournalDate')->andReturn(new Carbon); @@ -209,7 +209,7 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index 5e085d4d5b..dbcf32a4d1 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -24,7 +24,7 @@ namespace Tests\Feature\Controllers; use Carbon\Carbon; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Bill; use FireflyIII\Models\Rule; use FireflyIII\Models\TransactionJournal; @@ -215,7 +215,7 @@ class BillControllerTest extends TestCase // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository = $this->mock(BillRepositoryInterface::class); $ruleGroupRepos = $this->mock(RuleGroupRepositoryInterface::class); $repository->shouldReceive('getYearAverage')->andReturn('0'); @@ -230,7 +230,7 @@ class BillControllerTest extends TestCase $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $repository->shouldReceive('getPaidDatesInRange')->twice()->andReturn(new Collection([new Carbon, new Carbon, new Carbon])); $repository->shouldReceive('setUser'); diff --git a/tests/Feature/Controllers/Budget/ShowControllerTest.php b/tests/Feature/Controllers/Budget/ShowControllerTest.php index dc0b485eed..73ef7f5b72 100644 --- a/tests/Feature/Controllers/Budget/ShowControllerTest.php +++ b/tests/Feature/Controllers/Budget/ShowControllerTest.php @@ -24,7 +24,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Budget; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -64,19 +64,19 @@ class ShowControllerTest extends TestCase // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(null); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $date = new Carbon(); $this->session(['start' => $date, 'end' => clone $date]); @@ -100,7 +100,7 @@ class ShowControllerTest extends TestCase Log::debug(sprintf('Now in testNoBudgetAll(%s)', $range)); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(null); @@ -112,8 +112,8 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $date = new Carbon(); $this->session(['start' => $date, 'end' => clone $date]); @@ -137,19 +137,19 @@ class ShowControllerTest extends TestCase Log::debug(sprintf('Now in testNoBudgetDate(%s)', $range)); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(null); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withoutBudget')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $date = new Carbon(); $this->session(['start' => $date, 'end' => clone $date]); @@ -179,13 +179,13 @@ class ShowControllerTest extends TestCase $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -246,14 +246,14 @@ class ShowControllerTest extends TestCase $budgetRepository->shouldReceive('getBudgetLimits')->andReturn(new Collection); // mock journal collector: - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php index 02f6aafb5f..8d138cf3c3 100644 --- a/tests/Feature/Controllers/Category/NoCategoryControllerTest.php +++ b/tests/Feature/Controllers/Category/NoCategoryControllerTest.php @@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Category; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -63,7 +63,7 @@ class NoCategoryControllerTest extends TestCase { Log::debug(sprintf('Test noCategory(%s)', $range)); // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -78,8 +78,8 @@ class NoCategoryControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); @@ -104,7 +104,7 @@ class NoCategoryControllerTest extends TestCase { Log::debug('Test nocategoryAll()'); // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -115,8 +115,8 @@ class NoCategoryControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); @@ -140,7 +140,7 @@ class NoCategoryControllerTest extends TestCase { Log::debug('Test nocategorydate()'); // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -151,8 +151,8 @@ class NoCategoryControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('withoutCategory')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); $collector->shouldReceive('setPage')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); diff --git a/tests/Feature/Controllers/Category/ShowControllerTest.php b/tests/Feature/Controllers/Category/ShowControllerTest.php index 6e6e1551d2..b56e8c745a 100644 --- a/tests/Feature/Controllers/Category/ShowControllerTest.php +++ b/tests/Feature/Controllers/Category/ShowControllerTest.php @@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Category; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -75,7 +75,7 @@ class ShowControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setPage')->andReturnSelf()->once(); $collector->shouldReceive('setLimit')->andReturnSelf()->once(); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(2); @@ -85,10 +85,10 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(2); $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(2); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); + $collector->shouldReceive('getTransactions')->andReturn(new Collection)->atLeast(1); Navigation::shouldReceive('updateStartDate')->andReturn(new Carbon); Navigation::shouldReceive('updateEndDate')->andReturn(new Carbon); @@ -117,7 +117,7 @@ class ShowControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(CategoryRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector->shouldReceive('setPage')->andReturnSelf()->once(); @@ -130,7 +130,7 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('setCategory')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); $journalRepos->shouldReceive('firstNull')->once()->andReturn(TransactionJournal::first()); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon); @@ -155,7 +155,7 @@ class ShowControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $repository = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $month = new Carbon(); $month->startOfMonth(); @@ -174,8 +174,8 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); + $collector->shouldReceive('getTransactions')->andReturn(new Collection)->atLeast(1); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([$transaction], 0, 10))->once(); $repository->shouldReceive('spentInPeriod')->andReturn('-1'); $repository->shouldReceive('earnedInPeriod')->andReturn('1'); @@ -213,7 +213,7 @@ class ShowControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->once()->andReturn(new Collection); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setPage')->andReturnSelf()->once(); $collector->shouldReceive('setLimit')->andReturnSelf()->once(); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->atLeast(1); @@ -224,9 +224,9 @@ class ShowControllerTest extends TestCase $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->atLeast(1); $collector->shouldReceive('setCategory')->andReturnSelf()->atLeast(1); $collector->shouldReceive('setTypes')->andReturnSelf()->atLeast(1); - $collector->shouldReceive('getJournals')->andReturn(new Collection)->atLeast(1); + $collector->shouldReceive('getTransactions')->andReturn(new Collection)->atLeast(1); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->atLeast(1); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10))->atLeast(1); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 29bb859461..45e98862d5 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -24,7 +24,7 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Category; @@ -87,7 +87,7 @@ class AccountControllerTest extends TestCase public function testExpenseBudget(string $range): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $transaction = factory(Transaction::class)->make(); @@ -95,7 +95,7 @@ class AccountControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); @@ -114,7 +114,7 @@ class AccountControllerTest extends TestCase public function testExpenseBudgetAll(string $range): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $transaction = factory(Transaction::class)->make(); @@ -123,7 +123,7 @@ class AccountControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); $accountRepos->shouldReceive('oldestJournalDate')->andReturn(Carbon::createFromTimestamp(time())->startOfMonth()); @@ -145,14 +145,14 @@ class AccountControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $category = factory(Category::class)->make(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category])); @@ -173,7 +173,7 @@ class AccountControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $category = factory(Category::class)->make(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -181,7 +181,7 @@ class AccountControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$category])); $accountRepos->shouldReceive('oldestJournalDate')->andReturn(Carbon::createFromTimestamp(time())->startOfMonth()); @@ -230,14 +230,14 @@ class AccountControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $account = factory(Account::class)->make(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$account])); @@ -258,7 +258,7 @@ class AccountControllerTest extends TestCase $transaction = factory(Transaction::class)->make(); $account = factory(Account::class)->make(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -266,7 +266,7 @@ class AccountControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('pieChart')->andReturn([]); $categoryRepos->shouldReceive('getCategories')->andReturn(new Collection([$account])); $accountRepos->shouldReceive('oldestJournalDate')->andReturn(Carbon::createFromTimestamp(time())->startOfMonth()); diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index f97bda2fe3..24f70f528e 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; @@ -72,11 +72,11 @@ class BillControllerTest extends TestCase { $transaction = factory(Transaction::class)->make(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); $collector->shouldReceive('setBills')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]))->once(); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction]))->once(); $generator->shouldReceive('multiSet')->once()->andReturn([]); diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index 83ec2fd3d6..ec89c0d65b 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -24,7 +24,7 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; @@ -117,7 +117,7 @@ class BudgetControllerTest extends TestCase { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transactions = factory(Transaction::class, 10)->make(); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -125,7 +125,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setAllAssetAccounts')->once()->andReturnSelf(); $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); $generator->shouldReceive('pieChart')->once()->andReturn([]); @@ -144,7 +144,7 @@ class BudgetControllerTest extends TestCase public function testExpenseCategory(string $range): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $catRepos = $this->mock(CategoryRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -156,7 +156,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); $catRepos->shouldReceive('getCategories')->andReturn($categories)->once(); @@ -177,7 +177,7 @@ class BudgetControllerTest extends TestCase public function testExpenseExpense(string $range): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -189,7 +189,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setBudget')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); $accountRepos->shouldReceive('getAccountsByType')->andReturn($accounts)->once(); @@ -211,7 +211,7 @@ class BudgetControllerTest extends TestCase { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budget = factory(Budget::class)->make(); $budgetLimit = factory(BudgetLimit::class)->make(); $budgetLimit->budget_id = $budget->id; @@ -225,7 +225,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); $collector->shouldReceive('withoutBudget')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]))->once(); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction]))->once(); $generator->shouldReceive('multiSet')->once()->andReturn([]); @@ -245,7 +245,7 @@ class BudgetControllerTest extends TestCase { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budget = factory(Budget::class)->make(); $one = factory(BudgetLimit::class)->make(); $two = factory(BudgetLimit::class)->make(); @@ -261,7 +261,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); $collector->shouldReceive('withoutBudget')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]))->once(); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction]))->once(); $generator->shouldReceive('multiSet')->once()->andReturn([]); @@ -281,7 +281,7 @@ class BudgetControllerTest extends TestCase { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budget = factory(Budget::class)->make(); $transaction = factory(Transaction::class)->make(); @@ -293,7 +293,7 @@ class BudgetControllerTest extends TestCase $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); $collector->shouldReceive('withoutBudget')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction]))->once(); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction]))->once(); $generator->shouldReceive('multiSet')->once()->andReturn([]); diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php index 94212dd4a8..e081ad8fe1 100644 --- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php @@ -25,7 +25,7 @@ namespace Tests\Feature\Controllers\Chart; use Carbon\Carbon; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Chart\MetaPieChartInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; use FireflyIII\Helpers\Filter\TransferFilter; @@ -102,7 +102,7 @@ class BudgetReportControllerTest extends TestCase public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $one = factory(BudgetLimit::class)->make(); @@ -128,7 +128,7 @@ class BudgetReportControllerTest extends TestCase $collector->shouldReceive('addFilter')->withArgs([PositiveAmountFilter::class])->andReturnSelf(); $collector->shouldReceive('setBudgets')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $generator->shouldReceive('multiSet')->andReturn([])->once(); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index 249b6fc428..1f360017ba 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -24,7 +24,7 @@ namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Chart\MetaPieChartInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -138,7 +138,7 @@ class CategoryReportControllerTest extends TestCase public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transactions = factory(Transaction::class, 10)->make(); $collector->shouldReceive('setAccounts')->andReturnSelf(); @@ -151,7 +151,7 @@ class CategoryReportControllerTest extends TestCase $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf(); $collector->shouldReceive('setCategories')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transactions); + $collector->shouldReceive('getTransactions')->andReturn($transactions); $generator->shouldReceive('multiSet')->andReturn([])->once(); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php index e086ed0cfb..f66588b8f0 100644 --- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -53,7 +53,7 @@ class ExpenseReportControllerTest extends TestCase { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); $accountRepository->shouldReceive('findByName')->once()->andReturn($expense); @@ -67,7 +67,7 @@ class ExpenseReportControllerTest extends TestCase $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf(); $collector->shouldReceive('setOpposingAccounts')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($set); + $collector->shouldReceive('getTransactions')->andReturn($set); $generator->shouldReceive('multiSet')->andReturn([])->once(); $this->be($this->user()); diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php index 63d76ceec0..32df898d3f 100644 --- a/tests/Feature/Controllers/Chart/TagReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php @@ -24,7 +24,7 @@ namespace Tests\Feature\Controllers\Chart; use FireflyIII\Generator\Chart\Basic\GeneratorInterface; use FireflyIII\Helpers\Chart\MetaPieChartInterface; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -165,7 +165,7 @@ class TagReportControllerTest extends TestCase public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $tag = $this->user()->tags()->first(); @@ -190,7 +190,7 @@ class TagReportControllerTest extends TestCase $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf(); $collector->shouldReceive('setTags')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($set); + $collector->shouldReceive('getTransactions')->andReturn($set); $generator->shouldReceive('multiSet')->andReturn([])->once(); $this->be($this->user()); diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index b1f4c6eadb..4a5bac9636 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionCurrency; @@ -110,7 +110,7 @@ class HomeControllerTest extends TestCase { // mock stuff $account = factory(Account::class)->make(); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); $billRepos = $this->mock(BillRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -127,7 +127,7 @@ class HomeControllerTest extends TestCase $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php index c9937dab56..64b2397ca3 100644 --- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php +++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Json; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Bill; @@ -83,10 +83,10 @@ class AutoCompleteControllerTest extends TestCase */ public function testAllTransactionJournals(): void { - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf(); $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('json.all-transaction-journals')); @@ -188,10 +188,10 @@ class AutoCompleteControllerTest extends TestCase $journal = $this->user()->transactionJournals()->where('id', '!=', 1)->first(); $journal->journal_id = $journal->id; $collection = new Collection([$journal]); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('setLimit')->withArgs([400])->andReturnSelf(); $collector->shouldReceive('setPage')->withArgs([1])->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('json.journals-with-id', [1])); @@ -245,13 +245,13 @@ class AutoCompleteControllerTest extends TestCase public function testTransactionJournals(): void { // mock stuff - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setLimit')->andReturnSelf(); $collector->shouldReceive('setPage')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('json.transaction-journals', ['deposit'])); diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php index 97d4060694..94e2528282 100644 --- a/tests/Feature/Controllers/Json/BoxControllerTest.php +++ b/tests/Feature/Controllers/Json/BoxControllerTest.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Json; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -97,15 +97,15 @@ class BoxControllerTest extends TestCase public function testBalance(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // try a collector for income: - /** @var JournalCollectorInterface $collector */ + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('json.box.balance')); @@ -122,15 +122,14 @@ class BoxControllerTest extends TestCase $transaction->transaction_amount = '5'; $accountRepos = $this->mock(AccountRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // try a collector for income: - /** @var JournalCollectorInterface $collector */ $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getTransactions')->andReturn(new Collection([$transaction])); $this->be($this->user()); $response = $this->get(route('json.box.balance')); diff --git a/tests/Feature/Controllers/Report/ExpenseControllerTest.php b/tests/Feature/Controllers/Report/ExpenseControllerTest.php index 04b9a0ae6d..68dc54e8ce 100644 --- a/tests/Feature/Controllers/Report/ExpenseControllerTest.php +++ b/tests/Feature/Controllers/Report/ExpenseControllerTest.php @@ -22,7 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Report; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -79,14 +79,14 @@ class ExpenseControllerTest extends TestCase $collection = new Collection([$transA, $transB]); // mock collector for spentByBudget (complex) - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // dont care about any calls, just return a default set of fake transactions: $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setOpposingAccounts')->andReturnSelf(); $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); @@ -134,14 +134,14 @@ class ExpenseControllerTest extends TestCase $secondCollection = new Collection([$transC]); // mock collector for spentByCategory and earnedByCategory (complex) - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // dont care about any calls, just return a default set of fake transactions: $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setOpposingAccounts')->andReturnSelf(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($collection, $secondCollection); + $collector->shouldReceive('getTransactions')->andReturn($collection, $secondCollection); //$collector->shouldReceive('')->andReturnSelf(); $this->be($this->user()); @@ -179,13 +179,13 @@ class ExpenseControllerTest extends TestCase $collection = new Collection([$transA, $transB]); // mock collector for spentInPeriod and earnedInPeriod (complex) - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // dont care about any calls, just return a default set of fake transactions: $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setOpposingAccounts')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('report-data.expense.spent', ['1', $expense->id, '20170101', '20170131'])); @@ -224,13 +224,13 @@ class ExpenseControllerTest extends TestCase $collection = new Collection([$transA, $transB]); // mock collector for topExpense (complex) - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); // dont care about any calls, just return a default set of fake transactions: $collector->shouldReceive('setRange')->andReturnSelf(); $collector->shouldReceive('setTypes')->andReturnSelf(); $collector->shouldReceive('setAccounts')->andReturnSelf(); $collector->shouldReceive('setOpposingAccounts')->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); //$collector->shouldReceive('')->andReturnSelf(); $this->be($this->user()); diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index f9d80764aa..ea21a4646c 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; @@ -153,7 +153,7 @@ class TagControllerTest extends TestCase // mock stuff $repository = $this->mock(TagRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); @@ -171,7 +171,7 @@ class TagControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); $this->be($this->user()); $response = $this->get(route('tags.show', [1])); @@ -186,7 +186,7 @@ class TagControllerTest extends TestCase { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); @@ -200,7 +200,7 @@ class TagControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); $amounts = [ TransactionType::WITHDRAWAL => '0', @@ -222,7 +222,7 @@ class TagControllerTest extends TestCase { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); @@ -239,7 +239,7 @@ class TagControllerTest extends TestCase $collector->shouldReceive('withBudgetInformation')->andReturnSelf()->once(); $collector->shouldReceive('withCategoryInformation')->andReturnSelf()->once(); $collector->shouldReceive('setRange')->andReturnSelf()->once(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10))->once(); $amounts = [ TransactionType::WITHDRAWAL => '0', diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index 8659944402..6e0516de89 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -23,7 +23,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; use Carbon\Carbon; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; @@ -67,7 +67,7 @@ class TransactionControllerTest extends TestCase // mock stuff $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); @@ -80,8 +80,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer'])); @@ -101,7 +101,7 @@ class TransactionControllerTest extends TestCase // mock stuff $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $repository->shouldReceive('firstNull')->twice()->andReturn($transfer); $collector->shouldReceive('setTypes')->andReturnSelf(); @@ -114,8 +114,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn(new Collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('transactions.index.all', ['transfer'])); @@ -142,7 +142,7 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -157,8 +157,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer', '2016-01-01'])); @@ -185,7 +185,7 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -200,8 +200,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['transfer', '2016-01-01', '2015-12-31'])); @@ -228,7 +228,7 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -243,8 +243,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['deposit'])); @@ -271,7 +271,7 @@ class TransactionControllerTest extends TestCase // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); $repository->shouldReceive('firstNull')->once()->andReturn($transfer); @@ -286,8 +286,8 @@ class TransactionControllerTest extends TestCase $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); - $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getPaginatedTransactions')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getTransactions')->andReturn($collection); $this->be($this->user()); $response = $this->get(route('transactions.index', ['withdrawal'])); diff --git a/tests/Unit/Helpers/MetaPieChartTest.php b/tests/Unit/Helpers/MetaPieChartTest.php index 527ed3ee3b..9a30d81e47 100644 --- a/tests/Unit/Helpers/MetaPieChartTest.php +++ b/tests/Unit/Helpers/MetaPieChartTest.php @@ -24,7 +24,7 @@ namespace Tests\Unit\Helpers; use Carbon\Carbon; use FireflyIII\Helpers\Chart\MetaPieChart; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -60,7 +60,7 @@ class MetaPieChartTest extends TestCase // mock collector so the correct set of journals is returned: // then verify the results. - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('addFilter')->withArgs([PositiveAmountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('removeFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf()->once(); @@ -73,7 +73,7 @@ class MetaPieChartTest extends TestCase $collector->shouldReceive('setCategories')->andReturnSelf()->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); // mock all repositories: $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -114,7 +114,7 @@ class MetaPieChartTest extends TestCase // mock collector so the correct set of journals is returned: // then verify the results. - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->withArgs([PositiveAmountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->withArgs([OpposingAccountFilter::class])->andReturnSelf()->once(); @@ -126,10 +126,10 @@ class MetaPieChartTest extends TestCase $collector->shouldReceive('setCategories')->andReturnSelf()->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL, TransactionType::TRANSFER]])->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($collection)->once(); + $collector->shouldReceive('getTransactions')->andReturn($collection)->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::WITHDRAWAL]])->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($others)->once(); + $collector->shouldReceive('getTransactions')->andReturn($others)->once(); // mock all repositories: $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -172,7 +172,7 @@ class MetaPieChartTest extends TestCase // mock collector so the correct set of journals is returned: // then verify the results. - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->withArgs([OpposingAccountFilter::class])->andReturnSelf()->once(); @@ -184,7 +184,7 @@ class MetaPieChartTest extends TestCase $collector->shouldReceive('setCategories')->andReturnSelf()->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($collection); + $collector->shouldReceive('getTransactions')->andReturn($collection); // mock all repositories: $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -225,7 +225,7 @@ class MetaPieChartTest extends TestCase // mock collector so the correct set of journals is returned: // then verify the results. - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $collector->shouldReceive('addFilter')->withArgs([NegativeAmountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('addFilter')->withArgs([OpposingAccountFilter::class])->andReturnSelf()->once(); $collector->shouldReceive('removeFilter')->withArgs([TransferFilter::class])->andReturnSelf()->once(); @@ -236,10 +236,10 @@ class MetaPieChartTest extends TestCase $collector->shouldReceive('setCategories')->andReturnSelf()->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT, TransactionType::TRANSFER]])->andReturnSelf()->once(); $collector->shouldReceive('withOpposingAccount')->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($collection)->once(); + $collector->shouldReceive('getTransactions')->andReturn($collection)->once(); $collector->shouldReceive('setTypes')->withArgs([[TransactionType::DEPOSIT]])->andReturnSelf()->once(); - $collector->shouldReceive('getJournals')->andReturn($others)->once(); + $collector->shouldReceive('getTransactions')->andReturn($others)->once(); // mock all repositories: $accountRepos = $this->mock(AccountRepositoryInterface::class); diff --git a/tests/Unit/Import/Storage/ImportArrayStorageTest.php b/tests/Unit/Import/Storage/ImportArrayStorageTest.php index 2bb21582cf..c60dbe1b01 100644 --- a/tests/Unit/Import/Storage/ImportArrayStorageTest.php +++ b/tests/Unit/Import/Storage/ImportArrayStorageTest.php @@ -25,8 +25,8 @@ namespace Tests\Unit\Import\Storage; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollector; -use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Collector\TransactionCollector; +use FireflyIII\Helpers\Collector\TransactionCollectorInterface; use FireflyIII\Helpers\Filter\InternalTransferFilter; use FireflyIII\Import\Storage\ImportArrayStorage; use FireflyIII\Models\ImportJob; @@ -91,10 +91,10 @@ class ImportArrayStorageTest extends TestCase ->first(); // get transfer as a collection, so the compare routine works. - $journalCollector = new JournalCollector(); - $journalCollector->setUser($this->user()); - $journalCollector->setJournals(new Collection([$transfer])); - $transferCollection = $journalCollector->withOpposingAccount()->getJournals(); + $transactionCollector = new TransactionCollector; + $transactionCollector->setUser($this->user()); + $transactionCollector->setJournals(new Collection([$transfer])); + $transferCollection = $transactionCollector->withOpposingAccount()->getTransactions(); // make fake job $job = new ImportJob; @@ -119,7 +119,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -148,7 +148,7 @@ class ImportArrayStorageTest extends TestCase $collector->shouldReceive('withOpposingAccount')->times(2)->andReturnSelf(); $collector->shouldReceive('ignoreCache')->once()->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->once()->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transferCollection); + $collector->shouldReceive('getTransactions')->andReturn($transferCollection); // set journals for the return method. $collector->shouldReceive('setJournals')->andReturnSelf(); @@ -198,7 +198,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -288,7 +288,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -334,7 +334,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -389,7 +389,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -441,10 +441,10 @@ class ImportArrayStorageTest extends TestCase ->first(); // get transfer as a collection, so the compare routine works. - $journalCollector = new JournalCollector(); - $journalCollector->setUser($this->user()); - $journalCollector->setJournals(new Collection([$transfer])); - $transferCollection = $journalCollector->withOpposingAccount()->getJournals(); + $transactionCollector = new TransactionCollector; + $transactionCollector->setUser($this->user()); + $transactionCollector->setJournals(new Collection([$transfer])); + $transferCollection = $transactionCollector->withOpposingAccount()->getTransactions(); // get some stuff: $tag = $this->user()->tags()->inRandomOrder()->first(); @@ -456,7 +456,7 @@ class ImportArrayStorageTest extends TestCase // mock stuff $repository = $this->mock(ImportJobRepositoryInterface::class); - $collector = $this->mock(JournalCollectorInterface::class); + $collector = $this->mock(TransactionCollectorInterface::class); $tagRepos = $this->mock(TagRepositoryInterface::class); $ruleRepos = $this->mock(RuleRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -480,7 +480,7 @@ class ImportArrayStorageTest extends TestCase $collector->shouldReceive('ignoreCache')->once()->andReturnSelf(); $collector->shouldReceive('withOpposingAccount')->times(2)->andReturnSelf(); $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->once()->andReturnSelf(); - $collector->shouldReceive('getJournals')->andReturn($transferCollection); + $collector->shouldReceive('getTransactions')->andReturn($transferCollection); // set journals for the return method. $collector->shouldReceive('setJournals')->andReturnSelf(); diff --git a/tests/Unit/Transformers/TransactionTransformerTest.php b/tests/Unit/Transformers/TransactionTransformerTest.php index 7bf0ec560c..6fd9041c7f 100644 --- a/tests/Unit/Transformers/TransactionTransformerTest.php +++ b/tests/Unit/Transformers/TransactionTransformerTest.php @@ -25,7 +25,7 @@ namespace Tests\Unit\Transformers; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\JournalCollector; +use FireflyIII\Helpers\Collector\TransactionCollector; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; use FireflyIII\Models\Account; @@ -1453,7 +1453,7 @@ class TransactionTransformerTest extends TestCase */ protected function getTransaction(TransactionJournal $journal): Transaction { - $collector = new JournalCollector; + $collector = new TransactionCollector; $collector->setUser($this->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals(new Collection([$journal])); @@ -1466,7 +1466,7 @@ class TransactionTransformerTest extends TestCase if (!($transactionType === TransactionType::WITHDRAWAL)) { $collector->addFilter(NegativeAmountFilter::class); } - $journals = $collector->getJournals(); + $journals = $collector->getTransactions(); return $journals->first(); }