kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Move to object held user object.

Browse Source
This commit is contained in:
James Cole
2016-03-20 16:47:53 +01:00
parent 6602b1587a
commit 745e0aa525
1 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@
namespace FireflyIII\Repositories\Account; namespace FireflyIII\Repositories\Account;
use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
use DB; use DB;
@@ -52,7 +51,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function countAccounts(array $types): int public function countAccounts(array $types): int
{ {
$count = Auth::user()->accounts()->accountTypeIn($types)->count(); $count = $this->user->accounts()->accountTypeIn($types)->count();
return $count; return $count;
} }
@@ -84,7 +83,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function find(int $accountId): Account public function find(int $accountId): Account
{ {
return Auth::user()->accounts()->findOrNew($accountId); return $this->user->accounts()->findOrNew($accountId);
} }
/** /**
@@ -107,7 +106,7 @@ class AccountRepository implements AccountRepositoryInterface
public function getAccounts(array $types): Collection public function getAccounts(array $types): Collection
{ {
/** @var Collection $result */ /** @var Collection $result */
$result = Auth::user()->accounts()->with( $result = $this->user->accounts()->with(
['accountmeta' => function (HasMany $query) { ['accountmeta' => function (HasMany $query) {
$query->where('name', 'accountRole'); $query->where('name', 'accountRole');
}] }]
@@ -135,22 +134,22 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function getCreditCards(Carbon $date): Collection public function getCreditCards(Carbon $date): Collection
{ {
$set = Auth::user()->accounts() $set = $this->user->accounts()
->hasMetaValue('accountRole', 'ccAsset') ->hasMetaValue('accountRole', 'ccAsset')
->hasMetaValue('ccType', 'monthlyFull') ->hasMetaValue('ccType', 'monthlyFull')
->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')
->whereNull('transactions.deleted_at') ->whereNull('transactions.deleted_at')
->where('transaction_journals.date', '<=', $date->format('Y-m-d')) ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))
->groupBy('accounts.id') ->groupBy('accounts.id')
->get( ->get(
[ [
'accounts.*', 'accounts.*',
'ccType.data as ccType', 'ccType.data as ccType',
'accountRole.data as accountRole', 'accountRole.data as accountRole',
DB::Raw('SUM(`transactions`.`amount`) AS `balance`'), DB::Raw('SUM(`transactions`.`amount`) AS `balance`'),
] ]
); );
return $set; return $set;
} }
@@ -178,7 +177,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function getFrontpageAccounts(Preference $preference): Collection public function getFrontpageAccounts(Preference $preference): Collection
{ {
$query = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account']); $query = $this->user->accounts()->accountTypeIn(['Default account', 'Asset account']);
if (count($preference->data) > 0) { if (count($preference->data) > 0) {
$query->whereIn('accounts.id', $preference->data); $query->whereIn('accounts.id', $preference->data);
@@ -202,20 +201,20 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end): Collection public function getFrontpageTransactions(Account $account, Carbon $start, Carbon $end): Collection
{ {
$set = Auth::user() $set = $this->user
->transactionjournals() ->transactionjournals()
->with(['transactions']) ->with(['transactions'])
->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')->where('accounts.id', $account->id) ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')->where('accounts.id', $account->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')
->before($end) ->before($end)
->after($start) ->after($start)
->orderBy('transaction_journals.date', 'DESC') ->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->take(10) ->take(10)
->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']); ->get(['transaction_journals.*', 'transaction_currencies.symbol', 'transaction_types.type']);
return $set; return $set;
} }
@@ -229,14 +228,14 @@ class AccountRepository implements AccountRepositoryInterface
public function getJournals(Account $account, $page): LengthAwarePaginator public function getJournals(Account $account, $page): LengthAwarePaginator
{ {
$offset = ($page - 1) * 50; $offset = ($page - 1) * 50;
$query = Auth::user() $query = $this->user
->transactionJournals() ->transactionJournals()
->withRelevantData() ->withRelevantData()
->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)
->orderBy('transaction_journals.date', 'DESC') ->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC'); ->orderBy('transaction_journals.id', 'DESC');
$count = $query->count(); $count = $query->count();
$set = $query->take(50)->offset($offset)->get(['transaction_journals.*']); $set = $query->take(50)->offset($offset)->get(['transaction_journals.*']);
@@ -262,7 +261,7 @@ class AccountRepository implements AccountRepositoryInterface
$ids = array_unique($ids); $ids = array_unique($ids);
if (count($ids) > 0) { if (count($ids) > 0) {
$accounts = Auth::user()->accounts()->whereIn('id', $ids)->where('accounts.active', 1)->get(); $accounts = $this->user->accounts()->whereIn('id', $ids)->where('accounts.active', 1)->get();
} }
bcscale(2); bcscale(2);
@@ -296,12 +295,12 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function getSavingsAccounts(): Collection public function getSavingsAccounts(): Collection
{ {
$accounts = Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC') $accounts = $this->user->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')
->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
->where('account_meta.name', 'accountRole') ->where('account_meta.name', 'accountRole')
->where('accounts.active', 1) ->where('accounts.active', 1)
->where('account_meta.data', '"savingAsset"') ->where('account_meta.data', '"savingAsset"')
->get(['accounts.*']); ->get(['accounts.*']);
$start = clone Session::get('start', new Carbon); $start = clone Session::get('start', new Carbon);
$end = clone Session::get('end', new Carbon); $end = clone Session::get('end', new Carbon);
@@ -426,7 +425,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function sumOfEverything(): string public function sumOfEverything(): string
{ {
return strval(Auth::user()->transactions()->sum('amount')); return strval($this->user->transactions()->sum('amount'));
} }
/** /**