wip: integrate with bpn-connect for admin crud, calendars

This commit is contained in:
Björn Fromme committed 2026-07-16 09:03:42 +02:00
1 parent 90b0726f0d
commit f0b68b2cc4
12 files changed
+481 -35

No files matched your search

@@ -29,7 +29,7 @@ class AccommodationController extends AbstractController
#[Route('/admin/accommodation', name: 'app_admin_accommodation')]
public function index(): Response
{
$accommodations = $this->accommodationRepository->findAll();
$accommodations = $this->accommodationRepository->findBy([], ['code' => 'ASC']);
return $this->render('admin/accommodation/index.html.twig', [
'accommodations' => $accommodations,
@@ -41,7 +41,7 @@ class AccommodationController extends AbstractController
{
$accommodation = new Accommodation();
$form = $this->createForm(AccommodationType::class, $accommodation);
$form = $this->createForm(AccommodationType::class, $accommodation, ['hx_post' => $request->getRequestUri()]);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@@ -55,10 +55,11 @@ class AccommodationController extends AbstractController
'code' => $accommodation->getCode(),
]);
return $this->redirectToRoute('app_admin_accommodation');
return new HxRedirectResponse($this->generateUrl('app_admin_accommodation'));
}
return $this->render('admin/accommodation/create.html.twig', [
return $this->render('admin/accommodation/modal_create.html.twig', [
'accommodation' => $accommodation,
'form' => $form,
]);
}
@@ -97,6 +98,15 @@ class AccommodationController extends AbstractController
]);
}
#[Route('/admin/accommodation/{id}/calendar', name: 'app_admin_accommodation_calendar', methods: ['GET'])]
public function calendar(Accommodation $accommodation, Request $request): Response
{
return $this->render('admin/accommodation/_calendar_section.html.twig', [
'accommodation' => $accommodation,
'startMonth' => $request->query->get('month'),
]);
}
#[Route('/admin/accommodation/{id}/delete', name: 'app_admin_accommodation_delete')]
public function delete(Accommodation $accommodation, Request $request): Response
{
-21
View File
@@ -200,25 +200,4 @@ class AccommodationPrice implements BlameableEntityInterface, TimestampableEntit
return $this;
}
#[Assert\Callback]
public function assertDatesValid(ExecutionContextInterface $context): void
{
// we only check new entities
if (null !== $this->getId()) {
return;
}
// come on, we need something to work with
if (null === $this->getDateFrom() || null === $this->getDateTo()) {
return;
}
if ($this->getDateFrom() < new \DateTimeImmutable()) {
$context
->buildViolation('Das Von-Datum darf nicht in der Vergangenheit liegen')
->atPath('dateFrom')
->addViolation();
}
}
}
@@ -0,0 +1,39 @@
<?php
namespace App\Form\Extension;
use Symfony\Component\Form\AbstractTypeExtension;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolver;
class ModalSubmitExtension extends AbstractTypeExtension
{
public function configureOptions(OptionsResolver $resolver): void
{
$resolver->setDefaults([
'hx_post' => null,
'hx_target' => '#htmx-modal',
'hx_swap' => 'outerHTML',
]);
}
public function buildView(FormView $view, FormInterface $form, array $options): void
{
if (null !== $options['hx_post']) {
$attr = [
'hx-post' => $options['hx_post'],
'hx-target' => $options['hx_target'],
'hx-swap' => $options['hx_swap'],
'hx-indicator' => '#htmx-modal-indicator',
];
$view->vars['attr'] = array_merge($view->vars['attr'], $attr);
}
}
public static function getExtendedTypes(): iterable
{
return [FormType::class];
}
}
+289
View File
@@ -0,0 +1,289 @@
<?php
declare(strict_types=1);
namespace App\Twig\Components;
use App\BpnConnect\ContingentsClient;
use App\BpnConnect\Exception\BpnConnectException;
use App\BpnConnect\Model\ContingentStatus;
use App\Entity\Groups\Accommodation;
use Carbon\CarbonImmutable;
use Psr\Cache\InvalidArgumentException;
use Symfony\UX\TwigComponent\Attribute\AsTwigComponent;
use Symfony\Contracts\Cache\CacheInterface;
use Symfony\Contracts\Cache\ItemInterface;
#[AsTwigComponent('calendar', template: 'components/calendar/index.html.twig')]
class Calendar
{
private const MONTHS = [
1 => 'Januar', 2 => 'Februar', 3 => 'März', 4 => 'April',
5 => 'Mai', 6 => 'Juni', 7 => 'Juli', 8 => 'August',
9 => 'September', 10 => 'Oktober', 11 => 'November', 12 => 'Dezember',
];
private const TYPE_LABELS = [
'flat' => 'pauschal',
'per_person' => 'p.P.',
'per_night' => 'p.Nacht',
'per_person_per_night' => 'p.P./Nacht',
];
public Accommodation $accommodation;
public ?string $startMonth = null;
public array $months = [];
public string $prevMonth = '';
public string $nextMonth = '';
public string $prevLabel = '';
public string $nextLabel = '';
public function __construct(
private readonly ContingentsClient $contingentsClient,
private readonly CacheInterface $cache,
) {
}
public function mount(Accommodation $accommodation, ?string $startMonth = null): void
{
$this->accommodation = $accommodation;
$this->startMonth = $startMonth;
if ($startMonth !== null && preg_match('/^\d{4}-\d{2}$/', $startMonth)) {
$start = CarbonImmutable::createFromFormat('Y-m-d', $startMonth . '-01');
} else {
$allDates = $this->collectAllDates();
$start = empty($allDates)
? CarbonImmutable::now()->startOfMonth()
: $this->determineStartMonth($allDates);
}
$map = $this->buildCoverageMap();
$blockedDates = $this->fetchBlockedDates(
$accommodation->getCode() ?? '',
$start->format('Y-m-d'),
$start->addMonths(3)->subDay()->format('Y-m-d'),
);
$months = [];
$current = $start;
for ($i = 0; $i < 3; $i++) {
$months[] = $this->buildMonth($current, $map, $blockedDates);
$current = $current->addMonth();
}
$this->months = $months;
$prevStart = $start->subMonths(3);
$prevEnd = $prevStart->addMonths(2);
$this->prevMonth = $prevStart->format('Y-m');
$this->prevLabel = self::MONTHS[$prevStart->month] . ' – ' . self::MONTHS[$prevEnd->month] . ' ' . $prevEnd->year;
$nextStart = $start->addMonths(3);
$nextEnd = $nextStart->addMonths(2);
$this->nextMonth = $nextStart->format('Y-m');
$this->nextLabel = self::MONTHS[$nextStart->month] . ' – ' . self::MONTHS[$nextEnd->month] . ' ' . $nextEnd->year;
}
/**
* @return array<string, true> keyed by Y-m-d, only BLOCKED dates present
*/
private function fetchBlockedDates(string $hotelCode, string $dateFrom, string $dateTo): array
{
if ($hotelCode === '') {
return [];
}
try {
$cacheKey = sprintf('contingents_calendar_%s_%s_%s', $hotelCode, $dateFrom, $dateTo);
$response = $this->cache->get(
$cacheKey,
function (ItemInterface $item) use ($hotelCode, $dateFrom, $dateTo) {
$item->expiresAfter(3600);
return $this->contingentsClient->getContingentCalendar($hotelCode, $dateFrom, $dateTo);
},
);
} catch (BpnConnectException|InvalidArgumentException) {
return [];
}
$blocked = [];
foreach ($response->data as $entry) {
if ($entry->status === ContingentStatus::Blocked) {
$blocked[(new \DateTimeImmutable($entry->date))->format('Y-m-d')] = true;
}
}
return $blocked;
}
private function collectAllDates(): array
{
$dates = [];
foreach ($this->accommodation->getAccommodationPrices() as $price) {
if ($price->getDateFrom() !== null) {
$dates[] = CarbonImmutable::instance($price->getDateFrom());
}
if ($price->getDateTo() !== null) {
$dates[] = CarbonImmutable::instance($price->getDateTo());
}
}
foreach ($this->accommodation->getBoardServices() as $service) {
if ($service->getDateFrom() !== null) {
$dates[] = CarbonImmutable::instance($service->getDateFrom());
}
if ($service->getDateTo() !== null) {
$dates[] = CarbonImmutable::instance($service->getDateTo());
}
}
foreach ($this->accommodation->getAdditionalServices() as $service) {
if ($service->getDateFrom() !== null) {
$dates[] = CarbonImmutable::instance($service->getDateFrom());
}
if ($service->getDateTo() !== null) {
$dates[] = CarbonImmutable::instance($service->getDateTo());
}
}
return $dates;
}
private function determineStartMonth(array $dates): CarbonImmutable
{
$earliest = min($dates);
$cutoff = CarbonImmutable::now()->subDays(60);
if ($earliest >= $cutoff) {
return $earliest->startOfMonth();
}
return CarbonImmutable::now()->startOfMonth();
}
private function buildCoverageMap(): array
{
$map = [];
foreach ($this->accommodation->getAccommodationPrices() as $price) {
if ($price->getDateFrom() === null || $price->getDateTo() === null) {
continue;
}
$priceFormatted = number_format($price->getEffectivePricePerNight() / 100, 2, ',', '.') . ' €';
$label = sprintf('Preis: %s/Nacht (min. %d Nächte)', $priceFormatted, $price->getMinNights());
$day = CarbonImmutable::instance($price->getDateFrom());
$end = CarbonImmutable::instance($price->getDateTo());
$span = $day->diffInDays($end);
$limit = $day->addYears(3);
while ($day <= $end && $day <= $limit) {
$key = $day->format('Y-m-d');
$map[$key] ??= ['price' => null, 'board' => null, 'additional' => null];
if ($map[$key]['price'] === null || $span < $map[$key]['price']['span']) {
$map[$key]['price'] = ['label' => $label, 'span' => $span];
}
$day = $day->addDay();
}
}
foreach ($this->accommodation->getBoardServices() as $service) {
if ($service->getDateFrom() === null || $service->getDateTo() === null) {
continue;
}
$label = 'Verpflegung: ' . $service->getLabel();
$day = CarbonImmutable::instance($service->getDateFrom());
$end = CarbonImmutable::instance($service->getDateTo());
$span = $day->diffInDays($end);
$limit = $day->addYears(3);
while ($day <= $end && $day <= $limit) {
$key = $day->format('Y-m-d');
$map[$key] ??= ['price' => null, 'board' => null, 'additional' => null];
if ($map[$key]['board'] === null || $span < $map[$key]['board']['span']) {
$map[$key]['board'] = ['label' => $label, 'span' => $span];
}
$day = $day->addDay();
}
}
foreach ($this->accommodation->getAdditionalServices() as $service) {
if ($service->getDateFrom() === null || $service->getDateTo() === null) {
continue;
}
$typeLabel = $service->getType() !== null
? (self::TYPE_LABELS[$service->getType()->value] ?? $service->getType()->value)
: '';
$label = sprintf('Zusatz: %s%s', $service->getLabel(), $typeLabel !== '' ? ' (' . $typeLabel . ')' : '');
$day = CarbonImmutable::instance($service->getDateFrom());
$end = CarbonImmutable::instance($service->getDateTo());
$span = $day->diffInDays($end);
$limit = $day->addYears(3);
while ($day <= $end && $day <= $limit) {
$key = $day->format('Y-m-d');
$map[$key] ??= ['price' => null, 'board' => null, 'additional' => null];
if ($map[$key]['additional'] === null || $span < $map[$key]['additional']['span']) {
$map[$key]['additional'] = ['label' => $label, 'span' => $span];
}
$day = $day->addDay();
}
}
return $map;
}
private function buildMonth(CarbonImmutable $month, array $map, array $blockedDates): array
{
$start = $month->startOfMonth();
$today = CarbonImmutable::now()->format('Y-m-d');
// Mon=0 … Sun=6 (Carbon: 0=Sunday, 1=Monday … 6=Saturday)
$firstDow = ($start->dayOfWeek + 6) % 7;
$days = [];
for ($d = 1; $d <= $start->daysInMonth; $d++) {
$dateStr = $month->format('Y-m') . '-' . str_pad((string) $d, 2, '0', STR_PAD_LEFT);
$coverage = $map[$dateStr] ?? [];
$parts = [];
if (isset($coverage['price'])) {
$parts[] = $coverage['price']['label'];
}
if (isset($coverage['board'])) {
$parts[] = $coverage['board']['label'];
}
if (isset($coverage['additional'])) {
$parts[] = $coverage['additional']['label'];
}
$isBlocked = isset($blockedDates[$dateStr]);
if ($isBlocked) {
$parts[] = 'Buchungsstopp';
}
$days[$d] = [
'date' => $dateStr,
'hasPrice' => isset($coverage['price']),
'hasBoard' => isset($coverage['board']),
'hasAdditional' => isset($coverage['additional']),
'isBlocked' => $isBlocked,
'tooltip' => !empty($parts) ? implode(' | ', $parts) : null,
'isToday' => $dateStr === $today,
];
}
return [
'label' => self::MONTHS[$month->month] . ' ' . $month->year,
'firstDow' => $firstDow,
'days' => $days,
];
}
}