Added a new argument to the constructor of the account repository which should correctly inject the user.

This commit is contained in:
James Cole
2016-03-03 08:31:18 +01:00
parent fcf16051a2
commit 8008311d9c
5 changed files with 136 additions and 65 deletions

View File

@@ -0,0 +1,49 @@
<?php
namespace FireflyIII\Providers;
use Auth;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Foundation\Application;
use Illuminate\Support\ServiceProvider;
/**
* Class AccountServiceProvider
*
* @package FireflyIII\Providers
*/
class AccountServiceProvider extends ServiceProvider
{
/**
* Bootstrap the application services.
*
* @return void
*/
public function boot()
{
//
}
/**
* Register the application services.
*
* @return void
*/
public function register()
{
$this->app->bind(
'FireflyIII\Repositories\Account\AccountRepositoryInterface',
function (Application $app, array $arguments) {
if (!isset($arguments[0]) && Auth::check()) {
return app('FireflyIII\Repositories\Account\AccountRepository', [Auth::user()]);
} else {
if (!isset($arguments[0]) && !Auth::check()) {
throw new FireflyException('There is no user present.');
}
}
return app('FireflyIII\Repositories\Account\AccountRepository', $arguments);
}
);
}
}

View File

@@ -19,6 +19,7 @@ use Illuminate\Support\ServiceProvider;
use Twig; use Twig;
use TwigBridge\Extension\Loader\Functions; use TwigBridge\Extension\Loader\Functions;
use Validator; use Validator;
use Auth;
/** /**
* Class FireflyServiceProvider * Class FireflyServiceProvider
@@ -82,7 +83,7 @@ class FireflyServiceProvider extends ServiceProvider
} }
); );
$this->app->bind('FireflyIII\Repositories\Account\AccountRepositoryInterface', 'FireflyIII\Repositories\Account\AccountRepository');
$this->app->bind('FireflyIII\Repositories\Budget\BudgetRepositoryInterface', 'FireflyIII\Repositories\Budget\BudgetRepository'); $this->app->bind('FireflyIII\Repositories\Budget\BudgetRepositoryInterface', 'FireflyIII\Repositories\Budget\BudgetRepository');
$this->app->bind('FireflyIII\Repositories\Category\CategoryRepositoryInterface', 'FireflyIII\Repositories\Category\CategoryRepository'); $this->app->bind('FireflyIII\Repositories\Category\CategoryRepositoryInterface', 'FireflyIII\Repositories\Category\CategoryRepository');
$this->app->bind('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface', 'FireflyIII\Repositories\Category\SingleCategoryRepository'); $this->app->bind('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface', 'FireflyIII\Repositories\Category\SingleCategoryRepository');

View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Account; namespace FireflyIII\Repositories\Account;
use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
use DB; use DB;
@@ -16,6 +15,7 @@ use FireflyIII\Models\Preference;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\User;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Pagination\LengthAwarePaginator;
@@ -33,9 +33,22 @@ use Steam;
class AccountRepository implements AccountRepositoryInterface class AccountRepository implements AccountRepositoryInterface
{ {
/** @var User */
private $user;
/** @var array Valid field names of account_meta */ /** @var array Valid field names of account_meta */
private $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType', 'accountNumber']; private $validFields = ['accountRole', 'ccMonthlyPaymentDate', 'ccType', 'accountNumber'];
/**
* AccountRepository constructor.
*
* @param User $user
*/
public function __construct(User $user)
{
Log::debug('Constructed for user #' . $user->id . ' (' . $user->email . ')');
$this->user = $user;
}
/** /**
* @param array $types * @param array $types
* *
@@ -43,7 +56,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;
} }
@@ -75,7 +88,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);
} }
/** /**
@@ -87,7 +100,7 @@ class AccountRepository implements AccountRepositoryInterface
*/ */
public function get(array $ids): Collection public function get(array $ids): Collection
{ {
return Auth::user()->accounts()->whereIn('id', $ids)->get(['accounts.*']); return $this->user->accounts()->whereIn('id', $ids)->get(['accounts.*']);
} }
/** /**
@@ -98,7 +111,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');
}] }]
@@ -126,7 +139,7 @@ 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')
@@ -166,7 +179,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);
@@ -187,7 +200,7 @@ 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()
->expanded() ->expanded()
->before($end) ->before($end)
@@ -210,7 +223,7 @@ 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()
->expanded() ->expanded()
->where( ->where(
@@ -247,7 +260,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);
@@ -281,7 +294,7 @@ 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)
@@ -399,7 +412,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'));
} }
/** /**

View File

@@ -31,9 +31,11 @@ class CacheProperties
public function __construct() public function __construct()
{ {
$this->properties = new Collection; $this->properties = new Collection;
if (Auth::check()) {
$this->addProperty(Auth::user()->id); $this->addProperty(Auth::user()->id);
$this->addProperty(Prefs::lastActivity()); $this->addProperty(Prefs::lastActivity());
} }
}
/** /**
* @param $property * @param $property

View File

@@ -150,6 +150,12 @@ return [
Collective\Html\HtmlServiceProvider::class, Collective\Html\HtmlServiceProvider::class,
/*
* More service providers.
*/
FireflyIII\Providers\AccountServiceProvider::class,
/* /*
* Application Service Providers... * Application Service Providers...
*/ */
@@ -159,6 +165,7 @@ return [
FireflyIII\Providers\RouteServiceProvider::class, FireflyIII\Providers\RouteServiceProvider::class,
FireflyIII\Providers\FireflyServiceProvider::class, FireflyIII\Providers\FireflyServiceProvider::class,
// own stuff: // own stuff:
// Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, // Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
// Barryvdh\Debugbar\ServiceProvider::class, // Barryvdh\Debugbar\ServiceProvider::class,
@@ -194,7 +201,6 @@ return [
'File' => Illuminate\Support\Facades\File::class, 'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class, 'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class, 'Hash' => Illuminate\Support\Facades\Hash::class,
'Lang' => Illuminate\Support\Facades\Lang::class, 'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class, 'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class, 'Mail' => Illuminate\Support\Facades\Mail::class,