mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Move method to correct repository.
This commit is contained in:
@@ -27,6 +27,7 @@ use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
|
|||||||
use FireflyIII\Factory\TransactionCurrencyFactory;
|
use FireflyIII\Factory\TransactionCurrencyFactory;
|
||||||
use FireflyIII\Models\AvailableBudget;
|
use FireflyIII\Models\AvailableBudget;
|
||||||
use FireflyIII\Models\TransactionCurrency;
|
use FireflyIII\Models\TransactionCurrency;
|
||||||
|
use FireflyIII\Repositories\Budget\AvailableBudgetRepositoryInterface;
|
||||||
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
|
||||||
use FireflyIII\Transformers\AvailableBudgetTransformer;
|
use FireflyIII\Transformers\AvailableBudgetTransformer;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
@@ -45,6 +46,8 @@ use League\Fractal\Serializer\JsonApiSerializer;
|
|||||||
*/
|
*/
|
||||||
class AvailableBudgetController extends Controller
|
class AvailableBudgetController extends Controller
|
||||||
{
|
{
|
||||||
|
/** @var AvailableBudgetRepositoryInterface */
|
||||||
|
private $abRepository;
|
||||||
/** @var BudgetRepositoryInterface The budget repository */
|
/** @var BudgetRepositoryInterface The budget repository */
|
||||||
private $repository;
|
private $repository;
|
||||||
|
|
||||||
@@ -59,9 +62,11 @@ class AvailableBudgetController extends Controller
|
|||||||
$this->middleware(
|
$this->middleware(
|
||||||
function ($request, $next) {
|
function ($request, $next) {
|
||||||
/** @var User $user */
|
/** @var User $user */
|
||||||
$user = auth()->user();
|
$user = auth()->user();
|
||||||
$this->repository = app(BudgetRepositoryInterface::class);
|
$this->repository = app(BudgetRepositoryInterface::class);
|
||||||
|
$this->abRepository = app(AvailableBudgetRepositoryInterface::class);
|
||||||
$this->repository->setUser($user);
|
$this->repository->setUser($user);
|
||||||
|
$this->abRepository->setUser($user);
|
||||||
|
|
||||||
return $next($request);
|
return $next($request);
|
||||||
}
|
}
|
||||||
@@ -79,7 +84,7 @@ class AvailableBudgetController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function delete(AvailableBudget $availableBudget): JsonResponse
|
public function delete(AvailableBudget $availableBudget): JsonResponse
|
||||||
{
|
{
|
||||||
$this->repository->destroyAvailableBudget($availableBudget);
|
$this->abRepository->destroyAvailableBudget($availableBudget);
|
||||||
|
|
||||||
return response()->json([], 204);
|
return response()->json([], 204);
|
||||||
}
|
}
|
||||||
@@ -129,7 +134,7 @@ class AvailableBudgetController extends Controller
|
|||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*
|
*
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
* @param AvailableBudget $availableBudget
|
* @param AvailableBudget $availableBudget
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
@@ -186,7 +191,7 @@ class AvailableBudgetController extends Controller
|
|||||||
* Update the specified resource in storage.
|
* Update the specified resource in storage.
|
||||||
*
|
*
|
||||||
* @param AvailableBudgetRequest $request
|
* @param AvailableBudgetRequest $request
|
||||||
* @param AvailableBudget $availableBudget
|
* @param AvailableBudget $availableBudget
|
||||||
*
|
*
|
||||||
* @return JsonResponse
|
* @return JsonResponse
|
||||||
*/
|
*/
|
||||||
|
@@ -23,6 +23,8 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Repositories\Budget;
|
namespace FireflyIII\Repositories\Budget;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
use FireflyIII\Models\AvailableBudget;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
use Log;
|
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
|
* @param User $user
|
||||||
*/
|
*/
|
||||||
@@ -54,4 +68,5 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
|
|||||||
$this->user = $user;
|
$this->user = $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@@ -23,6 +23,7 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace FireflyIII\Repositories\Budget;
|
namespace FireflyIII\Repositories\Budget;
|
||||||
|
|
||||||
|
use FireflyIII\Models\AvailableBudget;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,6 +31,11 @@ use FireflyIII\User;
|
|||||||
*/
|
*/
|
||||||
interface AvailableBudgetRepositoryInterface
|
interface AvailableBudgetRepositoryInterface
|
||||||
{
|
{
|
||||||
|
/**
|
||||||
|
* @param AvailableBudget $availableBudget
|
||||||
|
*/
|
||||||
|
public function destroyAvailableBudget(AvailableBudget $availableBudget): void;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param User $user
|
* @param User $user
|
||||||
*/
|
*/
|
||||||
|
@@ -110,18 +110,6 @@ class BudgetRepository implements BudgetRepositoryInterface
|
|||||||
return true;
|
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.
|
* Destroy a budget limit.
|
||||||
*
|
*
|
||||||
|
@@ -35,7 +35,6 @@ use Illuminate\Support\Collection;
|
|||||||
*/
|
*/
|
||||||
interface BudgetRepositoryInterface
|
interface BudgetRepositoryInterface
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
@@ -48,11 +47,6 @@ interface BudgetRepositoryInterface
|
|||||||
*/
|
*/
|
||||||
public function destroy(Budget $budget): bool;
|
public function destroy(Budget $budget): bool;
|
||||||
|
|
||||||
/**
|
|
||||||
* @param AvailableBudget $availableBudget
|
|
||||||
*/
|
|
||||||
public function destroyAvailableBudget(AvailableBudget $availableBudget): void;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Destroy a budget limit.
|
* Destroy a budget limit.
|
||||||
*
|
*
|
||||||
|
Reference in New Issue
Block a user