#38 - vacation request by administrative approver (#57)

* #38 - wip

* #38 - wip

* #38 - fix

* #38 - fix

* #38 - fix

* #38 - fix

* Update resources/lang/pl.json

Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>

* #38 - cr fix

Co-authored-by: EwelinaLasowy <ewelina.lasowy@blumilk.pl>
Co-authored-by: Krzysztof Rewak <krzysztof.rewak@blumilk.pl>

app/Infrastructure/Http/Controllers/VacationRequestController.php

@@ -15,8 +15,10 @@ use Toby\Domain\VacationDaysCalculator;
 use Toby\Domain\VacationRequestStateManager;
 use Toby\Domain\Validation\VacationRequestValidator;
 use Toby\Eloquent\Helpers\YearPeriodRetriever;
+use Toby\Eloquent\Models\User;
 use Toby\Eloquent\Models\VacationRequest;
 use Toby\Infrastructure\Http\Requests\VacationRequestRequest;
+use Toby\Infrastructure\Http\Resources\UserResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestActivityResource;
 use Toby\Infrastructure\Http\Resources\VacationRequestResource;
 
@@ -61,8 +63,14 @@ class VacationRequestController extends Controller
 
     public function create(): Response
     {
+        $users = User::query()
+            ->orderBy("last_name")
+            ->orderBy("first_name")
+            ->get();
+
         return inertia("VacationRequest/Create", [
             "vacationTypes" => VacationType::casesToSelect(),
+            "users" => UserResource::collection($users),
         ]);
     }
 
@@ -73,7 +81,7 @@ class VacationRequestController extends Controller
         VacationDaysCalculator $vacationDaysCalculator,
     ): RedirectResponse {
         /** @var VacationRequest $vacationRequest */
-        $vacationRequest = $request->user()->vacationRequests()->make($request->data());
+        $vacationRequest = $request->user()->createdVacationRequests()->make($request->data());
         $vacationRequestValidator->validate($vacationRequest);
 
         $vacationRequest->save();

app/Infrastructure/Http/Requests/VacationRequestRequest.php

@@ -16,9 +16,11 @@ class VacationRequestRequest extends FormRequest
     public function rules(): array
     {
         return [
+            "user" => ["required", "exists:users,id"],
             "type" => ["required", new Enum(VacationType::class)],
             "from" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
             "to" => ["required", "date_format:Y-m-d", new YearPeriodExists()],
+            "flowSkipped" => ["nullable", "boolean"],
             "comment" => ["nullable"],
         ];
     }
@@ -28,11 +30,13 @@ class VacationRequestRequest extends FormRequest
         $from = $this->get("from");
 
         return [
+            "user_id" => $this->get("user"),
             "type" => $this->get("type"),
             "from" => $from,
             "to" => $this->get("to"),
             "year_period_id" => YearPeriod::findByYear(Carbon::create($from)->year)->id,
             "comment" => $this->get("comment"),
+            "flow_skipped" => $this->boolean("flowSkipped"),
         ];
     }
 }