From 458402aaff5b65a2957950fcde7063b7f41bdff8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 14 Jan 2024 05:10:05 +0100 Subject: [PATCH] Code cleanup. --- .../Controllers/Chart/ReportController.php | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php index 7de2b696a7..8ad7bde9d7 100644 --- a/app/Http/Controllers/Chart/ReportController.php +++ b/app/Http/Controllers/Chart/ReportController.php @@ -32,7 +32,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Support\CacheProperties; -use FireflyIII\Support\Facades\Navigation; use FireflyIII\Support\Http\Controllers\BasicDataSupport; use FireflyIII\Support\Http\Controllers\ChartGeneration; use Illuminate\Http\JsonResponse; @@ -65,7 +64,7 @@ class ReportController extends Controller public function netWorth(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { // chart properties for cache: - $cache = new CacheProperties(); + $cache = new CacheProperties(); $cache->addProperty('chart.report.net-worth'); $cache->addProperty($start); $cache->addProperty(implode(',', $accounts->pluck('id')->toArray())); @@ -73,12 +72,12 @@ class ReportController extends Controller if ($cache->has()) { return response()->json($cache->get()); } - $locale = app('steam')->getLocale(); - $current = clone $start; - $chartData = []; + $locale = app('steam')->getLocale(); + $current = clone $start; + $chartData = []; /** @var NetWorthInterface $helper */ - $helper = app(NetWorthInterface::class); + $helper = app(NetWorthInterface::class); $helper->setUser(auth()->user()); // filter accounts on having the preference for being included. @@ -108,11 +107,11 @@ class ReportController extends Controller if ('native' === $key) { continue; } - $currencyId = $netWorthItem['currency_id']; - $label = $current->isoFormat((string)trans('config.month_and_day_js', [], $locale)); + $currencyId = $netWorthItem['currency_id']; + $label = $current->isoFormat((string)trans('config.month_and_day_js', [], $locale)); if (!array_key_exists($currencyId, $chartData)) { $chartData[$currencyId] = [ - 'label' => 'Net worth in ' . $netWorthItem['currency_name'], + 'label' => 'Net worth in '.$netWorthItem['currency_name'], 'type' => 'line', 'currency_symbol' => $netWorthItem['currency_symbol'], 'currency_code' => $netWorthItem['currency_code'], @@ -124,7 +123,7 @@ class ReportController extends Controller $current->addDays(7); } - $data = $this->generator->multiSet($chartData); + $data = $this->generator->multiSet($chartData); $cache->store($data); return response()->json($data); @@ -138,7 +137,7 @@ class ReportController extends Controller public function operations(Collection $accounts, Carbon $start, Carbon $end): JsonResponse { // chart properties for cache: - $cache = new CacheProperties(); + $cache = new CacheProperties(); $cache->addProperty('chart.report.operations'); $cache->addProperty($start); $cache->addProperty($accounts); @@ -147,7 +146,6 @@ class ReportController extends Controller return response()->json($cache->get()); } - app('log')->debug('Going to do operations for accounts ', $accounts->pluck('id')->toArray()); $format = app('navigation')->preferredCarbonFormat($start, $end); $titleFormat = app('navigation')->preferredCarbonLocalizedFormat($start, $end); @@ -157,17 +155,17 @@ class ReportController extends Controller $chartData = []; /** @var GroupCollectorInterface $collector */ - $collector = app(GroupCollectorInterface::class); + $collector = app(GroupCollectorInterface::class); $collector->setRange($start, $end)->withAccountInformation(); $collector->setXorAccounts($accounts); $collector->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::RECONCILIATION, TransactionType::TRANSFER]); - $journals = $collector->getExtractedJournals(); + $journals = $collector->getExtractedJournals(); // loop. group by currency and by period. /** @var array $journal */ foreach ($journals as $journal) { - $period = $journal['date']->format($format); - $currencyId = (int)$journal['currency_id']; + $period = $journal['date']->format($format); + $currencyId = (int)$journal['currency_id']; $data[$currencyId] ??= [ 'currency_id' => $currencyId, 'currency_symbol' => $journal['currency_symbol'], @@ -181,8 +179,8 @@ class ReportController extends Controller 'earned' => '0', ]; // in our outgoing? - $key = 'spent'; - $amount = app('steam')->positive($journal['amount']); + $key = 'spent'; + $amount = app('steam')->positive($journal['amount']); // deposit = incoming // transfer or reconcile or opening balance, and these accounts are the destination. @@ -195,7 +193,7 @@ class ReportController extends Controller // loop this data, make chart bars for each currency: /** @var array $currency */ foreach ($data as $currency) { - $income = [ + $income = [ 'label' => (string)trans('firefly.box_earned_in_currency', ['currency' => $currency['currency_name']]), 'type' => 'bar', 'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green @@ -204,7 +202,7 @@ class ReportController extends Controller 'currency_code' => $currency['currency_code'], 'entries' => [], ]; - $expense = [ + $expense = [ 'label' => (string)trans('firefly.box_spent_in_currency', ['currency' => $currency['currency_name']]), 'type' => 'bar', 'backgroundColor' => 'rgba(219, 68, 55, 0.5)', // red @@ -219,7 +217,7 @@ class ReportController extends Controller // #8374. Sloppy fix for yearly charts. Not really interested in a better fix with v2 layout and all. if ('1Y' === $preferredRange) { - $currentEnd = Navigation::endOfPeriod($currentEnd, $preferredRange); + $currentEnd = app('navigation')->endOfPeriod($currentEnd, $preferredRange); } while ($currentStart <= $currentEnd) { $key = $currentStart->format($format); @@ -227,13 +225,13 @@ class ReportController extends Controller $income['entries'][$title] = app('steam')->bcround($currency[$key]['earned'] ?? '0', $currency['currency_decimal_places']); $expense['entries'][$title] = app('steam')->bcround($currency[$key]['spent'] ?? '0', $currency['currency_decimal_places']); $currentStart = app('navigation')->addPeriod($currentStart, $preferredRange, 0); - }; + } - $chartData[] = $income; - $chartData[] = $expense; + $chartData[] = $income; + $chartData[] = $expense; } - $data = $this->generator->multiSet($chartData); + $data = $this->generator->multiSet($chartData); $cache->store($data); return response()->json($data);