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\Category\SingleCategoryRepositoryInterface', 'FireflyIII\Repositories\Category\SingleCategoryRepository');
$this->app->bind('FireflyIII\Repositories\Journal\JournalRepositoryInterface', 'FireflyIII\Repositories\Journal\JournalRepository'); $this->app->bind('FireflyIII\Repositories\Journal\JournalRepositoryInterface', 'FireflyIII\Repositories\Journal\JournalRepository');
$this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository'); $this->app->bind('FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface', 'FireflyIII\Repositories\PiggyBank\PiggyBankRepository');

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

@@ -3,14 +3,15 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Category; namespace FireflyIII\Repositories\Category;
use Auth;
use Carbon\Carbon; use Carbon\Carbon;
use DB; use DB;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\TransactionType; use FireflyIII\Models\TransactionType;
use FireflyIII\Sql\Query; use FireflyIII\Sql\Query;
use FireflyIII\User;
use Illuminate\Database\Query\JoinClause; use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* Class CategoryRepository * Class CategoryRepository
@@ -19,6 +20,19 @@ use Illuminate\Support\Collection;
*/ */
class CategoryRepository implements CategoryRepositoryInterface 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 * Returns a collection of Categories appended with the amount of money that has been earned
@@ -34,36 +48,36 @@ class CategoryRepository implements CategoryRepositoryInterface
public function earnedForAccountsPerMonth(Collection $accounts, Carbon $start, Carbon $end) 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('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transaction_journals', 'category_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 AS t_src', function (JoinClause $join) { 'transactions AS t_src', function (JoinClause $join) {
$join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0); $join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0);
} }
) )
->leftJoin( ->leftJoin(
'transactions AS t_dest', function (JoinClause $join) { 'transactions AS t_dest', function (JoinClause $join) {
$join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0); $join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0);
} }
) )
->whereIn('t_dest.account_id', $accounts->pluck('id')->toArray())// to these accounts (earned) ->whereIn('t_dest.account_id', $accounts->pluck('id')->toArray())// to these accounts (earned)
->whereNotIn('t_src.account_id', $accounts->pluck('id')->toArray())//-- but not from these accounts ->whereNotIn('t_src.account_id', $accounts->pluck('id')->toArray())//-- but not from these accounts
->whereIn( ->whereIn(
'transaction_types.type', [TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE] 'transaction_types.type', [TransactionType::DEPOSIT, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE]
) )
->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->groupBy('categories.id') ->groupBy('categories.id')
->groupBy('dateFormatted') ->groupBy('dateFormatted')
->get( ->get(
[ [
'categories.*', 'categories.*',
DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") as `dateFormatted`'), DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y-%m") as `dateFormatted`'),
DB::raw('SUM(`t_dest`.`amount`) AS `earned`'), DB::raw('SUM(`t_dest`.`amount`) AS `earned`'),
] ]
); );
return $collection; return $collection;
@@ -78,7 +92,7 @@ class CategoryRepository implements CategoryRepositoryInterface
public function listCategories() public function listCategories()
{ {
/** @var Collection $set */ /** @var Collection $set */
$set = Auth::user()->categories()->orderBy('name', 'ASC')->get(); $set = $this->user->categories()->orderBy('name', 'ASC')->get();
$set = $set->sortBy( $set = $set->sortBy(
function (Category $category) { function (Category $category) {
return strtolower($category->name); return strtolower($category->name);
@@ -105,27 +119,27 @@ class CategoryRepository implements CategoryRepositoryInterface
public function listMultiYear(Collection $categories, Collection $accounts, Carbon $start, Carbon $end) 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('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'category_transaction_journal.transaction_journal_id') ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'category_transaction_journal.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')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereIn('transaction_types.type', [TransactionType::DEPOSIT, TransactionType::WITHDRAWAL]) ->whereIn('transaction_types.type', [TransactionType::DEPOSIT, TransactionType::WITHDRAWAL])
->whereIn('transactions.account_id', $accounts->pluck('id')->toArray()) ->whereIn('transactions.account_id', $accounts->pluck('id')->toArray())
->whereIn('categories.id', $categories->pluck('id')->toArray()) ->whereIn('categories.id', $categories->pluck('id')->toArray())
->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->groupBy('categories.id') ->groupBy('categories.id')
->groupBy('transaction_types.type') ->groupBy('transaction_types.type')
->groupBy('dateFormatted') ->groupBy('dateFormatted')
->get( ->get(
[ [
'categories.*', 'categories.*',
DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y") as `dateFormatted`'), DB::raw('DATE_FORMAT(`transaction_journals`.`date`,"%Y") as `dateFormatted`'),
'transaction_types.type', 'transaction_types.type',
DB::raw('SUM(`amount`) as `sum`'), DB::raw('SUM(`amount`) as `sum`'),
] ]
); );
return $set; return $set;
@@ -142,16 +156,16 @@ class CategoryRepository implements CategoryRepositoryInterface
*/ */
public function listNoCategory(Carbon $start, Carbon $end) public function listNoCategory(Carbon $start, Carbon $end)
{ {
return Auth::user() return $this->user
->transactionjournals() ->transactionjournals()
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('category_transaction_journal.id') ->whereNull('category_transaction_journal.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')
->get(['transaction_journals.*']); ->get(['transaction_journals.*']);
} }
/** /**
@@ -168,27 +182,27 @@ class CategoryRepository implements CategoryRepositoryInterface
public function spentForAccountsPerMonth(Collection $accounts, Carbon $start, Carbon $end) public function spentForAccountsPerMonth(Collection $accounts, Carbon $start, Carbon $end)
{ {
$accountIds = $accounts->pluck('id')->toArray(); $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('category_transaction_journal', 'category_transaction_journal.category_id', '=', 'categories.id')
->leftJoin('transaction_journals', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transaction_journals', 'category_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 AS t_src', function (JoinClause $join) { 'transactions AS t_src', function (JoinClause $join) {
$join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0); $join->on('t_src.transaction_journal_id', '=', 'transaction_journals.id')->where('t_src.amount', '<', 0);
} }
) )
->leftJoin( ->leftJoin(
'transactions AS t_dest', function (JoinClause $join) { 'transactions AS t_dest', function (JoinClause $join) {
$join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0); $join->on('t_dest.transaction_journal_id', '=', 'transaction_journals.id')->where('t_dest.amount', '>', 0);
} }
) )
->whereIn( ->whereIn(
'transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE] 'transaction_types.type', [TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE]
)// spent on these things. )// spent on these things.
->where('transaction_journals.date', '>=', $start->format('Y-m-d')) ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d')) ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->groupBy('categories.id') ->groupBy('categories.id')
->groupBy('dateFormatted'); ->groupBy('dateFormatted');
if (count($accountIds) > 0) { if (count($accountIds) > 0) {
$query->whereIn('t_src.account_id', $accountIds)// from these accounts (spent) $query->whereIn('t_src.account_id', $accountIds)// from these accounts (spent)
@@ -257,14 +271,14 @@ class CategoryRepository implements CategoryRepositoryInterface
} }
// is withdrawal or transfer AND account_from is in the list of $accounts // is withdrawal or transfer AND account_from is in the list of $accounts
$query = Auth::user() $query = $this->user
->transactionjournals() ->transactionjournals()
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('category_transaction_journal.id') ->whereNull('category_transaction_journal.id')
->before($end) ->before($end)
->after($start) ->after($start)
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->transactionTypes($types); ->transactionTypes($types);
if (count($accountIds) > 0) { if (count($accountIds) > 0) {
$query->whereIn('transactions.account_id', $accountIds); $query->whereIn('transactions.account_id', $accountIds);
} }

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

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