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

Fix some minor scrutinizer issues.

Browse Source
This commit is contained in:
James Cole 2016-11-28 20:38:03 +01:00
parent a6a2c0c182
commit b33aa733c7
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
12 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Console/Commands/UpgradeDatabase.php
View File

@ -72,8 +72,7 @@ class UpgradeDatabase extends Command
} }
$subQuery = TransactionJournal $subQuery = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('transaction_journals.deleted_at') ->whereNull('transaction_journals.deleted_at')
->whereNull('transactions.deleted_at') ->whereNull('transactions.deleted_at')
->groupBy(['transaction_journals.id']) ->groupBy(['transaction_journals.id'])
@ -98,8 +97,7 @@ class UpgradeDatabase extends Command
try { try {
/** @var Transaction $opposing */ /** @var Transaction $opposing */
$opposing = Transaction $opposing = Transaction::where('transaction_journal_id', $journalId)
::where('transaction_journal_id', $journalId)
->where('amount', $amount)->where('identifier', '=', 0) ->where('amount', $amount)->where('identifier', '=', 0)
->whereNotIn('id', $processed) ->whereNotIn('id', $processed)
->first(); ->first();

18
app/Console/Commands/VerifyDatabase.php
View File

@ -102,8 +102,7 @@ class VerifyDatabase extends Command
*/ */
private function reportAccounts() private function reportAccounts()
{ {
$set = Account $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
->leftJoin('users', 'accounts.user_id', '=', 'users.id') ->leftJoin('users', 'accounts.user_id', '=', 'users.id')
->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email']) ->groupBy(['accounts.id', 'accounts.encrypted', 'accounts.name', 'accounts.user_id', 'users.email'])
->whereNull('transactions.account_id') ->whereNull('transactions.account_id')
@ -125,8 +124,7 @@ class VerifyDatabase extends Command
*/ */
private function reportBudgetLimits() private function reportBudgetLimits()
{ {
$set = Budget $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id')
->leftJoin('users', 'budgets.user_id', '=', 'users.id') ->leftJoin('users', 'budgets.user_id', '=', 'users.id')
->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']) ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email'])
->whereNull('budget_limits.id') ->whereNull('budget_limits.id')
@ -148,8 +146,7 @@ class VerifyDatabase extends Command
*/ */
private function reportDeletedAccounts() private function reportDeletedAccounts()
{ {
$set = Account $set = Account::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
::leftJoin('transactions', 'transactions.account_id', '=', 'accounts.id')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->whereNotNull('accounts.deleted_at') ->whereNotNull('accounts.deleted_at')
->whereNotNull('transactions.id') ->whereNotNull('transactions.id')
@ -187,8 +184,7 @@ class VerifyDatabase extends Command
TransactionType::TRANSFER => [AccountType::EXPENSE, AccountType::REVENUE], TransactionType::TRANSFER => [AccountType::EXPENSE, AccountType::REVENUE],
]; ];
foreach ($configuration as $transactionType => $accountTypes) { foreach ($configuration as $transactionType => $accountTypes) {
$set = TransactionJournal $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id') ->leftJoin('account_types', 'account_types.id', 'accounts.account_type_id')
@ -218,8 +214,7 @@ class VerifyDatabase extends Command
*/ */
private function reportJournals() private function reportJournals()
{ {
$set = TransactionJournal $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNotNull('transaction_journals.deleted_at')// USE THIS ->whereNotNull('transaction_journals.deleted_at')// USE THIS
->whereNull('transactions.deleted_at') ->whereNull('transactions.deleted_at')
->whereNotNull('transactions.id') ->whereNotNull('transactions.id')
@ -245,8 +240,7 @@ class VerifyDatabase extends Command
*/ */
private function reportNoTransactions() private function reportNoTransactions()
{ {
$set = TransactionJournal $set = TransactionJournal::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->groupBy('transaction_journals.id') ->groupBy('transaction_journals.id')
->whereNull('transactions.transaction_journal_id') ->whereNull('transactions.transaction_journal_id')
->get(['transaction_journals.id']); ->get(['transaction_journals.id']);

3
app/Export/Collector/JournalExportCollector.php
View File

@ -292,8 +292,7 @@ class JournalExportCollector extends BasicCollector implements CollectorInterfac
private function getWorkSet() private function getWorkSet()
{ {
$accountIds = $this->accounts->pluck('id')->toArray(); $accountIds = $this->accounts->pluck('id')->toArray();
$this->workSet = Transaction $this->workSet = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin( ->leftJoin(
'transactions AS opposing', function (JoinClause $join) { 'transactions AS opposing', function (JoinClause $join) {
$join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id') $join->on('opposing.transaction_journal_id', '=', 'transactions.transaction_journal_id')

3
app/Helpers/Collector/JournalCollector.php
View File

@ -621,8 +621,7 @@ class JournalCollector implements JournalCollectorInterface
private function startQuery(): EloquentBuilder private function startQuery(): EloquentBuilder
{ {
$query = Transaction $query = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id') ->leftJoin('transaction_currencies', 'transaction_currencies.id', 'transaction_journals.transaction_currency_id')
->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', 'transaction_journals.transaction_type_id')
->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id') ->leftJoin('bills', 'bills.id', 'transaction_journals.bill_id')

6
app/Models/Account.php
View File

@ -199,8 +199,7 @@ class Account extends Model
*/ */
public function getOpeningBalanceAmount(): string public function getOpeningBalanceAmount(): string
{ {
$journal = TransactionJournal $journal = TransactionJournal::sortCorrectly()
::sortCorrectly()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $this->id) ->where('transactions.account_id', $this->id)
->transactionTypes([TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::OPENING_BALANCE])
@ -230,8 +229,7 @@ class Account extends Model
public function getOpeningBalanceDate(): Carbon public function getOpeningBalanceDate(): Carbon
{ {
$date = new Carbon('1900-01-01'); $date = new Carbon('1900-01-01');
$journal = TransactionJournal $journal = TransactionJournal::sortCorrectly()
::sortCorrectly()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $this->id) ->where('transactions.account_id', $this->id)
->transactionTypes([TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::OPENING_BALANCE])

3
app/Models/TransactionJournal.php
View File

@ -64,8 +64,7 @@ class TransactionJournal extends TransactionJournalSupport
public static function routeBinder($value) public static function routeBinder($value)
{ {
if (auth()->check()) { if (auth()->check()) {
$object = TransactionJournal $object = TransactionJournal::where('transaction_journals.id', $value)
::where('transaction_journals.id', $value)
->with('transactionType') ->with('transactionType')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->where('user_id', auth()->user()->id)->first(['transaction_journals.*']); ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']);

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

@ -367,8 +367,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
protected function openingBalanceTransaction(Account $account): TransactionJournal protected function openingBalanceTransaction(Account $account): TransactionJournal
{ {
$journal = TransactionJournal $journal = TransactionJournal::sortCorrectly()
::sortCorrectly()
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $account->id) ->where('transactions.account_id', $account->id)
->transactionTypes([TransactionType::OPENING_BALANCE]) ->transactionTypes([TransactionType::OPENING_BALANCE])

6
app/Repositories/Account/AccountTasker.php
View File

@ -249,8 +249,7 @@ class AccountTasker implements AccountTaskerInterface
$joinModifier = $incoming ? '<' : '>'; $joinModifier = $incoming ? '<' : '>';
$selection = $incoming ? '>' : '<'; $selection = $incoming ? '>' : '<';
$query = Transaction $query = Transaction::distinct()
::distinct()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin( ->leftJoin(
'transactions as other_side', function (JoinClause $join) use ($joinModifier) { 'transactions as other_side', function (JoinClause $join) use ($joinModifier) {
@ -302,8 +301,7 @@ class AccountTasker implements AccountTaskerInterface
$collection = new Collection; $collection = new Collection;
$joinModifier = $incoming ? '<' : '>'; $joinModifier = $incoming ? '<' : '>';
$selection = $incoming ? '>' : '<'; $selection = $incoming ? '>' : '<';
$query = Transaction $query = Transaction::distinct()
::distinct()
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id') ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
->leftJoin( ->leftJoin(

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

@ -332,8 +332,7 @@ class BudgetRepository implements BudgetRepositoryInterface
Log::debug('spentInPeriod: and these accounts: ', $accountIds); Log::debug('spentInPeriod: and these accounts: ', $accountIds);
Log::debug(sprintf('spentInPeriod: Start date is "%s", end date is "%s"', $start->format('Y-m-d'), $end->format('Y-m-d'))); Log::debug(sprintf('spentInPeriod: Start date is "%s", end date is "%s"', $start->format('Y-m-d'), $end->format('Y-m-d')));
$fromJournalsQuery = TransactionJournal $fromJournalsQuery = TransactionJournal::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
::leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->leftJoin( ->leftJoin(
'transactions', function (JoinClause $join) { 'transactions', function (JoinClause $join) {
@ -368,8 +367,7 @@ class BudgetRepository implements BudgetRepositoryInterface
* and budget_transaction.budget_id in (1,61) * and budget_transaction.budget_id in (1,61)
* and transactions.account_id in (2) * and transactions.account_id in (2)
*/ */
$fromTransactionsQuery = Transaction $fromTransactionsQuery = Transaction::leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id')
::leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->whereNull('transactions.deleted_at') ->whereNull('transactions.deleted_at')

4
app/Repositories/Journal/JournalTasker.php
View File

@ -171,9 +171,7 @@ class JournalTasker implements JournalTaskerInterface
$identifier = intval($transaction->identifier); $identifier = intval($transaction->identifier);
// go! // go!
$sum $sum = Transaction::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
= Transaction
::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('account_id', $transaction->account_id) ->where('account_id', $transaction->account_id)
->whereNull('transactions.deleted_at') ->whereNull('transactions.deleted_at')
->whereNull('transaction_journals.deleted_at') ->whereNull('transaction_journals.deleted_at')

3
app/Repositories/User/UserRepository.php
View File

@ -113,8 +113,7 @@ class UserRepository implements UserRepositoryInterface
$return['bills'] = $user->bills()->count(); $return['bills'] = $user->bills()->count();
$return['categories'] = $user->categories()->count(); $return['categories'] = $user->categories()->count();
$return['budgets'] = $user->budgets()->count(); $return['budgets'] = $user->budgets()->count();
$return['budgets_with_limits'] = BudgetLimit $return['budgets_with_limits'] = BudgetLimit::distinct()
::distinct()
->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id')
->where('amount', '>', 0) ->where('amount', '>', 0)
->whereNull('budgets.deleted_at') ->whereNull('budgets.deleted_at')

9
app/Support/Twig/Transaction.php
View File

@ -109,8 +109,7 @@ class Transaction extends Twig_Extension
'optionalJournalAmount', function (int $journalId, string $transactionAmount, string $code, string $type): string { 'optionalJournalAmount', function (int $journalId, string $transactionAmount, string $code, string $type): string {
$amount = strval( $amount = strval(
TransactionModel TransactionModel::where('transaction_journal_id', $journalId)
::where('transaction_journal_id', $journalId)
->whereNull('deleted_at') ->whereNull('deleted_at')
->where('amount', '<', 0) ->where('amount', '<', 0)
->sum('amount') ->sum('amount')
@ -204,8 +203,7 @@ class Transaction extends Twig_Extension
// if the amount is negative, find the opposing account and use that one: // if the amount is negative, find the opposing account and use that one:
$journalId = $transaction->journal_id; $journalId = $transaction->journal_id;
/** @var TransactionModel $other */ /** @var TransactionModel $other */
$other = TransactionModel $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier) ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')
@ -278,8 +276,7 @@ class Transaction extends Twig_Extension
if (bccomp($transaction->transaction_amount, '0') === 1 && is_null($transaction->opposing_account_id)) { if (bccomp($transaction->transaction_amount, '0') === 1 && is_null($transaction->opposing_account_id)) {
$journalId = $transaction->journal_id; $journalId = $transaction->journal_id;
/** @var TransactionModel $other */ /** @var TransactionModel $other */
$other = TransactionModel $other = TransactionModel::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
::where('transaction_journal_id', $journalId)->where('transactions.id', '!=', $transaction->id)
->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier) ->where('amount', '=', bcmul($transaction->transaction_amount, '-1'))->where('identifier', $transaction->identifier)
->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id')