diff --git a/app/Api/V1/Controllers/AvailableBudgetController.php b/app/Api/V1/Controllers/AvailableBudgetController.php index 78a922aace..638c019025 100644 --- a/app/Api/V1/Controllers/AvailableBudgetController.php +++ b/app/Api/V1/Controllers/AvailableBudgetController.php @@ -27,6 +27,7 @@ use FireflyIII\Api\V1\Requests\AvailableBudgetRequest; use FireflyIII\Factory\TransactionCurrencyFactory; use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Transformers\AvailableBudgetTransformer; use FireflyIII\User; @@ -45,6 +46,8 @@ use League\Fractal\Serializer\JsonApiSerializer; */ class AvailableBudgetController extends Controller { + /** @var AvailableBudgetRepositoryInterface */ + private $abRepository; /** @var BudgetRepositoryInterface The budget repository */ private $repository; @@ -59,9 +62,11 @@ class AvailableBudgetController extends Controller $this->middleware( function ($request, $next) { /** @var User $user */ - $user = auth()->user(); - $this->repository = app(BudgetRepositoryInterface::class); + $user = auth()->user(); + $this->repository = app(BudgetRepositoryInterface::class); + $this->abRepository = app(AvailableBudgetRepositoryInterface::class); $this->repository->setUser($user); + $this->abRepository->setUser($user); return $next($request); } @@ -79,7 +84,7 @@ class AvailableBudgetController extends Controller */ public function delete(AvailableBudget $availableBudget): JsonResponse { - $this->repository->destroyAvailableBudget($availableBudget); + $this->abRepository->destroyAvailableBudget($availableBudget); return response()->json([], 204); } @@ -129,7 +134,7 @@ class AvailableBudgetController extends Controller /** * Display the specified resource. * - * @param Request $request + * @param Request $request * @param AvailableBudget $availableBudget * * @return JsonResponse @@ -186,7 +191,7 @@ class AvailableBudgetController extends Controller * Update the specified resource in storage. * * @param AvailableBudgetRequest $request - * @param AvailableBudget $availableBudget + * @param AvailableBudget $availableBudget * * @return JsonResponse */ diff --git a/app/Repositories/Budget/AvailableBudgetRepository.php b/app/Repositories/Budget/AvailableBudgetRepository.php index 7f83c3cf73..a0b3759614 100644 --- a/app/Repositories/Budget/AvailableBudgetRepository.php +++ b/app/Repositories/Budget/AvailableBudgetRepository.php @@ -23,6 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Budget; +use Exception; +use FireflyIII\Models\AvailableBudget; use FireflyIII\User; use Log; @@ -46,6 +48,18 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface } } + /** + * @param AvailableBudget $availableBudget + */ + public function destroyAvailableBudget(AvailableBudget $availableBudget): void + { + try { + $availableBudget->delete(); + } catch (Exception $e) { + Log::error(sprintf('Could not delete available budget: %s', $e->getMessage())); + } + } + /** * @param User $user */ @@ -54,4 +68,5 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface $this->user = $user; } + } \ No newline at end of file diff --git a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php index 5ddf8bd505..81ab533bd2 100644 --- a/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php +++ b/app/Repositories/Budget/AvailableBudgetRepositoryInterface.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Budget; +use FireflyIII\Models\AvailableBudget; use FireflyIII\User; /** @@ -30,6 +31,11 @@ use FireflyIII\User; */ interface AvailableBudgetRepositoryInterface { + /** + * @param AvailableBudget $availableBudget + */ + public function destroyAvailableBudget(AvailableBudget $availableBudget): void; + /** * @param User $user */ diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 39dab19811..9e1ab8ab72 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -110,18 +110,6 @@ class BudgetRepository implements BudgetRepositoryInterface return true; } - /** - * @param AvailableBudget $availableBudget - */ - public function destroyAvailableBudget(AvailableBudget $availableBudget): void - { - try { - $availableBudget->delete(); - } catch (Exception $e) { - Log::error(sprintf('Could not delete available budget: %s', $e->getMessage())); - } - } - /** * Destroy a budget limit. * diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index e1f6583c03..5a6a0b7f6b 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -35,7 +35,6 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { - /** * @return bool */ @@ -48,11 +47,6 @@ interface BudgetRepositoryInterface */ public function destroy(Budget $budget): bool; - /** - * @param AvailableBudget $availableBudget - */ - public function destroyAvailableBudget(AvailableBudget $availableBudget): void; - /** * Destroy a budget limit. *