feat: improved contingents api performance with db backed snapshots

This commit is contained in:
Björn Fromme
2026-08-20 11:46:03 +02:00
parent d5f9f4ef10
commit 351fbab498
20 changed files with 1521 additions and 109 deletions
@@ -4,22 +4,19 @@ declare(strict_types=1);
namespace App\Tests\Controller\Groups\Booking;
use App\BpnConnect\ContingentsClient;
use App\BpnConnect\Model\ContingentCalendarEntry;
use App\BpnConnect\Model\ContingentCalendarMeta;
use App\BpnConnect\Model\ContingentCalendarResponse;
use App\BpnConnect\Model\ContingentStatus;
use App\Controller\Groups\Booking\Step1Controller;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationPrice;
use App\Repository\Groups\AccommodationPriceRepository;
use App\Service\AccommodationBookingService;
use App\Service\AccommodationPriceCoverage;
use App\Service\AccommodationSessionManager;
use App\Service\CalendarGridBuilder;
use App\Service\ContingentSnapshotReader;
use App\Service\GroupsPriceCalculator;
use App\Service\PriceTimelineBuilder;
use PHPUnit\Framework\TestCase;
use Symfony\Contracts\Cache\CacheInterface;
class Step1CalendarDataTest extends TestCase
{
@@ -32,7 +29,7 @@ class Step1CalendarDataTest extends TestCase
$price->setMinNights(2);
$enriched = $this->buildEnrichedDayData(
$this->calendarResponse([
[
'2026-06-01' => ContingentStatus::Ok,
'2026-06-02' => ContingentStatus::Ok,
'2026-06-03' => ContingentStatus::Ok,
@@ -40,7 +37,7 @@ class Step1CalendarDataTest extends TestCase
'2026-06-05' => ContingentStatus::Ok,
'2026-06-06' => ContingentStatus::Ok,
'2026-06-07' => ContingentStatus::Ok,
]),
],
[$price],
'2026-06-01',
'2026-06-07',
@@ -68,11 +65,11 @@ class Step1CalendarDataTest extends TestCase
$price->setMinNights(1);
$enriched = $this->buildEnrichedDayData(
$this->calendarResponse([
[
'2026-06-01' => ContingentStatus::Ok,
'2026-06-02' => ContingentStatus::Blocked,
'2026-06-03' => ContingentStatus::Ok,
]),
],
[$price],
'2026-06-01',
'2026-06-03',
@@ -83,7 +80,7 @@ class Step1CalendarDataTest extends TestCase
self::assertSame('blocked-to-ok', $enriched['2026-06-03']['status']);
}
public function testPriceCoverageStillAppliesWhenContingentApiIsUnavailable(): void
public function testPriceCoverageStillAppliesWhenThereIsNoUsableSnapshot(): void
{
$price = new AccommodationPrice();
$price->setDateFrom(new \DateTimeImmutable('2026-06-01'));
@@ -98,38 +95,19 @@ class Step1CalendarDataTest extends TestCase
}
/**
* @param array<string, ContingentStatus> $statuses
*/
private function calendarResponse(array $statuses): ContingentCalendarResponse
{
$entries = [];
foreach ($statuses as $date => $status) {
$entries[] = new ContingentCalendarEntry(date: $date, status: $status);
}
return new ContingentCalendarResponse(
new ContingentCalendarMeta('', '', 'days', 'HOTEL', 1, count($entries)),
$entries,
);
}
/**
* @param AccommodationPrice[] $prices
* @param array<string, ContingentStatus>|null $statuses null = no usable snapshot
* @param AccommodationPrice[] $prices
*
* @return array<string, array{status: string, minNights: int}>
*/
private function buildEnrichedDayData(
?ContingentCalendarResponse $calendar,
?array $statuses,
array $prices,
string $dateFrom,
string $dateTo,
): array {
$cache = $this->createMock(CacheInterface::class);
if (null === $calendar) {
$cache->method('get')->willThrowException(new \App\BpnConnect\Exception\BpnConnectException('down'));
} else {
$cache->method('get')->willReturn($calendar);
}
$snapshotReader = $this->createMock(ContingentSnapshotReader::class);
$snapshotReader->method('statusesFor')->willReturn($statuses);
$priceRepository = $this->createMock(AccommodationPriceRepository::class);
$priceRepository->method('findByHotelCodeAndDateRange')->willReturn($prices);
@@ -137,10 +115,9 @@ class Step1CalendarDataTest extends TestCase
$controller = new Step1Controller(
$this->createMock(AccommodationBookingService::class),
$this->createMock(AccommodationSessionManager::class),
$this->createMock(ContingentsClient::class),
$priceRepository,
new PriceTimelineBuilder(),
$cache,
$snapshotReader,
$this->createMock(CalendarGridBuilder::class),
$this->createMock(GroupsPriceCalculator::class),
new AccommodationPriceCoverage($priceRepository),
@@ -150,11 +127,10 @@ class Step1CalendarDataTest extends TestCase
return $method->invoke(
$controller,
(new Accommodation())->setCalendarCode('HOTEL'),
'HOTEL',
new \DateTimeImmutable($dateFrom),
new \DateTimeImmutable($dateTo),
$dateFrom,
$dateTo,
);
}
}