From 9fad13c788037909f690c51d6cc391f8aabe1681 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 30 Aug 2019 08:02:11 +0200
Subject: [PATCH] Move method to correct repository.

---
 app/Api/V1/Controllers/CurrencyController.php        |  7 ++++++-
 .../Budget/AvailableBudgetRepository.php             | 12 ++++++++++++
 .../Budget/AvailableBudgetRepositoryInterface.php    | 10 ++++++++++
 app/Repositories/Budget/BudgetRepository.php         | 12 +-----------
 .../Budget/BudgetRepositoryInterface.php             |  9 ---------
 5 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/app/Api/V1/Controllers/CurrencyController.php b/app/Api/V1/Controllers/CurrencyController.php
index 2e0a2a0a45..42257e4b64 100644
--- a/app/Api/V1/Controllers/CurrencyController.php
+++ b/app/Api/V1/Controllers/CurrencyController.php
@@ -36,6 +36,7 @@ use FireflyIII\Models\RuleTrigger;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
+use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -182,8 +183,12 @@ class CurrencyController extends Controller
 
         /** @var BudgetRepositoryInterface $repository */
         $repository = app(BudgetRepositoryInterface::class);
+
+        /** @var AvailableBudgetRepositoryInterface $abRepository */
+        $abRepository = app(AvailableBudgetRepositoryInterface::class);
+
         $repository->setUser($admin);
-        $collection       = $repository->getAvailableBudgetsByCurrency($currency);
+        $collection       = $abRepository->getAvailableBudgetsByCurrency($currency);
         $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 e641c79080..d2a1480e81 100644
--- a/app/Repositories/Budget/AvailableBudgetRepository.php
+++ b/app/Repositories/Budget/AvailableBudgetRepository.php
@@ -28,6 +28,7 @@ use Exception;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\User;
+use Illuminate\Support\Collection;
 use Log;
 
 /**
@@ -83,6 +84,17 @@ 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
diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
index db9d5f6f10..8021085301 100644
--- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php
@@ -27,6 +27,7 @@ use Carbon\Carbon;
 use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\User;
+use Illuminate\Support\Collection;
 
 /**
  * Interface AvailableBudgetRepositoryInterface
@@ -55,6 +56,15 @@ interface AvailableBudgetRepositoryInterface
      */
     public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array;
 
+    /**
+     * Returns all available budget objects.
+     *
+     * @param TransactionCurrency $currency
+     *
+     * @return Collection
+     */
+    public function getAvailableBudgetsByCurrency(TransactionCurrency $currency): Collection;
+
     /**
      * @param User $user
      */
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index 546fe0a463..1f44d3f5ee 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -207,17 +207,7 @@ class BudgetRepository implements BudgetRepositoryInterface
         return $set;
     }
 
-    /**
-     * 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.
diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php
index 65cb6fd699..242217aa5e 100644
--- a/app/Repositories/Budget/BudgetRepositoryInterface.php
+++ b/app/Repositories/Budget/BudgetRepositoryInterface.php
@@ -88,15 +88,6 @@ interface BudgetRepositoryInterface
      */
     public function getActiveBudgets(): Collection;
 
-    /**
-     * Returns all available budget objects.
-     *
-     * @param TransactionCurrency $currency
-     *
-     * @return Collection
-     */
-    public function getAvailableBudgetsByCurrency(TransactionCurrency $currency): Collection;
-
     /**
      * Returns all available budget objects.
      *