feat: refactoring and cleanup

src/Form/Service/ParticipantPickupFieldHandler.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Form\Service;
 
-use App\BusProNet\Model\Pickup;
 use App\BusProNet\Utility\DirectionMapper;
 use App\Form\Model\BookingDto;
 use App\Form\Service\Abstract\AbstractParticipantFieldHandler;
@@ -58,36 +57,6 @@ class ParticipantPickupFieldHandler extends AbstractParticipantFieldHandler
         $selectedPickup = $this->getFieldValue($submittedData, $this->getFieldName());
 
         // Validate pickup selection against available outbound pickups
-        $validSelection = null;
-        if (null !== $selectedPickup) {
-            $validSelection = $this->findValidPickup($selectedPickup, $bookingDto->travel->pickupsOutbound);
-        }
-
-        $participant->pickup = $validSelection;
-    }
-
-    /**
-     * Finds a valid pickup from available pickups.
-     *
-     * @param mixed              $selectedPickupId The submitted pickup ID
-     * @param array<int, Pickup> $availablePickups Array of available pickup locations
-     *
-     * @return Pickup|null The valid pickup object, or null if invalid
-     */
-    private function findValidPickup(mixed $selectedPickupId, array $availablePickups): ?Pickup
-    {
-        if (null === $selectedPickupId || false === is_string($selectedPickupId) && false === is_int($selectedPickupId)) {
-            return null;
-        }
-
-        $pickupId = (int) $selectedPickupId;
-
-        foreach ($availablePickups as $pickup) {
-            if ($pickup->id === $pickupId) {
-                return $pickup;
-            }
-        }
-
-        return null;
+        $participant->pickup = $this->findItemById($selectedPickup, $bookingDto->travel->pickupsOutbound);
     }
 }