From 4a3e1a9604ca91e8e896bb2e631044fc749aa7f5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 30 Aug 2019 08:03:13 +0200 Subject: [PATCH] Move method to correct repository. --- .../Controllers/AvailableBudgetController.php | 2 +- .../Budget/AvailableBudgetRepository.php | 47 ++++++++++++++----- .../AvailableBudgetRepositoryInterface.php | 11 +++++ app/Repositories/Budget/BudgetRepository.php | 23 --------- .../Budget/BudgetRepositoryInterface.php | 11 ----- 5 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/Api/V1/Controllers/AvailableBudgetController.php b/app/Api/V1/Controllers/AvailableBudgetController.php index 638c019025..e5f630c1e4 100644 --- a/app/Api/V1/Controllers/AvailableBudgetController.php +++ b/app/Api/V1/Controllers/AvailableBudgetController.php @@ -110,7 +110,7 @@ class AvailableBudgetController extends Controller $end = $this->parameters->get('end'); // get list of available budgets. Count it and split it. - $collection = $this->repository->getAvailableBudgetsByDate($start, $end); + $collection = $this->abRepository->getAvailableBudgetsByDate($start, $end); $count = $collection->count(); $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index d2a1480e81..78e61133b5 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -84,18 +84,6 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface return $amount; } - /** - * Returns all available budget objects. - * - * @param TransactionCurrency $currency - * - * @return Collection - */ - public function getAvailableBudgetsByCurrency(TransactionCurrency $currency): Collection - { - return $this->user->availableBudgets()->where('transaction_currency_id', $currency->id)->get(); - } - /** * @param Carbon $start * @param Carbon $end @@ -116,6 +104,41 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface return $return; } + /** + * Returns all available budget objects. + * + * @param TransactionCurrency $currency + * + * @return Collection + */ + public function getAvailableBudgetsByCurrency(TransactionCurrency $currency): Collection + { + return $this->user->availableBudgets()->where('transaction_currency_id', $currency->id)->get(); + } + + /** + * Returns all available budget objects. + * + * @param Carbon|null $start + * @param Carbon|null $end + * + * @return Collection + * + */ + public function getAvailableBudgetsByDate(?Carbon $start, ?Carbon $end): Collection + { + $query = $this->user->availableBudgets(); + + if (null !== $start) { + $query->where('start_date', '>=', $start->format('Y-m-d H:i:s')); + } + if (null !== $end) { + $query->where('end_date', '<=', $end->format('Y-m-d H:i:s')); + } + + return $query->get(); + } + /** * @param User $user */ diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 8021085301..12eecabfd0 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -65,6 +65,17 @@ interface AvailableBudgetRepositoryInterface */ public function getAvailableBudgetsByCurrency(TransactionCurrency $currency): Collection; + /** + * Returns all available budget objects. + * + * @param Carbon|null $start + * @param Carbon|null $end + * + * @return Collection + * + */ + public function getAvailableBudgetsByDate(?Carbon $start, ?Carbon $end): Collection; + /** * @param User $user */ diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 1f44d3f5ee..a9b5ffbdd8 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -209,29 +209,6 @@ class BudgetRepository implements BudgetRepositoryInterface - /** - * Returns all available budget objects. - * - * @param Carbon|null $start - * @param Carbon|null $end - * - * @return Collection - * - */ - public function getAvailableBudgetsByDate(?Carbon $start, ?Carbon $end): Collection - { - $query = $this->user->availableBudgets(); - - if (null !== $start) { - $query->where('start_date', '>=', $start->format('Y-m-d H:i:s')); - } - if (null !== $end) { - $query->where('end_date', '<=', $end->format('Y-m-d H:i:s')); - } - - return $query->get(); - } - /** * @param Budget $budget * @param Carbon $start diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 242217aa5e..4798e14179 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -88,17 +88,6 @@ interface BudgetRepositoryInterface */ public function getActiveBudgets(): Collection; - /** - * Returns all available budget objects. - * - * @param Carbon|null $start - * @param Carbon|null $end - * - * @return Collection - * - */ - public function getAvailableBudgetsByDate(?Carbon $start, ?Carbon $end): Collection; - /** * @param Budget $budget * @param Carbon $start