From c39659b0645c4fac40835c39d6e1f3e43a8cd108 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 23 Oct 2016 12:19:32 +0200 Subject: [PATCH] Remove a lot of references to user id. --- app/Http/Controllers/NewUserController.php | 3 --- app/Http/Controllers/RuleController.php | 3 --- app/Http/Controllers/RuleGroupController.php | 1 - app/Http/Controllers/Transaction/MassController.php | 1 - app/Http/Controllers/Transaction/SplitController.php | 1 - app/Http/Requests/AccountFormRequest.php | 6 ++---- app/Http/Requests/BillFormRequest.php | 8 +++----- app/Http/Requests/BudgetFormRequest.php | 6 ++---- app/Http/Requests/CategoryFormRequest.php | 6 ++---- app/Http/Requests/CurrencyFormRequest.php | 4 +--- app/Http/Requests/JournalFormRequest.php | 4 +--- app/Http/Requests/PiggyBankFormRequest.php | 5 ++--- app/Http/Requests/RuleFormRequest.php | 5 ++--- app/Http/Requests/TagFormRequest.php | 7 +++---- app/Repositories/Account/AccountRepository.php | 11 ++++------- app/Repositories/Bill/BillRepository.php | 2 +- app/Repositories/Budget/BudgetRepository.php | 2 +- app/Repositories/Category/CategoryRepository.php | 2 +- app/Repositories/Journal/JournalRepository.php | 12 ++++++------ app/Repositories/Rule/RuleRepository.php | 2 +- app/Repositories/RuleGroup/RuleGroupRepository.php | 2 +- 21 files changed, 33 insertions(+), 60 deletions(-) diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index c15d3ce88c..1fe99c6918 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -107,7 +107,6 @@ class NewUserController extends Controller 'accountType' => 'asset', 'virtualBalance' => 0, 'active' => true, - 'user' => auth()->user()->id, 'accountRole' => 'defaultAsset', 'openingBalance' => round($request->input('bank_balance'), 2), 'openingBalanceDate' => new Carbon, @@ -133,7 +132,6 @@ class NewUserController extends Controller 'accountType' => 'asset', 'virtualBalance' => 0, 'active' => true, - 'user' => auth()->user()->id, 'accountRole' => 'savingAsset', 'openingBalance' => round($request->input('savings_balance'), 2), 'openingBalanceDate' => new Carbon, @@ -158,7 +156,6 @@ class NewUserController extends Controller 'accountType' => 'asset', 'virtualBalance' => round($request->get('credit_card_limit'), 2), 'active' => true, - 'user' => auth()->user()->id, 'accountRole' => 'ccAsset', 'openingBalance' => null, 'openingBalanceDate' => null, diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 3da1f68812..4b0687a559 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -240,7 +240,6 @@ class RuleController extends Controller { $data = $request->getRuleData(); $data['rule_group_id'] = $ruleGroup->id; - $data['user_id'] = auth()->user()->id; $rule = $repository->store($data); Session::flash('success', trans('firefly.stored_new_rule', ['title' => $rule->title])); @@ -353,7 +352,6 @@ class RuleController extends Controller $data = [ 'rule_group_id' => $repository->getFirstRuleGroup()->id, 'stop_processing' => 0, - 'user_id' => auth()->user()->id, 'title' => trans('firefly.default_rule_name'), 'description' => trans('firefly.default_rule_description'), 'trigger' => 'store-journal', @@ -386,7 +384,6 @@ class RuleController extends Controller if ($repository->count() === 0) { $data = [ - 'user_id' => auth()->user()->id, 'title' => trans('firefly.default_rule_group_name'), 'description' => trans('firefly.default_rule_group_description'), ]; diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 7cf91da709..af62ca2085 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -205,7 +205,6 @@ class RuleGroupController extends Controller public function store(RuleGroupFormRequest $request, RuleGroupRepositoryInterface $repository) { $data = $request->getRuleGroupData(); - $data['user_id'] = auth()->user()->id; $ruleGroup = $repository->store($data); Session::flash('success', strval(trans('firefly.created_new_rule_group', ['title' => $ruleGroup->title]))); diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index 55096119d9..2d9140ce1d 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -209,7 +209,6 @@ class MassController extends Controller 'destination_account_id' => intval($destAccountId), 'destination_account_name' => $destAccountName, 'amount' => round($request->get('amount')[$journal->id], 4), - 'user' => auth()->user()->id, 'amount_currency_id_amount' => intval($request->get('amount_currency_id_amount_' . $journal->id)), 'date' => new Carbon($request->get('date')[$journal->id]), 'interest_date' => $journal->interest_date, diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index a50e31ccbf..d77d48ba34 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -273,7 +273,6 @@ class SplitController extends Controller 'amount' => round($transaction['amount'] ?? 0, 2), 'budget_id' => isset($transaction['budget_id']) ? intval($transaction['budget_id']) : 0, 'category' => $transaction['category'] ?? '', - 'user' => auth()->user()->id, // needed for accounts. ]; } diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php index 1968e5bdca..f5e5eb7634 100644 --- a/app/Http/Requests/AccountFormRequest.php +++ b/app/Http/Requests/AccountFormRequest.php @@ -15,7 +15,6 @@ namespace FireflyIII\Http\Requests; use Carbon\Carbon; use FireflyIII\Models\Account; -use Input; /** * Class AccountFormRequest @@ -45,7 +44,6 @@ class AccountFormRequest extends Request 'accountType' => $this->input('what'), 'virtualBalance' => round($this->input('virtualBalance'), 2), 'virtualBalanceCurrency' => intval($this->input('amount_currency_id_virtualBalance')), - 'user' => auth()->user()->id, 'iban' => trim($this->input('iban')), 'accountNumber' => trim($this->input('accountNumber')), 'accountRole' => $this->input('accountRole'), @@ -68,9 +66,9 @@ class AccountFormRequest extends Request $nameRule = 'required|min:1|uniqueAccountForUser'; $idRule = ''; - if (Account::find(Input::get('id'))) { + if (Account::find($this->get('id'))) { $idRule = 'belongsToUser:accounts'; - $nameRule = 'required|min:1|uniqueAccountForUser:' . Input::get('id'); + $nameRule = 'required|min:1|uniqueAccountForUser:' . $this->get('id'); } return [ diff --git a/app/Http/Requests/BillFormRequest.php b/app/Http/Requests/BillFormRequest.php index 3e1b5eb93b..b16ce0ec33 100644 --- a/app/Http/Requests/BillFormRequest.php +++ b/app/Http/Requests/BillFormRequest.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; use Carbon\Carbon; -use Input; /** * Class BillFormRequest @@ -46,7 +45,6 @@ class BillFormRequest extends Request 'amount_currency_id_amount_max' => intval($this->get('amount_currency_id_amount_max')), 'amount_max' => round($this->get('amount_max'), 2), 'date' => new Carbon($this->get('date')), - 'user' => auth()->user()->id, 'repeat_freq' => $this->get('repeat_freq'), 'skip' => intval($this->get('skip')), 'automatch' => intval($this->get('automatch')) === 1, @@ -61,9 +59,9 @@ class BillFormRequest extends Request { $nameRule = 'required|between:1,255|uniqueObjectForUser:bills,name'; $matchRule = 'required|between:1,255|uniqueObjectForUser:bills,match'; - if (intval(Input::get('id')) > 0) { - $nameRule .= ',' . intval(Input::get('id')); - $matchRule .= ',' . intval(Input::get('id')); + if (intval($this->get('id')) > 0) { + $nameRule .= ',' . intval($this->get('id')); + $matchRule .= ',' . intval($this->get('id')); } $rules = [ diff --git a/app/Http/Requests/BudgetFormRequest.php b/app/Http/Requests/BudgetFormRequest.php index 503e54be76..6228bdf35f 100644 --- a/app/Http/Requests/BudgetFormRequest.php +++ b/app/Http/Requests/BudgetFormRequest.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; use FireflyIII\Models\Budget; -use Input; /** * Class BudgetFormRequest @@ -39,7 +38,6 @@ class BudgetFormRequest extends Request { return [ 'name' => trim($this->input('name')), - 'user' => auth()->user()->id, 'active' => intval($this->input('active')) == 1, ]; } @@ -51,8 +49,8 @@ class BudgetFormRequest extends Request { $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name'; - if (Budget::find(Input::get('id'))) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval(Input::get('id')); + if (Budget::find($this->get('id'))) { + $nameRule = 'required|between:1,100|uniqueObjectForUser:budgets,name,' . intval($this->get('id')); } return [ diff --git a/app/Http/Requests/CategoryFormRequest.php b/app/Http/Requests/CategoryFormRequest.php index 0bd46dbd29..fb676b8d79 100644 --- a/app/Http/Requests/CategoryFormRequest.php +++ b/app/Http/Requests/CategoryFormRequest.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; use FireflyIII\Models\Category; -use Input; /** * Class CategoryFormRequest @@ -40,7 +39,6 @@ class CategoryFormRequest extends Request { return [ 'name' => trim($this->input('name')), - 'user' => auth()->user()->id, ]; } @@ -51,8 +49,8 @@ class CategoryFormRequest extends Request { $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name'; - if (Category::find(Input::get('id'))) { - $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval(Input::get('id')); + if (Category::find($this->get('id'))) { + $nameRule = 'required|between:1,100|uniqueObjectForUser:categories,name,' . intval($this->get('id')); } return [ diff --git a/app/Http/Requests/CurrencyFormRequest.php b/app/Http/Requests/CurrencyFormRequest.php index 6bfe964e65..74b805be84 100644 --- a/app/Http/Requests/CurrencyFormRequest.php +++ b/app/Http/Requests/CurrencyFormRequest.php @@ -13,8 +13,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; -use Input; - /** * Class BillFormRequest * @@ -55,7 +53,7 @@ class CurrencyFormRequest extends Request 'name' => 'required|max:48|min:1|unique:transaction_currencies,name', 'symbol' => 'required|min:1|max:8|unique:transaction_currencies,symbol', ]; - if (intval(Input::get('id')) > 0) { + if (intval($this->get('id')) > 0) { $rules = [ 'code' => 'required|min:3|max:3', 'name' => 'required|max:48|min:1', diff --git a/app/Http/Requests/JournalFormRequest.php b/app/Http/Requests/JournalFormRequest.php index 289c0b77fa..df01440f4a 100644 --- a/app/Http/Requests/JournalFormRequest.php +++ b/app/Http/Requests/JournalFormRequest.php @@ -16,7 +16,6 @@ namespace FireflyIII\Http\Requests; use Carbon\Carbon; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\TransactionType; -use Input; /** * Class JournalFormRequest @@ -44,7 +43,6 @@ class JournalFormRequest extends Request { $data = [ 'what' => $this->get('what'), // type. can be 'deposit', 'withdrawal' or 'transfer' - 'user' => auth()->user()->id, 'date' => new Carbon($this->get('date')), 'tags' => explode(',', $this->getFieldOrEmptyString('tags')), 'currency_id' => intval($this->get('amount_currency_id_amount')), @@ -80,7 +78,7 @@ class JournalFormRequest extends Request */ public function rules() { - $what = Input::get('what'); + $what = $this->get('what'); $rules = [ 'what' => 'required|in:withdrawal,deposit,transfer', 'date' => 'required|date', diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index 5c991aab29..69c11d70b2 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; use Carbon\Carbon; -use Input; /** * Class PiggyBankFormRequest @@ -56,8 +55,8 @@ class PiggyBankFormRequest extends Request $nameRule = 'required|between:1,255|uniquePiggyBankForUser'; $targetDateRule = 'date'; - if (intval(Input::get('id'))) { - $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval(Input::get('id')); + if (intval($this->get('id'))) { + $nameRule = 'required|between:1,255|uniquePiggyBankForUser:' . intval($this->get('id')); } diff --git a/app/Http/Requests/RuleFormRequest.php b/app/Http/Requests/RuleFormRequest.php index c0f927e88c..5a58730c6a 100644 --- a/app/Http/Requests/RuleFormRequest.php +++ b/app/Http/Requests/RuleFormRequest.php @@ -14,7 +14,6 @@ declare(strict_types = 1); namespace FireflyIII\Http\Requests; use FireflyIII\Models\RuleGroup; -use Input; /** * Class RuleFormRequest @@ -66,8 +65,8 @@ class RuleFormRequest extends Request $contextActions = join(',', config('firefly.rule-actions-text')); $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title'; - if (RuleGroup::find(Input::get('id'))) { - $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval(Input::get('id')); + if (RuleGroup::find($this->get('id'))) { + $titleRule = 'required|between:1,100|uniqueObjectForUser:rule_groups,title,' . intval($this->get('id')); } $rules = [ diff --git a/app/Http/Requests/TagFormRequest.php b/app/Http/Requests/TagFormRequest.php index 086943d7f5..3a79119963 100644 --- a/app/Http/Requests/TagFormRequest.php +++ b/app/Http/Requests/TagFormRequest.php @@ -14,7 +14,6 @@ namespace FireflyIII\Http\Requests; use Carbon\Carbon; use FireflyIII\Models\Tag; -use Input; /** * Class TagFormRequest @@ -38,7 +37,7 @@ class TagFormRequest extends Request */ public function collectTagData() :array { - if (Input::get('setTag') == 'true') { + if ($this->get('setTag') == 'true') { $latitude = $this->get('latitude'); $longitude = $this->get('longitude'); $zoomLevel = $this->get('zoomLevel'); @@ -71,9 +70,9 @@ class TagFormRequest extends Request { $idRule = ''; $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag'; - if (Tag::find(Input::get('id'))) { + if (Tag::find($this->get('id'))) { $idRule = 'belongsToUser:tags'; - $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . Input::get('id'); + $tagRule = 'required|min:1|uniqueObjectForUser:tags,tag,' . $this->get('id'); } return [ diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 8a507fb811..b7421c1e6b 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -388,7 +388,7 @@ class AccountRepository implements AccountRepositoryInterface // create it: $newAccount = new Account( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'account_type_id' => $accountType->id, 'name' => $data['name'], 'virtual_balance' => $data['virtualBalance'], @@ -417,13 +417,12 @@ class AccountRepository implements AccountRepositoryInterface protected function storeInitialBalance(Account $account, array $data): TransactionJournal { $amount = $data['openingBalance']; - $user = $data['user']; $name = $data['name']; - $opposing = $this->storeOpposingAccount($amount, $user, $name); + $opposing = $this->storeOpposingAccount($amount, $name); $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first(); $journal = TransactionJournal::create( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'transaction_type_id' => $transactionType->id, 'transaction_currency_id' => $data['openingBalanceCurrency'], 'description' => 'Initial balance for "' . $account->name . '"', @@ -458,16 +457,14 @@ class AccountRepository implements AccountRepositoryInterface /** * @param float $amount - * @param int $user * @param string $name * * @return Account */ - protected function storeOpposingAccount(float $amount, int $user, string $name):Account + protected function storeOpposingAccount(float $amount, string $name):Account { $type = $amount < 0 ? 'expense' : 'revenue'; $opposingData = [ - 'user' => $user, 'accountType' => $type, 'name' => $name . ' initial balance', 'active' => false, diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index 0412c3080c..74c69de499 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -610,7 +610,7 @@ class BillRepository implements BillRepositoryInterface 'name' => $data['name'], 'match' => $data['match'], 'amount_min' => $data['amount_min'], - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'amount_max' => $data['amount_max'], 'date' => $data['date'], 'repeat_freq' => $data['repeat_freq'], diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index b2a3440295..b674435881 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -500,7 +500,7 @@ class BudgetRepository implements BudgetRepositoryInterface { $newBudget = new Budget( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'name' => $data['name'], ] ); diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index ac3ea1e285..9a47d6cc8b 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -433,7 +433,7 @@ class CategoryRepository implements CategoryRepositoryInterface { $newCategory = Category::firstOrCreateEncrypted( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'name' => $data['name'], ] ); diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 9c047824d8..4f0f5b3342 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -107,7 +107,7 @@ class JournalRepository implements JournalRepositoryInterface $transactionType = TransactionType::where('type', ucfirst($data['what']))->first(); $journal = new TransactionJournal( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'transaction_type_id' => $transactionType->id, 'transaction_currency_id' => $data['currency_id'], 'description' => $data['description'], @@ -182,7 +182,7 @@ class JournalRepository implements JournalRepositoryInterface // store actual journal. $journal = new TransactionJournal( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'transaction_type_id' => $transactionType->id, 'transaction_currency_id' => $data['amount_currency_id_amount'], 'description' => $data['description'], @@ -478,7 +478,7 @@ class JournalRepository implements JournalRepositoryInterface if (strlen($data['source_account_name']) > 0) { $sourceType = AccountType::where('type', 'Revenue account')->first(); $sourceAccount = Account::firstOrCreateEncrypted( - ['user_id' => $data['user'], 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1] + ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => $data['source_account_name'], 'active' => 1] ); return [ @@ -488,7 +488,7 @@ class JournalRepository implements JournalRepositoryInterface } $sourceType = AccountType::where('type', 'Cash account')->first(); $sourceAccount = Account::firstOrCreateEncrypted( - ['user_id' => $data['user'], 'account_type_id' => $sourceType->id, 'name' => 'Cash account', 'active' => 1] + ['user_id' => $this->user->id, 'account_type_id' => $sourceType->id, 'name' => 'Cash account', 'active' => 1] ); return [ @@ -587,7 +587,7 @@ class JournalRepository implements JournalRepositoryInterface $destinationType = AccountType::where('type', AccountType::EXPENSE)->first(); $destinationAccount = Account::firstOrCreateEncrypted( [ - 'user_id' => $data['user'], + 'user_id' => $this->user->id, 'account_type_id' => $destinationType->id, 'name' => $data['destination_account_name'], 'active' => 1, @@ -601,7 +601,7 @@ class JournalRepository implements JournalRepositoryInterface } $destinationType = AccountType::where('type', 'Cash account')->first(); $destinationAccount = Account::firstOrCreateEncrypted( - ['user_id' => $data['user'], 'account_type_id' => $destinationType->id, 'name' => 'Cash account', 'active' => 1] + ['user_id' => $this->user->id, 'account_type_id' => $destinationType->id, 'name' => 'Cash account', 'active' => 1] ); return [ diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index c1e26fec4b..4b7ce00433 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -233,7 +233,7 @@ class RuleRepository implements RuleRepositoryInterface // start by creating a new rule: $rule = new Rule; - $rule->user()->associate($data['user_id']); + $rule->user()->associate($this->user->id); $rule->rule_group_id = $data['rule_group_id']; $rule->order = ($order + 1); diff --git a/app/Repositories/RuleGroup/RuleGroupRepository.php b/app/Repositories/RuleGroup/RuleGroupRepository.php index 70e91032fb..247078221e 100644 --- a/app/Repositories/RuleGroup/RuleGroupRepository.php +++ b/app/Repositories/RuleGroup/RuleGroupRepository.php @@ -241,7 +241,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface $newRuleGroup = new RuleGroup( [ - 'user_id' => $data['user_id'], + 'user_id' => $this->user->id, 'title' => $data['title'], 'description' => $data['description'], 'order' => ($order + 1),