Move method to correct repository.

This commit is contained in:
James Cole
2019-08-30 08:02:11 +02:00
parent 97d87b0657
commit 9fad13c788
5 changed files with 29 additions and 21 deletions

View File

@@ -36,6 +36,7 @@ use FireflyIII\Models\RuleTrigger;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetLimitRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
@@ -182,8 +183,12 @@ class CurrencyController extends Controller
/** @var BudgetRepositoryInterface $repository */ /** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class); $repository = app(BudgetRepositoryInterface::class);
/** @var AvailableBudgetRepositoryInterface $abRepository */
$abRepository = app(AvailableBudgetRepositoryInterface::class);
$repository->setUser($admin); $repository->setUser($admin);
$collection = $repository->getAvailableBudgetsByCurrency($currency); $collection = $abRepository->getAvailableBudgetsByCurrency($currency);
$count = $collection->count(); $count = $collection->count();
$availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize); $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);

View File

@@ -28,6 +28,7 @@ use Exception;
use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection;
use Log; use Log;
/** /**
@@ -83,6 +84,17 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
return $amount; 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 $start

View File

@@ -27,6 +27,7 @@ use Carbon\Carbon;
use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\AvailableBudget;
use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionCurrency;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection;
/** /**
* Interface AvailableBudgetRepositoryInterface * Interface AvailableBudgetRepositoryInterface
@@ -55,6 +56,15 @@ interface AvailableBudgetRepositoryInterface
*/ */
public function getAvailableBudgetWithCurrency(Carbon $start, Carbon $end): array; 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 * @param User $user
*/ */

View File

@@ -207,17 +207,7 @@ class BudgetRepository implements BudgetRepositoryInterface
return $set; 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. * Returns all available budget objects.

View File

@@ -88,15 +88,6 @@ interface BudgetRepositoryInterface
*/ */
public function getActiveBudgets(): Collection; 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. * Returns all available budget objects.
* *