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

feat: travel data API endpoint for travelinfo pages in TYPO3

Browse Source
This commit is contained in:
Björn Fromme
2025-05-15 11:54:37 +02:00
parent 1e5401ea25
commit 6bf22045c4
6 changed files with 120 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/BusProNet/XmlLoader/TravelLoader.php
+16 -6
View File
@@ -11,6 +11,7 @@ use App\BusProNet\Model\Pickup;
use App\BusProNet\Model\Room;
use App\BusProNet\Model\Service;
use App\BusProNet\Model\Travel;
use App\BusProNet\Utility\TravelCodeUtility;
use League\Flysystem\FilesystemOperator;
use League\Flysystem\StorageAttributes;
use Psr\Cache\InvalidArgumentException;
@@ -130,11 +131,13 @@ class TravelLoader extends AbstractLoader
{
$hotelNode = $this->getHotelNode($node, $hotelId);
$dateFrom = $this->stringToDate($node->attr('termin'));
$travel = new Travel();
$travel->id = (int) $node->attr('idbuspro');
$travel->hotelId = (int) $hotelNode->attr('idbuspro');
$travel->label = $this->getStringOrNullValue($node->filterXPath('//text'));
$travel->dateFrom = $this->stringToDate($node->attr('termin'));
$travel->dateFrom = $dateFrom;
$travel->dateTo = $this->stringToDate($node->attr('bis'));
$travel->code = $node->attr('code');
$travel->type = $node->attr('reiseart');
@@ -145,7 +148,7 @@ class TravelLoader extends AbstractLoader
$travel->transportationServices = $this
->getTransportationServices($node->filterXPath('//lei_befoerderung/leistung'));
$travel->rooms = $this->getRooms($hotelNode);
$travel->pickupsTo = $this->getPickups($node->filterXPath('//zustiege/zustieg'));
$travel->pickupsTo = $this->getPickups($node->filterXPath('//zustiege/zustieg'), $dateFrom);
$travel->pickupsFro = $this->getPickups($node->filterXPath('//zustiege_rueck/zustieg_rueck'));
$travel->guide = $this->getGuide($node);
@@ -248,19 +251,23 @@ class TravelLoader extends AbstractLoader
return $transportationServices;
}
public function getPickups(Crawler $node): array
public function getPickups(Crawler $node, ?\DateTimeImmutable $defaultDate = null): array
{
$pickups = [];
$node->each(function (Crawler $pickupNode) use (&$pickups) {
$node->each(function (Crawler $pickupNode) use (&$pickups, $defaultDate) {
$pickupId = (int) $pickupNode->attr('idbuspro');
$pickup = new Pickup();
$pickup->id = $pickupId;
$pickup->time = $this->stringToDateTime($pickupNode->attr('zeit'));
$pickup->price = $pickupNode->attr('preis') ?
$this->stringToFloat($pickupNode->attr('preis')) : null;
// parse date and time only for direction 'to' indicated by provided default date
if (null !== $defaultDate) {
$pickup->time = $this->stringToDateTimeFuzzy($pickupNode->attr('zeit'), $defaultDate);
}
$pickups[$pickupId] = $pickup;
});
@@ -352,6 +359,8 @@ class TravelLoader extends AbstractLoader
public function patchBookings(BaseData $bookings): void
{
$travelCodeUtility = new TravelCodeUtility();
foreach ($bookings->getItems() as $booking) {
if (null === $travelId = $booking->travelId) {
continue;
@@ -368,11 +377,12 @@ class TravelLoader extends AbstractLoader
$travelDate = $travelData->dateFrom;
$travelCode = $travelData->code;
// generate url to travelinfo page five days before travel begins
if ($travelDate->modify('-5 days') < $now) {
$booking->travelInfoUrl = sprintf(
'%s/%s',
rtrim($this->travelInfoBaseUrl, '/'),
str_replace('/', '-', $travelCode)
$travelCodeUtility->sanitize($travelCode)
);
}
}