From ea07b831f2fb1fbe30fe4e3b26060bfefc6d56ec Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 7 Mar 2021 06:15:13 +0100 Subject: [PATCH] Fix reference to recurrence update --- .../Models/Recurrence/UpdateController.php | 6 +- .../Controllers/todo/LinkTypeController.php | 77 ------------------- .../Recurrence/UpdateRequest.php} | 6 +- 3 files changed, 6 insertions(+), 83 deletions(-) delete mode 100644 app/Api/V1/Controllers/todo/LinkTypeController.php rename app/Api/V1/Requests/{todo/RecurrenceUpdateRequest.php => Models/Recurrence/UpdateRequest.php} (98%) diff --git a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php index 9f2181e785..c3f980007f 100644 --- a/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php +++ b/app/Api/V1/Controllers/Models/Recurrence/UpdateController.php @@ -23,7 +23,7 @@ namespace FireflyIII\Api\V1\Controllers\Models\Recurrence; use FireflyIII\Api\V1\Controllers\Controller; -use FireflyIII\Api\V1\Requests\RecurrenceUpdateRequest; +use FireflyIII\Api\V1\Requests\Models\Recurrence\UpdateRequest; use FireflyIII\Models\Recurrence; use FireflyIII\Repositories\Recurring\RecurringRepositoryInterface; use FireflyIII\Transformers\RecurrenceTransformer; @@ -65,12 +65,12 @@ class UpdateController extends Controller /** * Update single recurrence. * - * @param RecurrenceUpdateRequest $request + * @param UpdateRequest $request * @param Recurrence $recurrence * * @return JsonResponse */ - public function update(RecurrenceUpdateRequest $request, Recurrence $recurrence): JsonResponse + public function update(UpdateRequest $request, Recurrence $recurrence): JsonResponse { $data = $request->getAll(); $category = $this->repository->update($recurrence, $data); diff --git a/app/Api/V1/Controllers/todo/LinkTypeController.php b/app/Api/V1/Controllers/todo/LinkTypeController.php deleted file mode 100644 index 020a55db89..0000000000 --- a/app/Api/V1/Controllers/todo/LinkTypeController.php +++ /dev/null @@ -1,77 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Api\V1\Controllers; - -use FireflyIII\Api\V1\Requests\LinkTypeStoreRequest; -use FireflyIII\Api\V1\Requests\LinkTypeUpdateRequest; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Helpers\Collector\GroupCollectorInterface; -use FireflyIII\Models\LinkType; -use FireflyIII\Repositories\LinkType\LinkTypeRepositoryInterface; -use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Support\Http\Api\TransactionFilter; -use FireflyIII\Transformers\LinkTypeTransformer; -use FireflyIII\Transformers\TransactionGroupTransformer; -use FireflyIII\User; -use Illuminate\Http\JsonResponse; -use Illuminate\Http\Request; -use Illuminate\Pagination\LengthAwarePaginator; -use League\Fractal\Pagination\IlluminatePaginatorAdapter; -use League\Fractal\Resource\Collection as FractalCollection; -use League\Fractal\Resource\Item; - -/** - * Class LinkTypeController. - */ -class LinkTypeController extends Controller -{ - use TransactionFilter; - - private LinkTypeRepositoryInterface $repository; - private UserRepositoryInterface $userRepository; - - /** - * LinkTypeController constructor. - * - * @codeCoverageIgnore - */ - public function __construct() - { - parent::__construct(); - $this->middleware( - function ($request, $next) { - /** @var User $user */ - $user = auth()->user(); - $this->repository = app(LinkTypeRepositoryInterface::class); - $this->userRepository = app(UserRepositoryInterface::class); - $this->repository->setUser($user); - - return $next($request); - } - ); - } - - - -} diff --git a/app/Api/V1/Requests/todo/RecurrenceUpdateRequest.php b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php similarity index 98% rename from app/Api/V1/Requests/todo/RecurrenceUpdateRequest.php rename to app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php index e98c2f5349..0a44df523a 100644 --- a/app/Api/V1/Requests/todo/RecurrenceUpdateRequest.php +++ b/app/Api/V1/Requests/Models/Recurrence/UpdateRequest.php @@ -21,7 +21,7 @@ declare(strict_types=1); -namespace FireflyIII\Api\V1\Requests; +namespace FireflyIII\Api\V1\Requests\Models\Recurrence; use FireflyIII\Models\Recurrence; use FireflyIII\Rules\BelongsUser; @@ -36,9 +36,9 @@ use Illuminate\Foundation\Http\FormRequest; use Illuminate\Validation\Validator; /** - * Class RecurrenceUpdateRequest + * Class UpdateRequest */ -class RecurrenceUpdateRequest extends FormRequest +class UpdateRequest extends FormRequest { use ConvertsDataTypes, RecurrenceValidation, TransactionValidation, CurrencyValidation, GetRecurrenceData, ChecksLogin;