From ba1d5bce2ad2ae4493e59941568f12e92acb44ab Mon Sep 17 00:00:00 2001 From: Kamil Niemczycki Date: Tue, 7 Jun 2022 12:37:07 +0200 Subject: [PATCH] changes for the controller have been withdrawn Co-authored-by: Adrian Hopek --- .../Controllers/VacationRequestController.php | 9 ++--- .../Requests/CreateVacationRequestRequest.php | 36 ------------------- 2 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php diff --git a/app/Infrastructure/Http/Controllers/VacationRequestController.php b/app/Infrastructure/Http/Controllers/VacationRequestController.php index 9c14839..fffc401 100644 --- a/app/Infrastructure/Http/Controllers/VacationRequestController.php +++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php @@ -28,7 +28,6 @@ use Toby\Domain\VacationTypeConfigRetriever; use Toby\Eloquent\Helpers\YearPeriodRetriever; use Toby\Eloquent\Models\User; use Toby\Eloquent\Models\VacationRequest; -use Toby\Infrastructure\Http\Requests\CreateVacationRequestRequest; use Toby\Infrastructure\Http\Requests\VacationRequestRequest; use Toby\Infrastructure\Http\Resources\SimpleUserResource; use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource; @@ -167,15 +166,13 @@ class VacationRequestController extends Controller return $pdf->stream(); } - public function create(CreateVacationRequestRequest $request): Response + public function create(Request $request): Response { $users = User::query() ->orderByProfileField("last_name") ->orderByProfileField("first_name") ->get(); - $requestData = $request->data(); - return inertia("VacationRequest/Create", [ "vacationTypes" => VacationType::casesToSelect(), "users" => SimpleUserResource::collection($users), @@ -183,8 +180,8 @@ class VacationRequestController extends Controller "createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class), "skipFlow" => $request->user()->can("skipFlow", VacationRequest::class), ], - "vacationUserId" => $requestData["user"], - "vacationFromDate" => $requestData["from_date"], + "vacationUserId" => (int)$request->get("user"), + "vacationFromDate" => $request->get("from_date"), ]); } diff --git a/app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php b/app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php deleted file mode 100644 index 3faec54..0000000 --- a/app/Infrastructure/Http/Requests/CreateVacationRequestRequest.php +++ /dev/null @@ -1,36 +0,0 @@ -get("user") === null) || - ((int)$this->get("user") === $this->user()->id) || - $this->user()->can("createOnBehalfOfEmployee", VacationRequest::class); - } - - public function rules(): array - { - return [ - "user" => ["nullable", "exists:users,id"], - "from_date" => ["nullable", "date_format:Y-m-d"], - ]; - } - - public function data(): array - { - return [ - "user" => (int)$this->get("user"), - "from_date" => $this->get("from_date"), - ]; - } -}