kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Update category repository.

Browse Source
This commit is contained in:
James Cole
2016-03-03 08:50:17 +01:00
parent 42d20ff693
commit ca33bea6b7
4 changed files with 153 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/Providers/CategoryServiceProvider.php Normal file
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 CategoryServiceProvider
*
* @package FireflyIII\Providers
*/
class CategoryServiceProvider 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\Category\CategoryRepositoryInterface',
function (Application $app, array $arguments) {
if (!isset($arguments[0]) && Auth::check()) {
return app('FireflyIII\Repositories\Category\CategoryRepository', [Auth::user()]);
} else {
if (!isset($arguments[0]) && !Auth::check()) {
throw new FireflyException('There is no user present.');
}
}
return app('FireflyIII\Repositories\Category\CategoryRepository', $arguments);
}
);
}
}

2
app/Providers/FireflyServiceProvider.php
View File

@@ -83,8 +83,6 @@ class FireflyServiceProvider extends ServiceProvider
}
);
$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\Journal\JournalRepositoryInterface', 'FireflyIII\Repositories\Journal\JournalRepository');
$this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');

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

@@ -3,14 +3,15 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Category;
use Auth;
use Carbon\Carbon;
use DB;
use FireflyIII\Models\Category;
use FireflyIII\Models\TransactionType;
use FireflyIII\Sql\Query;
use FireflyIII\User;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection;
use Log;
/**
* Class CategoryRepository
@@ -19,6 +20,19 @@ use Illuminate\Support\Collection;
*/
class CategoryRepository implements CategoryRepositoryInterface
{
/** @var User */
private $user;
/**
* BillRepository constructor.
*
* @param User $user
*/
public function __construct(User $user)
{
Log::debug('Constructed bill repository for user #' . $user->id . ' (' . $user->email . ')');
$this->user = $user;
}
/**
* Returns a collection of Categories appended with the amount of money that has been earned
@@ -34,7 +48,7 @@ class CategoryRepository implements CategoryRepositoryInterface
public function earnedForAccountsPerMonth(Collection $accounts, Carbon $start, Carbon $end)
{
$collection = Auth::user()->categories()
$collection = $this->user->categories()
->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
@@ -78,7 +92,7 @@ class CategoryRepository implements CategoryRepositoryInterface
public function listCategories()
{
/** @var Collection $set */
$set = Auth::user()->categories()->orderBy('name', 'ASC')->get();
$set = $this->user->categories()->orderBy('name', 'ASC')->get();
$set = $set->sortBy(
function (Category $category) {
return strtolower($category->name);
@@ -105,7 +119,7 @@ class CategoryRepository implements CategoryRepositoryInterface
public function listMultiYear(Collection $categories, Collection $accounts, Carbon $start, Carbon $end)
{
$set = Auth::user()->categories()
$set = $this->user->categories()
->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'category_transaction_journal.transaction_journal_id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
@@ -142,7 +156,7 @@ class CategoryRepository implements CategoryRepositoryInterface
*/
public function listNoCategory(Carbon $start, Carbon $end)
{
return Auth::user()
return $this->user
->transactionjournals()
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('category_transaction_journal.id')
@@ -168,7 +182,7 @@ class CategoryRepository implements CategoryRepositoryInterface
public function spentForAccountsPerMonth(Collection $accounts, Carbon $start, Carbon $end)
{
$accountIds = $accounts->pluck('id')->toArray();
$query = Auth::user()->categories()
$query = $this->user->categories()
->leftJoin('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
@@ -257,7 +271,7 @@ class CategoryRepository implements CategoryRepositoryInterface
}
// is withdrawal or transfer AND account_from is in the list of $accounts
$query = Auth::user()
$query = $this->user
->transactionjournals()
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('category_transaction_journal.id')

1
app/Repositories/Category/SingleCategoryRepository.php
View File

@@ -18,7 +18,6 @@ use Illuminate\Support\Collection;
*/
class SingleCategoryRepository extends ComponentRepository implements SingleCategoryRepositoryInterface
{
/**
* @param Category $category
*