IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove a lot of references to user id.

Browse Source
This commit is contained in:
James Cole 2016-10-23 12:19:32 +02:00
parent 9a30fbd05a
commit c39659b064
21 changed files with 33 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/NewUserController.php
View File

@ -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,

3
app/Http/Controllers/RuleController.php
View File

@ -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'),
];

1
app/Http/Controllers/RuleGroupController.php
View File

@ -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])));

1
app/Http/Controllers/Transaction/MassController.php
View File

@ -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,

1
app/Http/Controllers/Transaction/SplitController.php
View File

@ -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.
];
}

6
app/Http/Requests/AccountFormRequest.php
View File

@ -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 [

8
app/Http/Requests/BillFormRequest.php
View File

@ -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 = [

6
app/Http/Requests/BudgetFormRequest.php
View File

@ -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 [

6
app/Http/Requests/CategoryFormRequest.php
View File

@ -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 [

4
app/Http/Requests/CurrencyFormRequest.php
View File

@ -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',

4
app/Http/Requests/JournalFormRequest.php
View File

@ -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',

5
app/Http/Requests/PiggyBankFormRequest.php
View File

@ -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'));
}

5
app/Http/Requests/RuleFormRequest.php
View File

@ -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 = [

7
app/Http/Requests/TagFormRequest.php
View File

@ -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 [

11
app/Repositories/Account/AccountRepository.php
View File

@ -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,

2
app/Repositories/Bill/BillRepository.php
View File

@ -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'],

2
app/Repositories/Budget/BudgetRepository.php
View File

@ -500,7 +500,7 @@ class BudgetRepository implements BudgetRepositoryInterface
{
$newBudget = new Budget(
[
'user_id' => $data['user'],
'user_id' => $this->user->id,
'name' => $data['name'],
]
);

2
app/Repositories/Category/CategoryRepository.php
View File

@ -433,7 +433,7 @@ class CategoryRepository implements CategoryRepositoryInterface
{
$newCategory = Category::firstOrCreateEncrypted(
[
'user_id' => $data['user'],
'user_id' => $this->user->id,
'name' => $data['name'],
]
);

12
app/Repositories/Journal/JournalRepository.php
View File

@ -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 [

2
app/Repositories/Rule/RuleRepository.php
View File

@ -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);

2
app/Repositories/RuleGroup/RuleGroupRepository.php
View File

@ -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),