feat: sync contingents for TYPO3 calendar hotels

src/Command/BpnSyncContingentsCommand.php

@@ -4,10 +4,9 @@ declare(strict_types=1);
 
 namespace App\Command;
 
-use App\Entity\Groups\Accommodation;
-use App\Repository\Groups\AccommodationRepository;
 use App\Repository\Groups\ContingentDayRepository;
 use App\Repository\Groups\ContingentSyncStateRepository;
+use App\Service\ContingentHotelDirectory;
 use App\Service\ContingentSnapshotManager;
 use Carbon\CarbonImmutable;
 use Psr\Log\LoggerInterface;
@@ -28,14 +27,18 @@ use Symfony\Component\Console\Style\SymfonyStyle;
  *
  * Scheduled over the full horizon throughout: every 15 minutes during peak hours, hourly
  * outside them. The options exist for ad-hoc runs — a narrower --horizon-months, or --hotel
- * to re-sync a single accommodation while debugging.
+ * to re-sync a single hotel code while debugging.
+ *
+ * Syncs every code of {@see ContingentHotelDirectory}: the accommodations' calendar codes plus
+ * TYPO3's calendar hotels. A full run also drops the snapshot of codes that have left both
+ * sources, so the snapshot tables only ever describe hotels that are still synced.
  */
 class BpnSyncContingentsCommand extends Command
 {
     use LockableTrait;
 
     public function __construct(
-        private readonly AccommodationRepository $accommodationRepository,
+        private readonly ContingentHotelDirectory $hotelDirectory,
         private readonly ContingentSyncStateRepository $syncStateRepository,
         private readonly ContingentDayRepository $dayRepository,
         private readonly ContingentSnapshotManager $snapshotManager,
@@ -51,8 +54,8 @@ class BpnSyncContingentsCommand extends Command
     {
         $this
             ->addOption('horizon-months', null, InputOption::VALUE_REQUIRED, 'How many months ahead to sync (defaults to the full horizon)', '24')
-            ->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single calendarCode')
-            ->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before an accommodation is eligible (ignored with --force)', '0')
+            ->addOption('hotel', null, InputOption::VALUE_REQUIRED, 'Restrict the run to a single hotel code')
+            ->addOption('stale-after', null, InputOption::VALUE_REQUIRED, 'Minimum minutes since the last sync before a hotel is eligible (ignored with --force)', '0')
             ->addOption('force', 'f', InputOption::VALUE_NONE, 'Sync even if the snapshot was refreshed recently')
         ;
     }
@@ -79,10 +82,13 @@ class BpnSyncContingentsCommand extends Command
         $dateFrom = $today->toDateTimeImmutable();
         $dateTo = $today->addMonths($horizonMonths)->toDateTimeImmutable();
 
-        $accommodations = $this->resolveAccommodations(is_string($hotelCode) ? $hotelCode : null);
+        $this->hotelDirectory->refresh();
+        // array_keys() turns a numeric code into an int.
+        $allHotelCodes = array_map('strval', array_keys($this->hotelDirectory->all()));
+        $hotelCodes = is_string($hotelCode) ? array_values(array_intersect($allHotelCodes, [$hotelCode])) : $allHotelCodes;
 
-        if ([] === $accommodations) {
-            $io->warning('No accommodation with a calendarCode matched.');
+        if ([] === $hotelCodes) {
+            $io->warning('No accommodation calendarCode or TYPO3 calendar hotel matched.');
 
             return Command::SUCCESS;
         }
@@ -92,19 +98,19 @@ class BpnSyncContingentsCommand extends Command
         $changed = 0;
         $failedCodes = [];
 
-        foreach ($accommodations as $accommodation) {
-            if (!$force && $this->isFresh($accommodation, $staleAfterMinutes)) {
+        foreach ($hotelCodes as $code) {
+            if (!$force && $this->isFresh($code, $staleAfterMinutes)) {
                 ++$skipped;
 
                 continue;
             }
 
-            $result = $this->snapshotManager->sync($accommodation, $dateFrom, $dateTo);
+            $result = $this->snapshotManager->sync($code, $dateFrom, $dateTo);
             ++$processed;
 
             if (!$result->successful) {
-                $failedCodes[] = (string) $accommodation->getCalendarCode();
-                $io->warning(sprintf('%s: %s', (string) $accommodation->getCalendarCode(), (string) $result->error));
+                $failedCodes[] = $code;
+                $io->warning(sprintf('%s: %s', $code, (string) $result->error));
 
                 continue;
             }
@@ -115,7 +121,7 @@ class BpnSyncContingentsCommand extends Command
 
             $io->writeln(sprintf(
                 '<info>%s</info>: %s (+%d ~%d -%d, %d beyond the previous horizon)',
-                (string) $accommodation->getCalendarCode(),
+                $code,
                 $result->changed ? 'changed' : 'unchanged',
                 $result->added,
                 $result->updated,
@@ -149,6 +155,21 @@ class BpnSyncContingentsCommand extends Command
         $deleted = $this->dayRepository->deleteBefore($today->subDay()->toDateTimeImmutable());
         $io->note(sprintf('Deleted %d outdated snapshot days.', $deleted));
 
+        // Only a full run knows the whole set. A code that left both sources is not served any
+        // more (the availability endpoint answers 400 for it), so its snapshot is dead weight;
+        // should it come back, the next run rebuilds it.
+        if (!is_string($hotelCode)) {
+            $orphanedDays = $this->dayRepository->deleteExceptHotelCodes($allHotelCodes);
+            $orphanedStates = $this->syncStateRepository->deleteExceptHotelCodes($allHotelCodes);
+
+            if ($orphanedStates > 0) {
+                $this->logger->info('Dropped the contingent snapshot of hotel codes that are no longer synced', [
+                    'hotels' => $orphanedStates,
+                    'days' => $orphanedDays,
+                ]);
+            }
+        }
+
         // Only a *total* failure is worth failing the task over: that means upstream is down or
         // the API key is rejected, and the scheduler's failure mail is genuinely actionable.
         // A single hotel breaking must stay quiet — this task runs every 15 minutes during the
@@ -158,27 +179,13 @@ class BpnSyncContingentsCommand extends Command
         return $processed > 0 && $failed === $processed ? Command::FAILURE : Command::SUCCESS;
     }
 
-    /**
-     * @return Accommodation[]
-     */
-    private function resolveAccommodations(?string $hotelCode): array
-    {
-        if (null === $hotelCode) {
-            return $this->accommodationRepository->findAllWithCalendarCode();
-        }
-
-        $accommodation = $this->accommodationRepository->findOneByCalendarCode($hotelCode);
-
-        return null !== $accommodation ? [$accommodation] : [];
-    }
-
-    private function isFresh(Accommodation $accommodation, int $staleAfterMinutes): bool
+    private function isFresh(string $hotelCode, int $staleAfterMinutes): bool
     {
         if (0 === $staleAfterMinutes) {
             return false;
         }
 
-        $syncedAt = $this->syncStateRepository->findOneByAccommodation($accommodation)?->getSyncedAt();
+        $syncedAt = $this->syncStateRepository->findOneByHotelCode($hotelCode)?->getSyncedAt();
 
         if (null === $syncedAt) {
             return false;

src/Controller/Api/ContingentController.php

@@ -11,7 +11,9 @@ use App\Model\ContingentCalendarQuery;
 use App\Model\ContingentPricesQuery;
 use App\Repository\Groups\AccommodationPriceRepository;
 use App\Repository\Groups\AccommodationRepository;
+use App\Repository\Groups\ContingentSyncStateRepository;
 use App\Service\AccommodationPriceCoverage;
+use App\Service\ContingentHotelDirectory;
 use App\Service\ContingentSnapshotReader;
 use App\Service\PriceTimelineBuilder;
 use Carbon\CarbonImmutable;
@@ -33,6 +35,8 @@ class ContingentController extends AbstractController
         private readonly ContingentSnapshotReader $snapshotReader,
         private readonly PriceTimelineBuilder $priceTimelineBuilder,
         private readonly AccommodationPriceCoverage $priceCoverage,
+        private readonly ContingentHotelDirectory $hotelDirectory,
+        private readonly ContingentSyncStateRepository $syncStateRepository,
         private readonly LoggerInterface $logger,
     ) {
     }
@@ -107,7 +111,7 @@ class ContingentController extends AbstractController
         // An empty or stale snapshot must not be served as though every day were blocked: that
         // is a plausible-looking 200 nobody can distinguish from real data. Fail the way this
         // endpoint always failed instead, so existing consumers need no change.
-        $statuses = $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo);
+        $statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
 
         if (null === $statuses) {
             return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
@@ -137,15 +141,16 @@ class ContingentController extends AbstractController
      * The snapshot as it is, for the iCal feed: no price rule, and days the snapshot lacks are
      * left out rather than blocked, so a portal shows them as free like it did with the feed
      * that read bpn-connect directly.
+     *
+     * Serves every synced hotel code, including TYPO3's calendar hotels that have no
+     * accommodation (winter-only hotels).
      */
     #[Route(path: '/contingents/availability', name: 'api_contingents_availability', methods: ['GET'])]
     public function availability(
         #[MapQueryString(validationFailedStatusCode: Response::HTTP_BAD_REQUEST)]
         ContingentCalendarQuery $query,
     ): JsonResponse {
-        $accommodation = $this->accommodationRepository->findOneBy(['calendarCode' => $query->hotelCode]);
-
-        if (null === $accommodation) {
+        if (null === $this->hotelDirectory->find($query->hotelCode)) {
             $this->logger->error('Hotel not found for hotelcode '.$query->hotelCode);
 
             return $this->json(['error' => 'Hotel not found for hotelCode.'], Response::HTTP_BAD_REQUEST);
@@ -157,7 +162,7 @@ class ContingentController extends AbstractController
 
         // Same reasoning as calendar(): a missing or stale snapshot must not pass for real data.
         // Here it matters even more, since an empty feed would show every day as free.
-        $statuses = $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo);
+        $statuses = $this->snapshotReader->statusesFor($query->hotelCode, $dateFrom, $dateTo);
 
         if (null === $statuses) {
             return $this->json(['error' => 'Failed to fetch contingent data.'], Response::HTTP_BAD_GATEWAY);
@@ -174,6 +179,44 @@ class ContingentController extends AbstractController
         return $this->json($data);
     }
 
+    /**
+     * One row per synced hotel code, for the overview of which hotel supports which calendar.
+     *
+     * `available` is whether `availability` currently serves the hotel; calendar and price table
+     * additionally need an accommodation with prices, which `pricedFrom`/`pricedTo` show.
+     */
+    #[Route(path: '/contingents/status', name: 'api_contingents_status', methods: ['GET'])]
+    public function status(): JsonResponse
+    {
+        $states = $this->syncStateRepository->findAllIndexedByHotelCode();
+
+        $data = [];
+
+        foreach ($this->hotelDirectory->all() as $hotel) {
+            $state = $states[$hotel->code] ?? null;
+            $accommodation = $hotel->accommodation;
+            $bounds = null !== $accommodation ? $this->priceRepository->findPricedDateBoundsByHotelCode($hotel->code) : null;
+
+            $data[] = [
+                'hotelCode' => $hotel->code,
+                'name' => $hotel->calendarHotel?->getName(),
+                'sources' => array_map(static fn ($source) => $source->value, $hotel->sources()),
+                'accommodation' => null !== $accommodation ? [
+                    'name' => $accommodation->getName(),
+                    'cmsCode' => $accommodation->getEffectiveCmsCode(),
+                ] : null,
+                'pricedFrom' => null !== $bounds ? $bounds['from']->format('Y-m-d') : null,
+                'pricedTo' => null !== $bounds ? $bounds['to']->format('Y-m-d') : null,
+                'syncedAt' => $state?->getSyncedAt()?->format(\DateTimeInterface::ATOM),
+                'lastError' => $state?->getLastError(),
+                'failureCount' => $state?->getFailureCount() ?? 0,
+                'available' => $this->snapshotReader->isCurrent($state),
+            ];
+        }
+
+        return $this->json($data);
+    }
+
     /**
      * @param AccommodationPrice[] $prices
      * @param array<string, true>  $covered

src/Controller/Groups/Booking/Step1Controller.php

@@ -240,7 +240,7 @@ class Step1Controller extends AbstractController
         \DateTimeImmutable $dateTo,
     ): array {
         $contingentStatus = null !== $accommodation
-            ? $this->snapshotReader->statusesFor($accommodation, $dateFrom, $dateTo) ?? []
+            ? $this->snapshotReader->statusesFor($hotelCode, $dateFrom, $dateTo) ?? []
             : [];
 
         $prices = $this->priceRepository->findByHotelCodeAndDateRange($hotelCode, $dateFrom, $dateTo);

src/Entity/Groups/CalendarHotel.php

@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Groups;
+
+use App\Repository\Groups\CalendarHotelRepository;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Local copy of the last calendar hotel list TYPO3 answered successfully.
+ *
+ * Kept so the contingent sync still covers TYPO3's hotels while TYPO3 is unreachable. Written
+ * only by {@see \App\Service\ContingentHotelDirectory::refresh()}, never by hand: the list is
+ * TYPO3's, this is not a third place to maintain hotel codes in.
+ */
+#[ORM\Entity(repositoryClass: CalendarHotelRepository::class)]
+#[ORM\Table(name: 'calendar_hotel')]
+class CalendarHotel
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column]
+    private ?int $id = null;
+
+    #[ORM\Column(length: 16, unique: true)]
+    private ?string $code = null;
+
+    #[ORM\Column(length: 255)]
+    private ?string $name = null;
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getCode(): ?string
+    {
+        return $this->code;
+    }
+
+    public function setCode(string $code): self
+    {
+        $this->code = $code;
+
+        return $this;
+    }
+
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

src/Entity/Groups/ContingentDay.php

@@ -12,11 +12,14 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * Local snapshot of a single day of contingent availability as reported by bpn-connect.
  *
+ * Keyed by hotel code, not by accommodation: the snapshot also covers TYPO3's calendar hotels,
+ * which have no `Accommodation`.
+ *
  * Written exclusively by the scheduled sync, never by a user, hence no Blameable/Timestampable.
  */
 #[ORM\Entity(repositoryClass: ContingentDayRepository::class)]
 #[ORM\Table(name: 'contingent_day')]
-#[ORM\UniqueConstraint(name: 'uniq_contingent_day_accommodation_date', columns: ['accommodation_id', 'date'])]
+#[ORM\UniqueConstraint(name: 'uniq_contingent_day_hotel_code_date', columns: ['hotel_code', 'date'])]
 class ContingentDay
 {
     #[ORM\Id]
@@ -24,8 +27,15 @@ class ContingentDay
     #[ORM\Column]
     private ?int $id = null;
 
+    #[ORM\Column(length: 16)]
+    private ?string $hotelCode = null;
+
+    /**
+     * Superseded by $hotelCode and no longer written. Only rows from before the switch still
+     * carry it; it stays mapped until the column is dropped, so the switch can be rolled back.
+     */
     #[ORM\ManyToOne]
-    #[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(nullable: true, onDelete: 'CASCADE')]
     private ?Accommodation $accommodation = null;
 
     #[ORM\Column(type: Types::DATE_IMMUTABLE)]
@@ -39,6 +49,18 @@ class ContingentDay
         return $this->id;
     }
 
+    public function getHotelCode(): ?string
+    {
+        return $this->hotelCode;
+    }
+
+    public function setHotelCode(string $hotelCode): self
+    {
+        $this->hotelCode = $hotelCode;
+
+        return $this;
+    }
+
     public function getAccommodation(): ?Accommodation
     {
         return $this->accommodation;

src/Entity/Groups/ContingentSyncState.php

@@ -9,7 +9,7 @@ use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * Bookkeeping for the scheduled contingent sync of a single accommodation.
+ * Bookkeeping for the scheduled contingent sync of a single hotel code.
  *
  * `changedAt` records when the sync last saw a day appear, vanish or switch status within the
  * horizon it had already reached; `horizonTo` is how far that reach extends.
@@ -23,8 +23,14 @@ class ContingentSyncState
     #[ORM\Column]
     private ?int $id = null;
 
+    #[ORM\Column(length: 16, unique: true)]
+    private ?string $hotelCode = null;
+
+    /**
+     * Superseded by $hotelCode, see {@see ContingentDay::$accommodation}.
+     */
     #[ORM\OneToOne]
-    #[ORM\JoinColumn(nullable: false, unique: true, onDelete: 'CASCADE')]
+    #[ORM\JoinColumn(nullable: true, unique: true, onDelete: 'CASCADE')]
     private ?Accommodation $accommodation = null;
 
     /**
@@ -48,9 +54,9 @@ class ContingentSyncState
     #[ORM\Column]
     private int $failureCount = 0;
 
-    public function __construct(?Accommodation $accommodation = null)
+    public function __construct(?string $hotelCode = null)
     {
-        $this->accommodation = $accommodation;
+        $this->hotelCode = $hotelCode;
     }
 
     public function getId(): ?int
@@ -58,6 +64,11 @@ class ContingentSyncState
         return $this->id;
     }
 
+    public function getHotelCode(): ?string
+    {
+        return $this->hotelCode;
+    }
+
     public function getAccommodation(): ?Accommodation
     {
         return $this->accommodation;

src/Enum/ContingentHotelSource.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Enum;
+
+/**
+ * Where a hotel code in the contingent snapshot comes from. A code can have both.
+ */
+enum ContingentHotelSource: string
+{
+    /** The calendarCode of a group house (`Accommodation`). */
+    case Accommodation = 'accommodation';
+
+    /** The calendar hotel of a visible TYPO3 product, from TYPO3's `/api/calendar-hotels`. */
+    case Typo3 = 'typo3';
+}

src/Model/CmsCalendarHotel.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+/**
+ * One entry of TYPO3's `/api/calendar-hotels`: the calendar hotel of a visible product.
+ *
+ * TYPO3 also lists the products per hotel; only the code and the name are kept here.
+ */
+final readonly class CmsCalendarHotel
+{
+    public function __construct(
+        public string $code,
+        public string $name,
+    ) {
+    }
+}

src/Model/ContingentHotel.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+use App\Entity\Groups\Accommodation;
+use App\Entity\Groups\CalendarHotel;
+use App\Enum\ContingentHotelSource;
+
+/**
+ * A hotel code the contingent snapshot is kept for, with whatever it is known as locally.
+ */
+final readonly class ContingentHotel
+{
+    public function __construct(
+        public string $code,
+        public ?Accommodation $accommodation,
+        public ?CalendarHotel $calendarHotel,
+    ) {
+    }
+
+    /**
+     * @return list<ContingentHotelSource>
+     */
+    public function sources(): array
+    {
+        $sources = [];
+
+        if (null !== $this->accommodation) {
+            $sources[] = ContingentHotelSource::Accommodation;
+        }
+
+        if (null !== $this->calendarHotel) {
+            $sources[] = ContingentHotelSource::Typo3;
+        }
+
+        return $sources;
+    }
+}

src/Repository/Groups/CalendarHotelRepository.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Repository\Groups;
+
+use App\Entity\Groups\CalendarHotel;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @extends ServiceEntityRepository<CalendarHotel>
+ */
+class CalendarHotelRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, CalendarHotel::class);
+    }
+
+    /**
+     * @return array<string, CalendarHotel>
+     */
+    public function findAllIndexedByCode(): array
+    {
+        $indexed = [];
+
+        foreach ($this->findAll() as $hotel) {
+            $indexed[(string) $hotel->getCode()] = $hotel;
+        }
+
+        return $indexed;
+    }
+}

src/Repository/Groups/ContingentDayRepository.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Repository\Groups;
 
-use App\Entity\Groups\Accommodation;
 use App\Entity\Groups\ContingentDay;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -20,9 +19,8 @@ class ContingentDayRepository extends ServiceEntityRepository
     }
 
     /**
-     * Returns the snapshot days within [dateFrom, dateTo] for the accommodation
-     * identified by the given hotel code, keyed by Y-m-d. A null dateTo means
-     * everything from dateFrom to the end of the snapshot.
+     * Returns the snapshot days of a hotel code within [dateFrom, dateTo], keyed by Y-m-d.
+     * A null dateTo means everything from dateFrom to the end of the snapshot.
      *
      * @return array<string, ContingentDay>
      */
@@ -32,8 +30,7 @@ class ContingentDayRepository extends ServiceEntityRepository
         ?\DateTimeImmutable $dateTo,
     ): array {
         $qb = $this->createQueryBuilder('cd')
-            ->join('cd.accommodation', 'a')
-            ->where('a.calendarCode = :hotelCode')
+            ->where('cd.hotelCode = :hotelCode')
             ->andWhere('cd.date >= :dateFrom')
             ->setParameter('hotelCode', $hotelCode)
             ->setParameter('dateFrom', $dateFrom)
@@ -50,31 +47,6 @@ class ContingentDayRepository extends ServiceEntityRepository
         return $this->indexByDate($days);
     }
 
-    /**
-     * Same as above but for a known accommodation; used by the sync to diff against.
-     *
-     * @return array<string, ContingentDay>
-     */
-    public function findByAccommodationAndDateRange(
-        Accommodation $accommodation,
-        \DateTimeImmutable $dateFrom,
-        \DateTimeImmutable $dateTo,
-    ): array {
-        /** @var ContingentDay[] $days */
-        $days = $this->createQueryBuilder('cd')
-            ->where('cd.accommodation = :accommodation')
-            ->andWhere('cd.date >= :dateFrom')
-            ->andWhere('cd.date <= :dateTo')
-            ->setParameter('accommodation', $accommodation)
-            ->setParameter('dateFrom', $dateFrom)
-            ->setParameter('dateTo', $dateTo)
-            ->orderBy('cd.date', 'ASC')
-            ->getQuery()
-            ->getResult();
-
-        return $this->indexByDate($days);
-    }
-
     /**
      * Retention: drops snapshot days that are in the past and can no longer be requested.
      */
@@ -88,6 +60,21 @@ class ContingentDayRepository extends ServiceEntityRepository
             ->execute();
     }
 
+    /**
+     * Drops the days of every hotel code that is no longer synced.
+     *
+     * @param non-empty-list<string> $hotelCodes the codes that are still synced
+     */
+    public function deleteExceptHotelCodes(array $hotelCodes): int
+    {
+        return (int) $this->createQueryBuilder('cd')
+            ->delete()
+            ->where('cd.hotelCode NOT IN (:hotelCodes)')
+            ->setParameter('hotelCodes', $hotelCodes)
+            ->getQuery()
+            ->execute();
+    }
+
     /**
      * @param ContingentDay[] $days
      *

src/Repository/Groups/ContingentSyncStateRepository.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace App\Repository\Groups;
 
-use App\Entity\Groups\Accommodation;
 use App\Entity\Groups\ContingentSyncState;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -19,30 +18,37 @@ class ContingentSyncStateRepository extends ServiceEntityRepository
         parent::__construct($registry, ContingentSyncState::class);
     }
 
-    public function findOneByAccommodation(Accommodation $accommodation): ?ContingentSyncState
+    public function findOneByHotelCode(string $hotelCode): ?ContingentSyncState
     {
-        return $this->findOneBy(['accommodation' => $accommodation]);
+        return $this->findOneBy(['hotelCode' => $hotelCode]);
     }
 
     /**
-     * Returns every sync state keyed by accommodation id, for the revisions endpoint.
-     *
-     * @return array<int, ContingentSyncState>
+     * @return array<string, ContingentSyncState>
      */
-    public function findAllIndexedByAccommodationId(): array
+    public function findAllIndexedByHotelCode(): array
     {
         $indexed = [];
 
         foreach ($this->findAll() as $state) {
-            $accommodation = $state->getAccommodation();
-
-            if (null === $accommodation || null === $accommodation->getId()) {
-                continue;
-            }
-
-            $indexed[$accommodation->getId()] = $state;
+            $indexed[(string) $state->getHotelCode()] = $state;
         }
 
         return $indexed;
     }
+
+    /**
+     * Drops the sync state of every hotel code that is no longer synced.
+     *
+     * @param non-empty-list<string> $hotelCodes the codes that are still synced
+     */
+    public function deleteExceptHotelCodes(array $hotelCodes): int
+    {
+        return (int) $this->createQueryBuilder('s')
+            ->delete()
+            ->where('s.hotelCode NOT IN (:hotelCodes)')
+            ->setParameter('hotelCodes', $hotelCodes)
+            ->getQuery()
+            ->execute();
+    }
 }

src/Service/CmsDataProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Service;
 
+use App\Model\CmsCalendarHotel;
 use App\Model\CmsHotelData;
 use App\Model\CmsRegionData;
 use Symfony\Contracts\Cache\CacheInterface;
@@ -169,6 +170,40 @@ class CmsDataProvider
         return is_numeric($value) ? (float) $value : null;
     }
 
+    /**
+     * The calendar hotels of TYPO3's visible products, or null when TYPO3 did not answer with a
+     * usable list. Uncached: the only caller keeps its own copy of the last good answer.
+     *
+     * @return list<CmsCalendarHotel>|null
+     */
+    public function fetchCalendarHotels(): ?array
+    {
+        try {
+            $data = $this->httpClient->request('GET', 'api/calendar-hotels')->toArray();
+        } catch (ExceptionInterface) {
+            return null;
+        }
+
+        if (!array_is_list($data)) {
+            return null;
+        }
+
+        $hotels = [];
+
+        foreach ($data as $entry) {
+            $code = $entry['code'] ?? null;
+
+            if (!is_string($code) || '' === $code) {
+                continue;
+            }
+
+            $name = $entry['name'] ?? null;
+            $hotels[] = new CmsCalendarHotel($code, is_string($name) && '' !== $name ? $name : $code);
+        }
+
+        return $hotels;
+    }
+
     /** @return array<string, mixed> */
     public function getProductDetails(string $productCode, ?string $hotelCode = null): array
     {

src/Service/ContingentHotelDirectory.php

@@ -0,0 +1,124 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Service;
+
+use App\Entity\Groups\CalendarHotel;
+use App\Model\ContingentHotel;
+use App\Repository\Groups\AccommodationRepository;
+use App\Repository\Groups\CalendarHotelRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
+
+/**
+ * The hotel codes the contingent snapshot is kept for: every accommodation's calendarCode plus
+ * the calendar hotels of TYPO3's visible products.
+ *
+ * Neither source is maintained here. Accommodations are the Groups admin's, the TYPO3 list is
+ * TYPO3's; `calendar_hotel` only holds the last list TYPO3 answered with, so an unreachable
+ * TYPO3 does not make its hotels drop out of the sync.
+ */
+class ContingentHotelDirectory
+{
+    // Same rule as the hotelCode query parameter of the contingent API: a code nobody can ask
+    // for is not worth syncing, and it would not fit the column either.
+    private const string CODE_PATTERN = '/^[A-Za-z0-9_-]{1,16}$/';
+
+    public function __construct(
+        private readonly CmsDataProvider $cmsDataProvider,
+        private readonly AccommodationRepository $accommodationRepository,
+        private readonly CalendarHotelRepository $calendarHotelRepository,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly LoggerInterface $logger,
+    ) {
+    }
+
+    /**
+     * Replaces the stored TYPO3 list with the one TYPO3 serves now.
+     *
+     * An error or an empty list keeps the stored one: TYPO3 without a single calendar hotel is
+     * a fault on its side, not every winter hotel being withdrawn at once.
+     */
+    public function refresh(): bool
+    {
+        $fetched = [];
+
+        foreach ($this->cmsDataProvider->fetchCalendarHotels() ?? [] as $hotel) {
+            if (1 !== preg_match(self::CODE_PATTERN, $hotel->code)) {
+                $this->logger->warning('Ignoring TYPO3 calendar hotel with an unusable code', ['hotelCode' => $hotel->code]);
+
+                continue;
+            }
+
+            $fetched[$hotel->code] = $hotel;
+        }
+
+        if ([] === $fetched) {
+            $this->logger->warning('TYPO3 calendar hotels unavailable, keeping the stored list');
+
+            return false;
+        }
+
+        $stored = $this->calendarHotelRepository->findAllIndexedByCode();
+
+        foreach ($fetched as $code => $hotel) {
+            $calendarHotel = $stored[$code] ?? null;
+
+            if (null === $calendarHotel) {
+                $this->entityManager->persist((new CalendarHotel())->setCode($code)->setName($hotel->name));
+            } elseif ($calendarHotel->getName() !== $hotel->name) {
+                $calendarHotel->setName($hotel->name);
+            }
+        }
+
+        foreach (array_diff_key($stored, $fetched) as $calendarHotel) {
+            $this->entityManager->remove($calendarHotel);
+        }
+
+        $this->entityManager->flush();
+
+        return true;
+    }
+
+    /**
+     * @return array<string, ContingentHotel> keyed and sorted by hotel code
+     */
+    public function all(): array
+    {
+        $accommodations = [];
+
+        foreach ($this->accommodationRepository->findAllWithCalendarCode() as $accommodation) {
+            $accommodations[(string) $accommodation->getCalendarCode()] = $accommodation;
+        }
+
+        $calendarHotels = $this->calendarHotelRepository->findAllIndexedByCode();
+
+        $hotels = [];
+
+        foreach (array_keys($accommodations + $calendarHotels) as $code) {
+            $code = (string) $code;
+            $hotels[$code] = new ContingentHotel($code, $accommodations[$code] ?? null, $calendarHotels[$code] ?? null);
+        }
+
+        ksort($hotels, \SORT_STRING);
+
+        return $hotels;
+    }
+
+    public function find(string $hotelCode): ?ContingentHotel
+    {
+        if ('' === $hotelCode) {
+            return null;
+        }
+
+        $accommodation = $this->accommodationRepository->findOneByCalendarCode($hotelCode);
+        $calendarHotel = $this->calendarHotelRepository->findOneBy(['code' => $hotelCode]);
+
+        if (null === $accommodation && null === $calendarHotel) {
+            return null;
+        }
+
+        return new ContingentHotel($hotelCode, $accommodation, $calendarHotel);
+    }
+}

src/Service/ContingentSnapshotManager.php

@@ -6,7 +6,6 @@ namespace App\Service;
 
 use App\BpnConnect\ContingentsClient;
 use App\BpnConnect\Exception\BpnConnectException;
-use App\Entity\Groups\Accommodation;
 use App\Entity\Groups\ContingentDay;
 use App\Entity\Groups\ContingentSyncState;
 use App\Model\ContingentSyncResult;
@@ -34,24 +33,22 @@ class ContingentSnapshotManager
     }
 
     /**
-     * Refreshes [dateFrom, dateTo] for a single accommodation.
+     * Refreshes [dateFrom, dateTo] for a single hotel code.
      *
      * Days are fetched, diffed against what is stored and then persisted; the snapshot outside
      * the requested window is left untouched, so a narrow ad-hoc run cannot truncate what a
      * full-horizon run already stored.
      */
     public function sync(
-        Accommodation $accommodation,
+        string $hotelCode,
         \DateTimeImmutable $dateFrom,
         \DateTimeImmutable $dateTo,
     ): ContingentSyncResult {
-        $hotelCode = $accommodation->getCalendarCode();
-
-        if (null === $hotelCode || '' === $hotelCode) {
-            return ContingentSyncResult::failed('Accommodation has no calendarCode.');
+        if ('' === $hotelCode) {
+            return ContingentSyncResult::failed('No hotel code given.');
         }
 
-        $state = $this->syncStateRepository->findOneByAccommodation($accommodation) ?? new ContingentSyncState($accommodation);
+        $state = $this->syncStateRepository->findOneByHotelCode($hotelCode) ?? new ContingentSyncState($hotelCode);
 
         // Read before recordSuccess() moves it: days beyond the horizon the previous run reached
         // are the window growing, not the contingent situation changing.
@@ -67,7 +64,7 @@ class ContingentSnapshotManager
             return $this->recordFailure($state, $hotelCode, $e->getMessage());
         }
 
-        $existing = $this->dayRepository->findByAccommodationAndDateRange($accommodation, $dateFrom, $dateTo);
+        $existing = $this->dayRepository->findByHotelCodeAndDateRange($hotelCode, $dateFrom, $dateTo);
 
         // An empty upstream response would otherwise wipe the window and render the whole
         // period as BLOCKED. Treat it as an upstream problem and keep the last good snapshot.
@@ -103,7 +100,7 @@ class ContingentSnapshotManager
 
             if (null === $day) {
                 $day = (new ContingentDay())
-                    ->setAccommodation($accommodation)
+                    ->setHotelCode($hotelCode)
                     ->setDate($date);
 
                 $this->entityManager->persist($day);

src/Service/ContingentSnapshotReader.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Service;
 
 use App\BpnConnect\Model\ContingentStatus;
-use App\Entity\Groups\Accommodation;
+use App\Entity\Groups\ContingentSyncState;
 use App\Repository\Groups\ContingentDayRepository;
 use App\Repository\Groups\ContingentSyncStateRepository;
 use Carbon\CarbonImmutable;
@@ -46,17 +46,15 @@ class ContingentSnapshotReader
      * @return array<string, ContingentStatus>|null
      */
     public function statusesFor(
-        Accommodation $accommodation,
+        string $hotelCode,
         \DateTimeImmutable $dateFrom,
         ?\DateTimeImmutable $dateTo,
     ): ?array {
-        $hotelCode = $accommodation->getCalendarCode();
-
-        if (null === $hotelCode || '' === $hotelCode) {
+        if ('' === $hotelCode) {
             return null;
         }
 
-        if (!$this->isUsable($accommodation, $hotelCode)) {
+        if (!$this->isUsable($hotelCode)) {
             return null;
         }
 
@@ -69,25 +67,36 @@ class ContingentSnapshotReader
         return $statuses;
     }
 
-    private function isUsable(Accommodation $accommodation, string $hotelCode): bool
+    /**
+     * Whether a hotel with this sync state gets statuses from {@see self::statusesFor()}, without
+     * the logging: for overviews that ask about every hotel at once.
+     */
+    public function isCurrent(?ContingentSyncState $state): bool
     {
-        $syncedAt = $this->syncStateRepository->findOneByAccommodation($accommodation)?->getSyncedAt();
+        $syncedAt = $state?->getSyncedAt();
+
+        return null !== $syncedAt && $syncedAt >= CarbonImmutable::now()->modify(self::MAX_SNAPSHOT_AGE);
+    }
+
+    private function isUsable(string $hotelCode): bool
+    {
+        $state = $this->syncStateRepository->findOneByHotelCode($hotelCode);
+
+        if ($this->isCurrent($state)) {
+            return true;
+        }
+
+        $syncedAt = $state?->getSyncedAt();
 
         if (null === $syncedAt) {
             $this->logger->error('No contingent snapshot has been synced yet', ['hotelCode' => $hotelCode]);
-
-            return false;
-        }
-
-        if ($syncedAt < CarbonImmutable::now()->modify(self::MAX_SNAPSHOT_AGE)) {
+        } else {
             $this->logger->error('Contingent snapshot is stale', [
                 'hotelCode' => $hotelCode,
                 'syncedAt' => $syncedAt->format(\DateTimeInterface::ATOM),
             ]);
-
-            return false;
         }
 
-        return true;
+        return false;
     }
 }