#157 - added the request class and improved the request parameters

This commit is contained in:
2022-06-06 11:05:47 +02:00
parent d4c5e55409
commit 04d036a1ef
5 changed files with 48 additions and 14 deletions

View File

@@ -28,6 +28,7 @@ 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;
@@ -166,17 +167,14 @@ class VacationRequestController extends Controller
return $pdf->stream();
}
public function create(Request $request): Response
public function create(CreateVacationRequestRequest $request): Response
{
$users = User::query()
->orderByProfileField("last_name")
->orderByProfileField("first_name")
->get();
if(($selectedUserId = $request->get("user")) && is_numeric($selectedUserId)) {
$userId = User::query()
->find($selectedUserId)?->id;
}
$requestData = $request->data();
return inertia("VacationRequest/Create", [
"vacationTypes" => VacationType::casesToSelect(),
@@ -185,8 +183,8 @@ class VacationRequestController extends Controller
"createOnBehalfOfEmployee" => $request->user()->can("createOnBehalfOfEmployee", VacationRequest::class),
"skipFlow" => $request->user()->can("skipFlow", VacationRequest::class),
],
"userId" => $userId ?? null,
"vacationStartDate" => $request->get("start_date"),
"vacationUserId" => $requestData['user'],
"vacationFromDate" => $requestData['from_date'],
]);
}