From 311c1a3c844f2d3ea9bb06d0c74a217fbd015f54 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 30 Jan 2017 16:42:58 +0100 Subject: [PATCH] Implement all setUser methods. --- app/Repositories/Account/AccountRepository.php | 8 ++++++++ .../Account/AccountRepositoryInterface.php | 10 +++++----- app/Repositories/Account/AccountTasker.php | 12 ++++++++++-- app/Repositories/Account/AccountTaskerInterface.php | 10 +++++----- app/Repositories/Attachment/AttachmentRepository.php | 8 +++++++- app/Repositories/Bill/BillRepository.php | 8 +++++++- app/Repositories/Budget/BudgetRepository.php | 8 +++++++- app/Repositories/Category/CategoryRepository.php | 8 +++++++- app/Repositories/Currency/CurrencyRepository.php | 8 +++++++- app/Repositories/ExportJob/ExportJobRepository.php | 8 +++++++- app/Repositories/ImportJob/ImportJobRepository.php | 8 +++++++- app/Repositories/Journal/JournalRepository.php | 8 +++++++- app/Repositories/Journal/JournalTasker.php | 8 ++++++++ app/Repositories/PiggyBank/PiggyBankRepository.php | 8 +++++++- app/Repositories/Rule/RuleRepository.php | 8 +++++++- app/Repositories/RuleGroup/RuleGroupRepository.php | 8 +++++++- app/Repositories/Tag/TagRepository.php | 8 +++++++- 17 files changed, 120 insertions(+), 24 deletions(-) diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index d740291f68..631157d62c 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -323,6 +323,14 @@ class AccountRepository implements AccountRepositoryInterface return $journal->date; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * @param array $data * diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index d19ba94d52..b0ab9b738b 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -27,11 +27,6 @@ use Illuminate\Support\Collection; interface AccountRepositoryInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * Moved here from account CRUD. * @@ -130,6 +125,11 @@ interface AccountRepositoryInterface */ public function oldestJournalDate(Account $account): Carbon; + /** + * @param User $user + */ + public function setUser(User $user); + /** * @param array $data * diff --git a/app/Repositories/Account/AccountTasker.php b/app/Repositories/Account/AccountTasker.php index 126d084e8d..874ceb7a30 100644 --- a/app/Repositories/Account/AccountTasker.php +++ b/app/Repositories/Account/AccountTasker.php @@ -108,8 +108,8 @@ class AccountTasker implements AccountTaskerInterface */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array { - $ids = $accounts->pluck('id')->toArray(); - $yesterday = clone $start; + $ids = $accounts->pluck('id')->toArray(); + $yesterday = clone $start; $yesterday->subDay(); $startSet = Steam::balancesById($ids, $yesterday); $endSet = Steam::balancesById($ids, $end); @@ -155,6 +155,14 @@ class AccountTasker implements AccountTaskerInterface return $return; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * Will return how much money has been going out (ie. spent) by the given account(s). * Alternatively, will return how much money has been coming in (ie. earned) by the given accounts. diff --git a/app/Repositories/Account/AccountTaskerInterface.php b/app/Repositories/Account/AccountTaskerInterface.php index 81ef432b9e..4ea5be74ef 100644 --- a/app/Repositories/Account/AccountTaskerInterface.php +++ b/app/Repositories/Account/AccountTaskerInterface.php @@ -24,11 +24,6 @@ use Illuminate\Support\Collection; */ interface AccountTaskerInterface { - /** - * @param User $user - */ - public function setUser(User $user); - /** * @param Collection $accounts * @param Collection $excluded @@ -62,4 +57,9 @@ interface AccountTaskerInterface */ public function getAccountReport(Collection $accounts, Carbon $start, Carbon $end): array; + /** + * @param User $user + */ + public function setUser(User $user); + } diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 1bc9401624..4ee2b458c6 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -30,7 +30,13 @@ class AttachmentRepository implements AttachmentRepositoryInterface { /** @var User */ private $user; - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * AttachmentRepository constructor. * diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index d3bfa01572..4955145877 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -36,7 +36,13 @@ class BillRepository implements BillRepositoryInterface /** @var User */ private $user; - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * BillRepository constructor. * diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 7c8d2f6391..8d6cde13a8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -47,7 +47,13 @@ class BudgetRepository implements BudgetRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return bool */ diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 32c2eb2135..7d88329dbe 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -43,7 +43,13 @@ class CategoryRepository implements CategoryRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param Category $category * diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index d2eaed1c30..d299bbf4f2 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -39,7 +39,13 @@ class CurrencyRepository implements CurrencyRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param TransactionCurrency $currency * diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index b83818284a..afbdab9248 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -38,7 +38,13 @@ class ExportJobRepository implements ExportJobRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param ExportJob $job * @param string $status diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index d7f4ac30cf..88d54f4a81 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -37,7 +37,13 @@ class ImportJobRepository implements ImportJobRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param string $fileType * diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 9ee336cddf..aa28551d4c 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -52,7 +52,13 @@ class JournalRepository implements JournalRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param TransactionJournal $journal * @param TransactionType $type diff --git a/app/Repositories/Journal/JournalTasker.php b/app/Repositories/Journal/JournalTasker.php index eb77c77e6f..5f9f610ca1 100644 --- a/app/Repositories/Journal/JournalTasker.php +++ b/app/Repositories/Journal/JournalTasker.php @@ -152,6 +152,14 @@ class JournalTasker implements JournalTaskerInterface return $transactions; } + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } + /** * Collect the balance of an account before the given transaction has hit. This is tricky, because * the balance does not depend on the transaction itself but the journal it's part of. And of course diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 5a9f07704c..fad4b0f4fa 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -41,7 +41,13 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @param PiggyBank $piggyBank * @param string $amount diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index 4b7ce00433..05849acd5d 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -39,7 +39,13 @@ class RuleRepository implements RuleRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return int */ diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index b294e19937..7a6afa6f0e 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -39,7 +39,13 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * @return int */ diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index 8145be1151..a344da412a 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -43,7 +43,13 @@ class TagRepository implements TagRepositoryInterface { $this->user = $user; } - + /** + * @param User $user + */ + public function setUser(User $user) + { + $this->user = $user; + } /** * * @param TransactionJournal $journal