EP/myep
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: streamline property naming

Browse Source
This commit is contained in:
Björn Fromme
2025-09-19 16:09:27 +02:00
parent 096dd96db0
commit c9a258a350
18 changed files with 99 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BusProNet/DataProcessor/BookingDataProcessor.php
+14 -14
View File
@@ -75,8 +75,8 @@ class BookingDataProcessor
$servicesToReset = [
...$bookingData->additionalServices,
...$bookingData->transportationServices,
...$bookingData->pickupsTo,
...$bookingData->pickupsFro,
...$bookingData->pickupsOutbound,
...$bookingData->pickupsInbound,
];
foreach ($servicesToReset as $service) {
@@ -120,7 +120,7 @@ class BookingDataProcessor
$servicesToMap = [
...$participant->courses,
...$participant->additionalServices,
...$participant->skiPass,
...($participant->skiPass ? [$participant->skiPass] : []),
...$participant->board,
...$participant->rentals,
];
@@ -149,7 +149,7 @@ class BookingDataProcessor
*/
private function processTransportationServices(object $participant, object $bookingData, object $travelData): void
{
foreach ([$participant->transportationServiceTo, $participant->transportationServiceFro] as $service) {
foreach ([$participant->transportationOutbound, $participant->transportationInbound] as $service) {
if (false === isset($bookingData->transportationServices[$service->id])) {
$serviceToAdd = $travelData->transportationServices[$service->id] ?? null;
if (null !== $serviceToAdd) {
@@ -172,11 +172,11 @@ class BookingDataProcessor
*/
private function processPickupLocations(object $participant, object $bookingData): void
{
if ('BUS' === $participant->transportationServiceTo->subType && null !== $selectedPickup = $participant->pickup) {
if (false === isset($bookingData->pickupsTo[$selectedPickup->id])) {
$bookingData->pickupsTo[$selectedPickup->id] = $selectedPickup;
if ('BUS' === $participant->transportationOutbound->subType && null !== $selectedPickup = $participant->pickupOutbound) {
if (false === isset($bookingData->pickupsOutbound[$selectedPickup->id])) {
$bookingData->pickupsOutbound[$selectedPickup->id] = $selectedPickup;
}
$bookingData->pickupsTo[$selectedPickup->id]->mapping[] = $participant->index;
$bookingData->pickupsOutbound[$selectedPickup->id]->mapping[] = $participant->index;
}
}
@@ -202,15 +202,15 @@ class BookingDataProcessor
}
}
foreach ($bookingData->pickupsTo as $pickup) {
foreach ($bookingData->pickupsOutbound as $pickup) {
if (0 === count($pickup->mapping)) {
unset($bookingData->pickupsTo[$pickup->id]);
unset($bookingData->pickupsOutbound[$pickup->id]);
}
}
foreach ($bookingData->pickupsFro as $pickup) {
foreach ($bookingData->pickupsInbound as $pickup) {
if (0 === count($pickup->mapping)) {
unset($bookingData->pickupsFro[$pickup->id]);
unset($bookingData->pickupsInbound[$pickup->id]);
}
}
}
@@ -393,9 +393,9 @@ class BookingDataProcessor
*/
private function buildPickupPayload(array &$payload, object $bookingData): void
{
if (0 < count($bookingData->pickupsTo)) {
if (0 < count($bookingData->pickupsOutbound)) {
$payload['zustiege']['zustieg'] = [];
foreach ($bookingData->pickupsTo as $pickup) {
foreach ($bookingData->pickupsOutbound as $pickup) {
$payload['zustiege']['zustieg'][] = [
'@idzustieg' => $pickup->id,
'@anzahl' => count($pickup->mapping),
src/BusProNet/Model/Booking.php
+4 -4
View File
@@ -39,8 +39,8 @@ class Booking
public array $transportationServices = [];
public array $additionalServices = [];
public array $rooms = [];
public array $pickupsTo = [];
public array $pickupsFro = [];
public array $pickupsOutbound = [];
public array $pickupsInbound = [];
public array $surcharges = [];
public ?int $invoiceNumber = null;
public ?float $totalPrice = null;
@@ -106,7 +106,7 @@ class Booking
* Retrieves transportation service for a specific participant and direction.
*
* Finds the transportation service that matches the participant index
* and travel direction (e.g., 'H' for outbound, 'R' for return).
* and travel direction (e.g., 'H' for outbound, 'R' for inbound).
*
* @param int $participantIndex The participant index to search for
* @param string $direction The travel direction ('H' or 'R')
@@ -141,7 +141,7 @@ class Booking
*/
public function getPickupForParticipant(int $participantIndex): ?Pickup
{
foreach ($this->pickupsTo as $pickup) {
foreach ($this->pickupsOutbound as $pickup) {
if (in_array($participantIndex, $pickup->mapping)) {
return $pickup;
}
src/BusProNet/Model/Travel.php
+2 -2
View File
@@ -63,10 +63,10 @@ class Travel
public bool $transportationServicesMutable = true;
#[Groups(['api:single'])]
public array $pickupsTo = [];
public array $pickupsOutbound = [];
#[Groups(['api:single'])]
public array $pickupsFro = [];
public array $pickupsInbound = [];
#[Groups(['api:single'])]
public bool $pickupsMutable = true;
src/BusProNet/XmlLoader/PickupLoader.php
+2 -2
View File
@@ -61,7 +61,7 @@ class PickupLoader extends AbstractLoader
public function patchPickupsDetails(Travel $travel): void
{
foreach ($travel->pickupsTo as $pickupId => $pickup) {
foreach ($travel->pickupsOutbound as $pickupId => $pickup) {
$pickupData = $this->loadById($pickupId);
$pickup->code = $pickupData->code;
@@ -69,7 +69,7 @@ class PickupLoader extends AbstractLoader
$pickup->city = $pickupData->city;
$pickup->street = $pickupData->street;
}
foreach ($travel->pickupsFro as $pickupId => $pickup) {
foreach ($travel->pickupsInbound as $pickupId => $pickup) {
$pickupData = $this->loadById($pickupId);
$pickup->code = $pickupData->code;
src/BusProNet/XmlParser/BookingParser.php
+2 -2
View File
@@ -89,11 +89,11 @@ class BookingParser extends AbstractParser
$pickupsData = $node->filterXPath('//zustiege/zustieg');
if (0 < $pickupsData->count()) {
$booking->pickupsTo = $this->pickupsParser->parse($pickupsData);
$booking->pickupsOutbound = $this->pickupsParser->parse($pickupsData);
}
$pickupsData = $node->filterXPath('//zustiege_rueck/zustieg_rueck');
if (0 < $pickupsData->count()) {
$booking->pickupsFro = $this->pickupsParser->parse($pickupsData);
$booking->pickupsInbound = $this->pickupsParser->parse($pickupsData);
}
$surchargesData = $node->filterXPath('//zuschlaege/zuschlag');
src/BusProNet/XmlParser/TravelParser.php
+2 -2
View File
@@ -61,8 +61,8 @@ class TravelParser extends AbstractParser
$travel->transportationServices = $this
->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung'));
$travel->rooms = $this->getRooms($hotelNode);
$travel->pickupsTo = $this->getPickups($node->filterXPath('//zustiege/zustieg'), $dateFrom);
$travel->pickupsFro = $this->getPickups($node->filterXPath('//zustiege_rueck/zustieg_rueck'));
$travel->pickupsOutbound = $this->getPickups($node->filterXPath('//zustiege/zustieg'), $dateFrom);
$travel->pickupsInbound = $this->getPickups($node->filterXPath('//zustiege_rueck/zustieg_rueck'));
$travel->guide = $this->getGuide($node);
return $travel;
src/Form/BookingEditParticipantType.php
+6 -6
View File
@@ -214,7 +214,7 @@ class BookingEditParticipantType extends AbstractType
return $attributes;
};
$form
->add('transportationServiceTo', ChoiceType::class, [
->add('transportationOutbound', ChoiceType::class, [
...$commonChoiceFieldOptions,
'label' => 'Anreise',
'required' => true,
@@ -222,7 +222,7 @@ class BookingEditParticipantType extends AbstractType
'choices' => $options['selectable_transportation_services_to'],
'choice_attr' => $transportationChoiceAttributes,
])
->add('transportationServiceFro', ChoiceType::class, [
->add('transportationInbound', ChoiceType::class, [
...$commonChoiceFieldOptions,
'label' => 'Rückreise',
'required' => true,
@@ -232,7 +232,7 @@ class BookingEditParticipantType extends AbstractType
]);
// Pickup
$form->add('pickup', ChoiceType::class, [
$form->add('pickupOutbound', ChoiceType::class, [
'label' => 'Zustieg',
'multiple' => false,
'expanded' => false,
@@ -319,12 +319,12 @@ class BookingEditParticipantType extends AbstractType
}
}
$transportationId = $data['transportationServiceTo'] ?? null;
$transportationId = $data['transportationOutbound'] ?? null;
$transportation = $options['travel']->pickups[$transportationId] ?? null;
if (null !== $transportation && 'PKW' === $transportation->subType) {
$form->remove('pickup');
unset($data['pickup']);
$form->remove('pickupOutbound');
unset($data['pickupOutbound']);
}
// forcibly select mandatory services that potentially have been disabled in PRE_SET_DATA
src/Form/BookingEditType.php
+1 -1
View File
@@ -46,7 +46,7 @@ class BookingEditType extends AbstractType
->getTransportationServicesByDirection('HIN', false),
'selectable_transportation_services_fro' => $travelData
->getTransportationServicesByDirection('RUECK', false),
'selectable_pickups' => $travelData->pickupsTo,
'selectable_pickups' => $travelData->pickupsOutbound,
'personal_data_mutable' => $travelData->participantDataMutable,
'additional_services_mutable' => $travelData->additionalServicesMutable,
'transportation_services_mutable' => $travelData->transportationServicesMutable,
src/Form/Model/BookingEditDto.php
-5
View File
@@ -58,14 +58,9 @@ class BookingEditDto implements BookingDtoInterface
$participantData->transportationOutbound = $outboundTransportation;
$participantData->transportationInbound = $inboundTransportation;
// Backward compatibility: also set deprecated properties
$participantData->transportationServiceTo = $outboundTransportation;
$participantData->transportationServiceFro = $inboundTransportation;
// Pickup handling (currently only supports outbound pickup)
$pickupOutbound = $booking->getPickupForParticipant($index);
$participantData->pickupOutbound = $pickupOutbound;
$participantData->pickup = $pickupOutbound; // Backward compatibility
$instance->participants[$index] = $participantData;
}
src/Form/Model/ParticipantDto.php
+5 -5
View File
@@ -71,11 +71,6 @@ class ParticipantDto
// License plate for participants with parking (optional, visible only when parking is selected)
public ?string $licensePlate = null;
// Deprecated properties for backward compatibility - will be removed in future version
public ?Service $transportationServiceTo = null;
public ?Service $transportationServiceFro = null;
public ?Pickup $pickup = null;
public static function fromPersonalData(PersonalData $personalData): static
{
$instance = new static();
@@ -98,6 +93,11 @@ class ParticipantDto
return $instance;
}
public function isApplicant(): bool
{
return 0 === $this->index;
}
public function isCanceled(): bool
{
return 'S' === $this->status;
src/Form/Service/ParticipantFieldOptionsProvider.php
+2 -2
View File
@@ -328,7 +328,7 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
// Outbound Pickup (conditional - only shown when outbound transportation is bus)
$this->fieldOptionProviders['pickupOutbound'] = fn (BookingDtoInterface $bookingDto, int $participantIndex, array $options = []) => [
'label' => 'Zustieg Hinfahrt',
'choices' => $bookingDto->travel->pickupsTo,
'choices' => $bookingDto->travel->pickupsOutbound,
'choice_label' => fn (?Pickup $pickup) => $this->formatPickupLabelWithPrice($pickup),
'choice_value' => 'id',
'expanded' => false, // Dropdown for pickups
@@ -340,7 +340,7 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
// Inbound Pickup (conditional - only shown when inbound transportation is bus)
$this->fieldOptionProviders['pickupInbound'] = fn (BookingDtoInterface $bookingDto, int $participantIndex, array $options = []) => [
'label' => 'Ausstieg Rückfahrt',
'choices' => $bookingDto->travel->pickupsFro,
'choices' => $bookingDto->travel->pickupsInbound,
'choice_label' => fn (?Pickup $pickup) => $this->formatPickupLabelWithPrice($pickup),
'choice_value' => 'id',
'expanded' => false,
src/Form/Service/ParticipantPickupInboundFieldHandler.php
+1 -1
View File
@@ -64,7 +64,7 @@ class ParticipantPickupInboundFieldHandler extends AbstractParticipantFieldHandl
// Validate pickup selection against available inbound pickups
$validSelection = null;
if (null !== $selectedPickup) {
$validSelection = $this->findValidPickup($selectedPickup, $bookingDto->travel->pickupsFro);
$validSelection = $this->findValidPickup($selectedPickup, $bookingDto->travel->pickupsInbound);
}
$participant->pickupInbound = $validSelection;
src/Form/Service/ParticipantPickupOutboundFieldHandler.php
+1 -1
View File
@@ -65,7 +65,7 @@ class ParticipantPickupOutboundFieldHandler extends AbstractParticipantFieldHand
// Validate pickup selection against available outbound pickups
$validSelection = null;
if (null !== $selectedPickup) {
$validSelection = $this->findValidPickup($selectedPickup, $bookingDto->travel->pickupsTo);
$validSelection = $this->findValidPickup($selectedPickup, $bookingDto->travel->pickupsOutbound);
}
$participant->pickupOutbound = $validSelection;
src/Form/Service/ParticipantRentalsFieldHandler.php
+2 -2
View File
@@ -14,7 +14,7 @@ use App\Form\Service\Abstract\AbstractParticipantFieldHandler;
*
* This handler manages rental equipment selections for participants in the booking
* creation process. It processes the rentals field from form submissions,
* filters out age-inappropriate options and duration-inappropriate options, and
* filters out age-inappropriate options and duration-inappropriate options, and
* updates the participant DTO with only valid selections.
*
* Dependencies: dateOfBirth (for age evaluation) and skiPass (for duration filtering)
@@ -68,7 +68,7 @@ class ParticipantRentalsFieldHandler extends AbstractParticipantFieldHandler
if (null === $participant->skiPass) {
// No skipass selected = clear all rental selections
$participant->rentals = [];
return;
}
src/Service/TravelDataService.php
+33
View File
@@ -511,6 +511,39 @@ class TravelDataService
}
}
/**
* Fetch availability data with short-term caching.
*
* Retrieves availability information from the API with caching to reduce
* API calls during booking form interactions. Uses a short TTL to ensure
* reasonably fresh data while avoiding excessive API requests.
*
* @param int $dateId The travel date ID for API call
* @param int $ttl Cache TTL in seconds (default: 60 seconds)
*
* @return BaseData|null The availability data or null if not available or error occurred
*/
public function getAvailabilityDataCached(int $dateId, int $ttl = 60): ?BaseData
{
$cacheKey = sprintf('availability_%d', $dateId);
try {
return $this->cache->get($cacheKey, function (ItemInterface $item) use ($dateId, $ttl) {
$item->expiresAfter($ttl);
return $this->getAvailabilityData($dateId);
});
} catch (InvalidArgumentException $e) {
$this->logger->error('Cache error in getAvailabilityDataCached', [
'dateId' => $dateId,
'error' => $e->getMessage(),
]);
// Fallback to direct API call
return $this->getAvailabilityData($dateId);
}
}
/**
* Apply availability data to travel services.
*
src/Validator/Constraints/ParticipantValidator.php
+5 -5
View File
@@ -41,7 +41,7 @@ class ParticipantValidator extends ConstraintValidator
return;
}
foreach (['transportationServiceTo', 'transportationServiceFro'] as $property) {
foreach (['transportationOutbound', 'transportationInbound'] as $property) {
if (null === $participant->{$property}) {
$this->context->buildViolation('Bitte angeben')
->atPath($property)
@@ -54,12 +54,12 @@ class ParticipantValidator extends ConstraintValidator
public function assertPickupSelected(ParticipantDto $participant): void
{
if (
null !== $participant->transportationServiceTo
&& 'BUS' === $participant->transportationServiceTo->subType
&& null === $participant->pickup
null !== $participant->transportationOutbound
&& 'BUS' === $participant->transportationOutbound->subType
&& null === $participant->pickupOutbound
) {
$this->context->buildViolation('Bitte auswählen')
->atPath('pickup')
->atPath('pickupOutbound')
->addViolation()
;
}