IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-10 04:58:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
f52584d46bf9cf83d458f157d13eebc962cf4199
firefly-iii/app/Http/Controllers/Report/CategoryController.php
T

966 lines
48 KiB
PHP
Raw Normal View History

Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
<?php
/**
* CategoryController.php
New copyright notice.
2017-10-21 08:40:00 +02:00
* Copyright (c) 2017 thegrumpydictator@gmail.com
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
*
New copyright notice.
2017-10-21 08:40:00 +02:00
* This file is part of Firefly III.
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
*
New copyright notice.
2017-10-21 08:40:00 +02:00
* Firefly III is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Firefly III is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
Update copyright [skip ci]
2017-12-17 14:41:58 +01:00
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
*/
Apparently this is changed in PHPStorm’s formatting templates so there you go [skip ci].
2017-04-09 07:44:22 +02:00
declare(strict_types=1);
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
namespace FireflyIII\Http\Controllers\Report;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
First start making the category report also multi-currency
2019-09-02 21:47:20 +02:00
use FireflyIII\Models\Account;
Finish multi-currency budget and account report.
2019-09-03 09:06:12 +02:00
use FireflyIII\Models\Category;
Building report from issue #386
2016-12-03 20:38:13 +01:00
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
Refactor and split category repository.
2019-08-27 10:52:07 +02:00
use FireflyIII\Repositories\Category\NoCategoryRepositoryInterface;
use FireflyIII\Repositories\Category\OperationsRepositoryInterface;
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
use FireflyIII\Support\CacheProperties;
Refactor various methods away from controllers
2018-08-11 06:39:29 +02:00
use FireflyIII\Support\Http\Controllers\BasicDataSupport;
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
use Illuminate\Support\Collection;
Code cleanup.
2018-07-20 14:34:56 +02:00
use Log;
use Throwable;
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
/**
Code clean up.
2017-11-15 12:25:49 +01:00
* Class CategoryController.
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
*/
class CategoryController extends Controller
{
Refactor various methods away from controllers
2018-08-11 06:39:29 +02:00
use BasicDataSupport;
Various code cleanup.
2018-07-08 12:08:53 +02:00
First start making the category report also multi-currency
2019-09-02 21:47:20 +02:00
/** @var OperationsRepositoryInterface */
private $opsRepository;
/**
* ExpenseReportController constructor.
*
* @codeCoverageIgnore
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->opsRepository = app(OperationsRepositoryInterface::class);
return $next($request);
}
);
}
Finish multi-currency budget and account report.
2019-09-03 09:06:12 +02:00
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function accountPerCategory(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$earned = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
$report = [];
/** @var Account $account */
foreach ($accounts as $account) {
$accountId = $account->id;
$report[$accountId] = $report[$accountId] ?? [
'name' => $account->name,
'id' => $account->id,
'iban' => $account->iban,
'currencies' => [],
];
}
// loop expenses.
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
/** @var array $category */
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$sourceAccountId = $journal['source_account_id'];
$report[$sourceAccountId]['currencies'][$currencyId] = $report[$sourceAccountId]['currencies'][$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'categories' => [],
];
$report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]
= $report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]
??
[
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
$report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]['spent'] = bcadd(
$report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]['spent'], $journal['amount']
);
$report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]['sum'] = bcadd(
$report[$sourceAccountId]['currencies'][$currencyId]['categories'][$category['id']]['sum'], $journal['amount']
);
}
}
}
// loop income.
foreach ($earned as $currency) {
$currencyId = $currency['currency_id'];
/** @var array $category */
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$destinationId = $journal['destination_account_id'];
$report[$destinationId]['currencies'][$currencyId]
= $report[$destinationId]['currencies'][$currencyId]
?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'categories' => [],
];
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]
= $report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]
??
[
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]['earned'] = bcadd(
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]['earned'], $journal['amount']
);
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]['sum'] = bcadd(
$report[$destinationId]['currencies'][$currencyId]['categories'][$category['id']]['sum'], $journal['amount']
);
}
}
}
return view('reports.category.partials.account-per-category', compact('report', 'categories'));
}
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function accounts(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$earned = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
$report = [];
$sums = [];
/** @var Account $account */
foreach ($accounts as $account) {
$accountId = $account->id;
$report[$accountId] = $report[$accountId] ?? [
'name' => $account->name,
'id' => $account->id,
'iban' => $account->iban,
'currencies' => [],
];
}
// loop expenses.
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
$sums[$currencyId] = $sums[$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'spent_sum' => '0',
'earned_sum' => '0',
'total_sum' => '0',
];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$sourceAccountId = $journal['source_account_id'];
$report[$sourceAccountId]['currencies'][$currencyId] = $report[$sourceAccountId]['currencies'][$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
$report[$sourceAccountId]['currencies'][$currencyId]['spent'] = bcadd(
$report[$sourceAccountId]['currencies'][$currencyId]['spent'], $journal['amount']
);
$report[$sourceAccountId]['currencies'][$currencyId]['sum'] = bcadd(
$report[$sourceAccountId]['currencies'][$currencyId]['sum'], $journal['amount']
);
$sums[$currencyId]['spent_sum'] = bcadd($sums[$currencyId]['spent_sum'], $journal['amount']);
$sums[$currencyId]['total_sum'] = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
}
}
}
// loop income.
foreach ($earned as $currency) {
$currencyId = $currency['currency_id'];
$sums[$currencyId] = $sums[$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'spent_sum' => '0',
'earned_sum' => '0',
'total_sum' => '0',
];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$destinationAccountId = $journal['destination_account_id'];
$report[$destinationAccountId]['currencies'][$currencyId] = $report[$destinationAccountId]['currencies'][$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
$report[$destinationAccountId]['currencies'][$currencyId]['earned'] = bcadd(
$report[$destinationAccountId]['currencies'][$currencyId]['earned'], $journal['amount']
);
$report[$destinationAccountId]['currencies'][$currencyId]['sum'] = bcadd(
$report[$destinationAccountId]['currencies'][$currencyId]['sum'], $journal['amount']
);
Finish multi-currency budget and account report.
2019-09-03 09:06:12 +02:00
$sums[$currencyId]['earned_sum'] = bcadd($sums[$currencyId]['earned_sum'], $journal['amount']);
$sums[$currencyId]['total_sum'] = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
}
}
}
return view('reports.category.partials.accounts', compact('sums', 'report'));
}
Finish multi-currency budget and account report.
2019-09-03 09:06:12 +02:00
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function categories(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$earned = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
$sums = [];
$report = [];
/** @var Category $category */
foreach ($categories as $category) {
$categoryId = $category->id;
$report[$categoryId] = $report[$categoryId] ?? [
'name' => $category->name,
'id' => $category->id,
'currencies' => [],
];
}
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
$sums[$currencyId] = $sums[$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'earned_sum' => '0',
'spent_sum' => '0',
'total_sum' => '0',
];
/** @var array $category */
foreach ($currency['categories'] as $category) {
$categoryId = $category['id'];
foreach ($category['transaction_journals'] as $journal) {
// add currency info to report array:
$report[$categoryId]['currencies'][$currencyId] = $report[$categoryId]['currencies'][$currencyId] ?? [
'spent' => '0',
'earned' => '0',
'sum' => '0',
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
];
$report[$categoryId]['currencies'][$currencyId]['spent'] = bcadd(
$report[$categoryId]['currencies'][$currencyId]['spent'], $journal['amount']
);
$report[$categoryId]['currencies'][$currencyId]['sum'] = bcadd(
$report[$categoryId]['currencies'][$currencyId]['sum'], $journal['amount']
);
$sums[$currencyId]['spent_sum'] = bcadd($sums[$currencyId]['spent_sum'], $journal['amount']);
$sums[$currencyId]['total_sum'] = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
}
}
}
foreach ($earned as $currency) {
$currencyId = $currency['currency_id'];
$sums[$currencyId] = $sums[$currencyId] ?? [
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'earned_sum' => '0',
'spent_sum' => '0',
'total_sum' => '0',
];
/** @var array $category */
foreach ($currency['categories'] as $category) {
$categoryId = $category['id'];
foreach ($category['transaction_journals'] as $journal) {
// add currency info to report array:
$report[$categoryId]['currencies'][$currencyId] = $report[$categoryId]['currencies'][$currencyId] ?? [
'spent' => '0',
'earned' => '0',
'sum' => '0',
'currency_id' => $currency['currency_id'],
'currency_symbol' => $currency['currency_symbol'],
'currency_name' => $currency['currency_name'],
'currency_decimal_places' => $currency['currency_decimal_places'],
];
$report[$categoryId]['currencies'][$currencyId]['earned'] = bcadd(
$report[$categoryId]['currencies'][$currencyId]['earned'], $journal['amount']
);
$report[$categoryId]['currencies'][$currencyId]['sum'] = bcadd(
$report[$categoryId]['currencies'][$currencyId]['sum'], $journal['amount']
);
$sums[$currencyId]['earned_sum'] = bcadd($sums[$currencyId]['earned_sum'], $journal['amount']);
$sums[$currencyId]['total_sum'] = bcadd($sums[$currencyId]['total_sum'], $journal['amount']);
}
}
}
return view('reports.category.partials.categories', compact('sums', 'report'));
}
Building report from issue #386
2016-12-03 20:38:13 +01:00
/**
Add php doc [skip ci]
2018-07-21 08:55:32 +02:00
* Show overview of expenses in category.
*
Clean up code after changing routes.
2016-12-06 07:48:41 +01:00
* @param Collection $accounts
Building report from issue #386
2016-12-03 20:38:13 +01:00
* @param Carbon $start
* @param Carbon $end
*
Clean up code after changing routes.
2016-12-06 07:48:41 +01:00
* @return mixed|string
Building report from issue #386
2016-12-03 20:38:13 +01:00
*/
Clean up code after changing routes.
2016-12-06 07:48:41 +01:00
public function expenses(Collection $accounts, Carbon $start, Carbon $end)
Building report from issue #386
2016-12-03 20:38:13 +01:00
{
Display optimisations. [skip ci]
2016-12-03 21:24:55 +01:00
$cache = new CacheProperties;
$cache->addProperty($start);
$cache->addProperty($end);
Various report updates and code cleanup.
2016-12-04 18:02:19 +01:00
$cache->addProperty('category-period-expenses-report');
Display optimisations. [skip ci]
2016-12-03 21:24:55 +01:00
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
Fix some bugs in multi-currency reports.
2019-09-01 18:41:57 +02:00
return $cache->get(); // @codeCoverageIgnore
Display optimisations. [skip ci]
2016-12-03 21:24:55 +01:00
}
Building report from issue #386
2016-12-03 20:38:13 +01:00
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
Refactor and split category repository.
2019-08-27 10:52:07 +02:00
/** @var OperationsRepositoryInterface $opsRepository */
$opsRepository = app(OperationsRepositoryInterface::class);
Retire some old code.
2019-08-27 14:45:14 +02:00
/** @var NoCategoryRepositoryInterface $noCatRepos */
$noCatRepos = app(NoCategoryRepositoryInterface::class);
Fix #2328
2019-08-02 05:24:51 +02:00
// depending on the carbon format (a reliable way to determine the general date difference)
// change the "listOfPeriods" call so the entire period gets included correctly.
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$format = app('navigation')->preferredCarbonFormat($start, $end);
Fix #2328
2019-08-02 05:24:51 +02:00
Refactor category repositories.
2019-08-28 12:28:23 +02:00
if ('Y' === $format) {
Fix #2328
2019-08-02 05:24:51 +02:00
$start->startOfYear();
}
Refactor category repositories.
2019-08-28 12:28:23 +02:00
if ('Y-m' === $format) {
Fix #2328
2019-08-02 05:24:51 +02:00
$start->startOfMonth();
}
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$periods = app('navigation')->listOfPeriods($start, $end);
$data = [];
$with = $opsRepository->listExpenses($start, $end, $accounts);
$without = $noCatRepos->listExpenses($start, $end, $accounts);
foreach ($with as $currencyId => $currencyRow) {
foreach ($currencyRow['categories'] as $categoryId => $categoryRow) {
$key = sprintf('%d-%d', $currencyId, $categoryId);
$data[$key] = $data[$key] ?? [
'id' => $categoryRow['id'],
'title' => sprintf('%s (%s)', $categoryRow['name'], $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'sum' => '0',
'entries' => [],
];
foreach ($categoryRow['transaction_journals'] as $journalId => $journal) {
$date = $journal['date']->format($format);
$data[$key]['entries'][$date] = $data[$key]['entries'][$date] ?? '0';
$data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date], $journal['amount']);
$data[$key]['sum'] = bcadd($data[$key]['sum'], $journal['amount']);
}
}
}
foreach ($without as $currencyId => $currencyRow) {
$key = sprintf('0-%d', $currencyId);
$data[$key] = $data[$key] ?? [
'id' => 0,
'title' => sprintf('%s (%s)', trans('firefly.noCategory'), $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'sum' => '0',
'entries' => [],
];
foreach ($currencyRow['transaction_journals'] as $journalId => $journal) {
$date = $journal['date']->format($format);
$data[$key]['entries'][$date] = $data[$key]['entries'][$date] ?? '0';
$data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date], $journal['amount']);
$data[$key]['sum'] = bcadd($data[$key]['sum'], $journal['amount']);
}
}
$cache->store($data);
$report = $data;
Retire some old code.
2019-08-27 14:45:14 +02:00
Code cleanup.
2018-07-20 14:34:56 +02:00
try {
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
Improve test coverage.
2018-09-02 20:13:25 +02:00
// @codeCoverageIgnoreStart
Code cleanup.
2018-07-20 14:34:56 +02:00
} catch (Throwable $e) {
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
Migrated all code to group collector.
2019-05-31 13:35:33 +02:00
$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
Code cleanup.
2018-07-20 14:34:56 +02:00
}
Improve test coverage.
2018-09-02 20:13:25 +02:00
// @codeCoverageIgnoreEnd
Building report from issue #386
2016-12-03 20:38:13 +01:00
Display optimisations. [skip ci]
2016-12-03 21:24:55 +01:00
$cache->store($result);
Building report from issue #386
2016-12-03 20:38:13 +01:00
return $result;
}
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
/**
Add php doc [skip ci]
2018-07-21 08:55:32 +02:00
* Show overview of income in category.
*
Code cleanup
2018-04-28 06:23:13 +02:00
* @param Collection $accounts
*
Various report updates and code cleanup.
2016-12-04 18:02:19 +01:00
* @param Carbon $start
* @param Carbon $end
*
* @return string
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
*/
Specify return types.
2018-07-08 12:28:42 +02:00
public function income(Collection $accounts, Carbon $start, Carbon $end): string
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
{
$cache = new CacheProperties;
$cache->addProperty($start);
$cache->addProperty($end);
Various report updates and code cleanup.
2016-12-04 18:02:19 +01:00
$cache->addProperty('category-period-income-report');
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
return $cache->get(); // @codeCoverageIgnore
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
}
Refactor and split category repository.
2019-08-27 10:52:07 +02:00
/** @var OperationsRepositoryInterface $opsRepository */
$opsRepository = app(OperationsRepositoryInterface::class);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
/** @var NoCategoryRepositoryInterface $noCatRepos */
$noCatRepos = app(NoCategoryRepositoryInterface::class);
Fix #2328
2019-08-02 05:24:51 +02:00
// depending on the carbon format (a reliable way to determine the general date difference)
// change the "listOfPeriods" call so the entire period gets included correctly.
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$format = app('navigation')->preferredCarbonFormat($start, $end);
Fix #2328
2019-08-02 05:24:51 +02:00
Refactor category repositories.
2019-08-28 12:28:23 +02:00
if ('Y' === $format) {
Fix #2328
2019-08-02 05:24:51 +02:00
$start->startOfYear();
}
Refactor category repositories.
2019-08-28 12:28:23 +02:00
if ('Y-m' === $format) {
Fix #2328
2019-08-02 05:24:51 +02:00
$start->startOfMonth();
}
Retire some old code.
2019-08-27 14:45:14 +02:00
$periods = app('navigation')->listOfPeriods($start, $end);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$data = [];
$with = $opsRepository->listIncome($start, $end, $accounts);
$without = $noCatRepos->listIncome($start, $end, $accounts);
foreach ($with as $currencyId => $currencyRow) {
foreach ($currencyRow['categories'] as $categoryId => $categoryRow) {
$key = sprintf('%d-%d', $currencyId, $categoryId);
$data[$key] = $data[$key] ?? [
'id' => $categoryRow['id'],
'title' => sprintf('%s (%s)', $categoryRow['name'], $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'sum' => '0',
'entries' => [],
];
foreach ($categoryRow['transaction_journals'] as $journalId => $journal) {
$date = $journal['date']->format($format);
$data[$key]['entries'][$date] = $data[$key]['entries'][$date] ?? '0';
$data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date], $journal['amount']);
$data[$key]['sum'] = bcadd($data[$key]['sum'], $journal['amount']);
}
}
}
foreach ($without as $currencyId => $currencyRow) {
$key = sprintf('0-%d', $currencyId);
$data[$key] = $data[$key] ?? [
'id' => 0,
'title' => sprintf('%s (%s)', trans('firefly.noCategory'), $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'sum' => '0',
'entries' => [],
];
foreach ($currencyRow['transaction_journals'] as $journalId => $journal) {
$date = $journal['date']->format($format);
$data[$key]['entries'][$date] = $data[$key]['entries'][$date] ?? '0';
$data[$key]['entries'][$date] = bcadd($data[$key]['entries'][$date], $journal['amount']);
$data[$key]['sum'] = bcadd($data[$key]['sum'], $journal['amount']);
}
}
$cache->store($data);
$report = $data;
Code cleanup.
2018-07-20 14:34:56 +02:00
try {
$result = view('reports.partials.category-period', compact('report', 'periods'))->render();
Improve test coverage.
2018-09-02 20:13:25 +02:00
// @codeCoverageIgnoreStart
Code cleanup.
2018-07-20 14:34:56 +02:00
} catch (Throwable $e) {
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
Migrated all code to group collector.
2019-05-31 13:35:33 +02:00
$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
Code cleanup.
2018-07-20 14:34:56 +02:00
}
Improve test coverage.
2018-09-02 20:13:25 +02:00
// @codeCoverageIgnoreEnd
Refactor category repositories.
2019-08-28 12:28:23 +02:00
Add more stuff to ajax controllers, making report controller simpler.
2016-10-26 16:46:43 +02:00
$cache->store($result);
return $result;
}
Many more route fixes.
2016-12-06 08:59:08 +01:00
/**
Add php doc [skip ci]
2018-07-21 08:55:32 +02:00
* Show overview of operations.
*
Various code cleanup.
2016-12-15 17:16:46 +01:00
* @param Collection $accounts
* @param Carbon $start
* @param Carbon $end
Many more route fixes.
2016-12-06 08:59:08 +01:00
*
* @return mixed|string
Code clean up.
2017-11-15 12:25:49 +01:00
*
Many more route fixes.
2016-12-06 08:59:08 +01:00
*/
public function operations(Collection $accounts, Carbon $start, Carbon $end)
{
// chart properties for cache:
$cache = new CacheProperties;
$cache->addProperty($start);
$cache->addProperty($end);
$cache->addProperty('category-report');
$cache->addProperty($accounts->pluck('id')->toArray());
if ($cache->has()) {
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
return $cache->get(); // @codeCoverageIgnore
Many more route fixes.
2016-12-06 08:59:08 +01:00
}
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
Refactor and split category repository.
2019-08-27 10:52:07 +02:00
/** @var OperationsRepositoryInterface $opsRepository */
$opsRepository = app(OperationsRepositoryInterface::class);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
/** @var NoCategoryRepositoryInterface $noCatRepository */
$noCatRepository = app(NoCategoryRepositoryInterface::class);
$categories = $repository->getCategories();
$earnedWith = $opsRepository->listIncome($start, $end, $accounts);
$spentWith = $opsRepository->listExpenses($start, $end, $accounts);
$earnedWithout = $noCatRepository->listIncome($start, $end, $accounts);
$spentWithout = $noCatRepository->listExpenses($start, $end, $accounts);
$report = [
Update for balance box in report.
2019-08-16 17:54:38 +02:00
'categories' => [],
'sums' => [],
];
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// needs four for-each loops.
// TODO improve this.
foreach ([$earnedWith, $spentWith] as $data) {
foreach ($data as $currencyId => $currencyRow) {
$report['sums'][$currencyId] = $report['sums'][$currencyId] ?? [
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
'spent' => '0',
'earned' => '0',
Refactor category repositories.
2019-08-28 12:28:23 +02:00
'sum' => '0',
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
];
foreach ($currencyRow['categories'] as $categoryId => $categoryRow) {
$key = sprintf('%s-%s', $currencyId, $categoryId);
$report['categories'][$key] = $report['categories'][$key] ?? [
'id' => $categoryId,
'title' => sprintf('%s (%s)', $categoryRow['name'], $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
// loop journals:
foreach ($categoryRow['transaction_journals'] as $journal) {
// sum of sums
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['sum'] = bcadd($report['sums'][$currencyId]['sum'], $journal['amount']);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of spent:
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['spent'] = -1 === bccomp($journal['amount'], '0') ? bcadd(
$report['sums'][$currencyId]['spent'], $journal['amount']
) : $report['sums'][$currencyId]['spent'];
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of earned
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['earned'] = 1 === bccomp($journal['amount'], '0') ? bcadd(
$report['sums'][$currencyId]['earned'], $journal['amount']
) : $report['sums'][$currencyId]['earned'];
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of category
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['categories'][$key]['sum'] = bcadd($report['categories'][$key]['sum'], $journal['amount']);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// total spent in category
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['categories'][$key]['spent'] = -1 === bccomp($journal['amount'], '0') ? bcadd(
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$report['categories'][$key]['spent'], $journal['amount']
) : $report['categories'][$key]['spent'];
// total earned in category
$report['categories'][$key]['earned'] = 1 === bccomp($journal['amount'], '0') ? bcadd(
$report['categories'][$key]['earned'], $journal['amount']
) : $report['categories'][$key]['earned'];
}
}
Fix category report.
2016-12-06 10:42:13 +01:00
}
}
Refactor category repositories.
2019-08-28 12:28:23 +02:00
foreach ([$earnedWithout, $spentWithout] as $data) {
foreach ($data as $currencyId => $currencyRow) {
$report['sums'][$currencyId] = $report['sums'][$currencyId] ?? [
'spent' => '0',
'earned' => '0',
'sum' => '0',
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
];
$key = sprintf('%s-0', $currencyId);
$report['categories'][$key] = $report['categories'][$key] ?? [
'id' => 0,
'title' => sprintf('%s (%s)', trans('firefly.noCategory'), $currencyRow['currency_name']),
'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'],
'currency_code' => $currencyRow['currency_code'],
'currency_decimal_places' => $currencyRow['currency_decimal_places'],
'spent' => '0',
'earned' => '0',
'sum' => '0',
];
// loop journals:
foreach ($currencyRow['transaction_journals'] as $journal) {
// sum of all
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['sum'] = bcadd($report['sums'][$currencyId]['sum'], $journal['amount']);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of spent:
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['spent'] = -1 === bccomp($journal['amount'], '0') ? bcadd(
$report['sums'][$currencyId]['spent'], $journal['amount']
) : $report['sums'][$currencyId]['spent'];
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of earned
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['sums'][$currencyId]['earned'] = 1 === bccomp($journal['amount'], '0') ? bcadd(
$report['sums'][$currencyId]['earned'], $journal['amount']
) : $report['sums'][$currencyId]['earned'];
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// sum of category
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['categories'][$key]['sum'] = bcadd($report['categories'][$key]['sum'], $journal['amount']);
Refactor category repositories.
2019-08-28 12:28:23 +02:00
// total spent in no category
Make sure info includes earned data
2019-09-02 22:31:07 +02:00
$report['categories'][$key]['spent'] = -1 === bccomp($journal['amount'], '0') ? bcadd(
Refactor category repositories.
2019-08-28 12:28:23 +02:00
$report['categories'][$key]['spent'], $journal['amount']
) : $report['categories'][$key]['spent'];
// total earned in no category
$report['categories'][$key]['earned'] = 1 === bccomp($journal['amount'], '0') ? bcadd(
$report['categories'][$key]['earned'], $journal['amount']
) : $report['categories'][$key]['earned'];
}
}
Many more route fixes.
2016-12-06 08:59:08 +01:00
}
Use new methods from category repository
2019-08-12 18:18:51 +02:00
Improve test coverage.
2019-07-24 19:02:41 +02:00
// @codeCoverageIgnoreStart
Code cleanup.
2018-07-20 14:34:56 +02:00
try {
$result = view('reports.partials.categories', compact('report'))->render();
$cache->store($result);
} catch (Throwable $e) {
Log::error(sprintf('Could not render category::expenses: %s', $e->getMessage()));
Migrated all code to group collector.
2019-05-31 13:35:33 +02:00
$result = sprintf('An error prevented Firefly III from rendering: %s. Apologies.', $e->getMessage());
Code cleanup.
2018-07-20 14:34:56 +02:00
}
Code cleaning stuff.
2019-02-13 17:38:41 +01:00
Improve test coverage.
2018-09-02 20:13:25 +02:00
// @codeCoverageIgnoreEnd
Many more route fixes.
2016-12-06 08:59:08 +01:00
return $result;
}
Various report updates and code cleanup.
2016-12-04 18:02:19 +01:00
Finish multi-currency budget and account report.
2019-09-03 09:06:12 +02:00
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return array|string
*/
public function topExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$result = [];
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$result[] = [
'description' => $journal['description'],
'transaction_group_id' => $journal['transaction_group_id'],
'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'],
'currency_name' => $currency['currency_name'],
'currency_symbol' => $currency['currency_symbol'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'category_id' => $category['id'],
'category_name' => $category['name'],
];
}
}
}
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'amount_float');
array_multisort($amounts, SORT_ASC, $result);
try {
$result = view('reports.category.partials.top-expenses', compact('result'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
}
return $result;
}
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return array|string
*/
public function topIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
$result = [];
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$result[] = [
'description' => $journal['description'],
'transaction_group_id' => $journal['transaction_group_id'],
'amount_float' => (float)$journal['amount'],
'amount' => $journal['amount'],
'date' => $journal['date']->formatLocalized($this->monthAndDayFormat),
'source_account_name' => $journal['source_account_name'],
'source_account_id' => $journal['source_account_id'],
'currency_id' => $currency['currency_id'],
'currency_name' => $currency['currency_name'],
'currency_symbol' => $currency['currency_symbol'],
'currency_decimal_places' => $currency['currency_decimal_places'],
'category_id' => $category['id'],
'category_name' => $category['name'],
];
}
}
}
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'amount_float');
array_multisort($amounts, SORT_DESC, $result);
try {
$result = view('reports.category.partials.top-income', compact('result'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
}
return $result;
}
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return array|string
*/
public function avgExpenses(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, $categories);
$result = [];
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$destinationId = $journal['destination_account_id'];
$key = sprintf('%d-%d', $destinationId, $currency['currency_id']);
$result[$key] = $result[$key] ?? [
'transactions' => 0,
'sum' => '0',
'avg' => '0',
'avg_float' => 0,
'destination_account_name' => $journal['destination_account_name'],
'destination_account_id' => $journal['destination_account_id'],
'currency_id' => $currency['currency_id'],
'currency_name' => $currency['currency_name'],
'currency_symbol' => $currency['currency_symbol'],
'currency_decimal_places' => $currency['currency_decimal_places'],
];
$result[$key]['transactions']++;
$result[$key]['sum'] = bcadd($journal['amount'], $result[$key]['sum']);
$result[$key]['avg'] = bcdiv($result[$key]['sum'], (string)$result[$key]['transactions']);
$result[$key]['avg_float'] = (float)$result[$key]['avg'];
}
}
}
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
array_multisort($amounts, SORT_ASC, $result);
try {
$result = view('reports.category.partials.avg-expenses', compact('result'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
}
return $result;
}
/**
* @param Collection $accounts
* @param Collection $categories
* @param Carbon $start
* @param Carbon $end
*
* @return array|string
*/
public function avgIncome(Collection $accounts, Collection $categories, Carbon $start, Carbon $end)
{
$spent = $this->opsRepository->listIncome($start, $end, $accounts, $categories);
$result = [];
foreach ($spent as $currency) {
$currencyId = $currency['currency_id'];
foreach ($currency['categories'] as $category) {
foreach ($category['transaction_journals'] as $journal) {
$sourceId = $journal['source_account_id'];
$key = sprintf('%d-%d', $sourceId, $currency['currency_id']);
$result[$key] = $result[$key] ?? [
'transactions' => 0,
'sum' => '0',
'avg' => '0',
'avg_float' => 0,
'source_account_name' => $journal['source_account_name'],
'source_account_id' => $journal['source_account_id'],
'currency_id' => $currency['currency_id'],
'currency_name' => $currency['currency_name'],
'currency_symbol' => $currency['currency_symbol'],
'currency_decimal_places' => $currency['currency_decimal_places'],
];
$result[$key]['transactions']++;
$result[$key]['sum'] = bcadd($journal['amount'], $result[$key]['sum']);
$result[$key]['avg'] = bcdiv($result[$key]['sum'], (string)$result[$key]['transactions']);
$result[$key]['avg_float'] = (float)$result[$key]['avg'];
}
}
}
// sort by amount_float
// sort temp array by amount.
$amounts = array_column($result, 'avg_float');
array_multisort($amounts, SORT_DESC, $result);
try {
$result = view('reports.category.partials.avg-income', compact('result'))->render();
// @codeCoverageIgnoreStart
} catch (Throwable $e) {
Log::debug(sprintf('Could not render reports.partials.budget-period: %s', $e->getMessage()));
$result = sprintf('Could not render view: %s', $e->getMessage());
}
return $result;
}
Use new methods from category repository
2019-08-12 18:18:51 +02:00
/**
* @param array $array
*
* @return bool
*/
private function noAmountInArray(array $array): bool
{
if (0 === count($array)) {
return true;
}
return false;
}
Building report from issue #386
2016-12-03 20:38:13 +01:00
Various code cleanup. Removed executable flags, added newlines.
2016-12-22 19:42:45 +01:00
}
Reference in New Issue Copy Permalink