wip: finalize implementation

src/Controller/Booking/Create/Step2Controller.php

@@ -11,6 +11,7 @@ use App\Controller\Booking\Traits\ParticipantValidationTrait;
 use App\Form\BookingCreateStep2Type;
 use App\Form\Model\BookingDto;
 use App\Form\Model\ParticipantDto;
+use App\Form\Service\ParticipantFieldOptionsProvider;
 use App\Htmx\HxTrait;
 use App\Service\BookingPriceCalculatorService;
 use App\Service\BookingService;
@@ -42,6 +43,7 @@ class Step2Controller extends AbstractController
         private readonly TravelDataService $travelDataService,
         private readonly RoomAssignmentService $roomAssignmentService,
         private readonly ParticipantCardDataService $participantCardService,
+        private readonly ParticipantFieldOptionsProvider $fieldOptionsProvider,
     ) {
     }
 
@@ -58,14 +60,14 @@ class Step2Controller extends AbstractController
         }
         $bookingCreateDto = $result;
 
-        // Enrich with fresh availability data
-        $this->enrichWithFreshAvailabilities($bookingCreateDto);
-
         // Validate step access
         if ($redirect = $this->validateStepAccess($bookingCreateDto, 2)) {
             return $redirect;
         }
 
+        // Enrich with fresh availability data
+        $this->enrichWithFreshAvailabilities($bookingCreateDto);
+
         // Ensure correct number of participants
         $this->ensureCorrectNumberOfParticipants($bookingCreateDto);
 
@@ -84,8 +86,8 @@ class Step2Controller extends AbstractController
         ]);
         $form->handleRequest($request);
 
-        // Handle form submission (clicking "Weiter")
-        if ($form->isSubmitted() && $form->isValid()) {
+        // Handle form submission
+        if (true === $form->isSubmitted() && true === $form->isValid()) {
             // All participants validated successfully, update current step
             $bookingCreateDto->currentStep = 3;
             $this->bookingService->saveBookingDto($request, $bookingCreateDto, BookingDto::MODE_CREATE);
@@ -96,7 +98,7 @@ class Step2Controller extends AbstractController
 
         // Extract participant indices with validation errors
         $participantErrors = [];
-        if ($form->isSubmitted() && false === $form->isValid()) {
+        if (true === $form->isSubmitted() && false === $form->isValid()) {
             $participantErrors = $this->extractParticipantErrorIndices($form);
         }
 
@@ -118,7 +120,7 @@ class Step2Controller extends AbstractController
             'participantErrors' => $participantErrors,
         ];
 
-        // If HTMX request, render only blocks to avoid layout duplication
+        // HTMX request: render blocks only
         if ($this->isHxRequest($request)) {
             return $this->htmxOobResponse(
                 'booking/create/step_2.html.twig',
@@ -148,6 +150,9 @@ class Step2Controller extends AbstractController
             throw $this->createNotFoundException(sprintf('Participant at index %d does not exist', $index));
         }
 
+        // Enrich with fresh availability data
+        $this->enrichWithFreshAvailabilities($bookingDto);
+
         // Create form with booking_context option
         $form = $this->createParticipantForm($bookingDto, $index, [
             'validation_groups' => ['booking_create_step_2'],
@@ -155,7 +160,7 @@ class Step2Controller extends AbstractController
 
         $form->handleRequest($request);
 
-        if ($form->isSubmitted() && $form->isValid()) {
+        if (true === $form->isSubmitted() && true === $form->isValid()) {
             // Save BookingDto to session
             $this->bookingService->saveBookingDto($request, $bookingDto, BookingDto::MODE_CREATE);
 
@@ -199,14 +204,14 @@ class Step2Controller extends AbstractController
     {
         $bookingDto = $this->loadBookingDtoOrFail($request, BookingDto::MODE_CREATE);
 
-        // Enrich with fresh availability data
-        $this->enrichWithFreshAvailabilities($bookingDto);
-
         // Validate participant index
         if (false === isset($bookingDto->participants[$index])) {
             throw $this->createNotFoundException(sprintf('Participant at index %d does not exist', $index));
         }
 
+        // Enrich with fresh availability data
+        $this->enrichWithFreshAvailabilities($bookingDto);
+
         // Use trait method for refresh handling
         return $this->handleParticipantRefresh(
             $request,