From 7c82f4560443ed14abebb47b8fec886e58541635 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 5 Jan 2017 08:40:05 +0100 Subject: [PATCH] =?UTF-8?q?Refactor=20code=20to=20use=20new=20=E2=80=9Cear?= =?UTF-8?q?ned=20in=20period=E2=80=9D=20method.=20#524?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CategoryController.php | 5 +++-- app/Http/Controllers/Chart/CategoryController.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index b9146890db..44d25e47f1 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -319,6 +319,7 @@ class CategoryController extends Controller */ private function getGroupedEntries(Category $category): Collection { + /** @var CategoryRepositoryInterface $repository */ $repository = app(CategoryRepositoryInterface::class); $accountRepository = app(AccountRepositoryInterface::class); $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); @@ -344,8 +345,8 @@ class CategoryController extends Controller while ($end >= $first) { $end = Navigation::startOfPeriod($end, $range); $currentEnd = Navigation::endOfPeriod($end, $range); - $spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); - $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $end, $currentEnd); + $spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $end, $currentEnd); + $earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $end, $currentEnd); $dateStr = $end->format('Y-m-d'); $dateName = Navigation::periodShow($end, $range); $entries->push([$dateStr, $dateName, $spent, $earned]); diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index 15c807412f..8d7c04c7fe 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -91,7 +91,7 @@ class CategoryController extends Controller while ($start <= $end) { $currentEnd = Navigation::endOfPeriod($start, $range); $spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $currentEnd); - $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $currentEnd); + $earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $start, $currentEnd); $label = Navigation::periodShow($start, $range); $chartData[0]['entries'][$label] = bcmul($spent, '-1'); $chartData[1]['entries'][$label] = $earned; @@ -316,7 +316,7 @@ class CategoryController extends Controller while ($start <= $end) { $spent = $repository->spentInPeriodCollector(new Collection([$category]), $accounts, $start, $start); - $earned = $repository->earnedInPeriod(new Collection([$category]), $accounts, $start, $start); + $earned = $repository->earnedInPeriodCollector(new Collection([$category]), $accounts, $start, $start); $label = Navigation::periodShow($start, '1D'); $chartData[0]['entries'][$label] = bcmul($spent, '-1');