chore: streamline property naming

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
@@ -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),
+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;
}
+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;
+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;
+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');
+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;