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

feat: refactored accommodation booking status model

Browse Source
This commit is contained in:
Björn Fromme
2026-08-19 11:46:52 +02:00
parent e8accbb3ed
commit 5a3957e143
42 changed files with 1190 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Controller/Admin/AccommodationBooking/ConfirmControllerTest.php
+1
View File
@@ -83,6 +83,7 @@ class ConfirmControllerTest extends TestCase
public static function nonReceivedStatuses(): iterable
{
yield 'draft' => [AccommodationBookingStatus::Draft];
yield 'requested' => [AccommodationBookingStatus::Requested];
yield 'open' => [AccommodationBookingStatus::Open];
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
tests/Controller/Admin/AccommodationBooking/DiscardControllerTest.php
+158
View File
@@ -0,0 +1,158 @@
<?php
declare(strict_types=1);
namespace App\Tests\Controller\Admin\AccommodationBooking;
use App\Controller\Admin\AccommodationBooking\DiscardController;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Service\AccommodationBookingService;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
/**
* Covers the guards around discarding — the transition itself is tested in
* AccommodationBookingServiceTest.
*/
class DiscardControllerTest extends TestCase
{
public function testGetRendersTheConfirmationModal(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('discardBooking');
$controller = new TestableDiscardController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($this->openBooking(), Request::create('/admin/accommodation-booking/1/discard'));
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('admin/accommodation_booking/modal_discard.html.twig', $controller->renderedView);
}
/**
* @dataProvider discardableStatuses
*/
public function testPostDiscardsTheBookingAndRedirectsTheBrowser(AccommodationBookingStatus $status): void
{
$booking = $this->openBooking();
$booking->setStatus($status);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('discardBooking')->with($booking);
$controller = new TestableDiscardController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/discard', 'POST'));
self::assertTrue($response->headers->has('HX-Redirect'));
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function discardableStatuses(): iterable
{
yield 'draft' => [AccommodationBookingStatus::Draft];
yield 'requested' => [AccommodationBookingStatus::Requested];
yield 'open' => [AccommodationBookingStatus::Open];
yield 'received' => [AccommodationBookingStatus::Received];
}
/**
* @dataProvider closedStatuses
*/
public function testAClosedBookingCannotBeDiscarded(AccommodationBookingStatus $status): void
{
// A released confirmation is binding, and an Absage is already the end of the line.
$booking = $this->openBooking();
$booking->setStatus($status);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('discardBooking');
$controller = new TestableDiscardController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/discard', 'POST'));
self::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function closedStatuses(): iterable
{
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
}
public function testPostWithAnInvalidTokenIsDenied(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('discardBooking');
$controller = new TestableDiscardController($bookingService, $this->createMock(LoggerInterface::class), tokenValid: false);
$this->expectException(AccessDeniedException::class);
$controller->index($this->openBooking(), Request::create('/admin/accommodation-booking/1/discard', 'POST'));
}
private function openBooking(): AccommodationBooking
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setGroupName('Schulklasse 7b');
$booking->setEmail('[email protected]');
return $booking;
}
}
final class TestableDiscardController extends DiscardController
{
public ?string $renderedView = null;
/** @var list<array{type: string, message: mixed}> */
public array $flashes = [];
public function __construct(
AccommodationBookingService $bookingService,
LoggerInterface $logger,
private readonly bool $tokenValid = true,
) {
parent::__construct($bookingService, $logger);
}
protected function isCsrfTokenValid(string $id, #[\SensitiveParameter] ?string $token): bool
{
return $this->tokenValid;
}
/**
* @param array<string, mixed> $parameters
*/
protected function render(string $view, array $parameters = [], ?Response $response = null): Response
{
$this->renderedView = $view;
return new Response();
}
protected function addFlash(string $type, mixed $message): void
{
$this->flashes[] = ['type' => $type, 'message' => $message];
}
/**
* @param array<string, mixed> $parameters
*/
protected function generateUrl(string $route, array $parameters = [], int $referenceType = 1): string
{
return '/'.$route.'?'.http_build_query($parameters);
}
}
tests/Controller/Admin/AccommodationBooking/EditControllerTest.php
+29 -61
View File
@@ -6,8 +6,8 @@ namespace App\Tests\Controller\Admin\AccommodationBooking;
use App\Controller\Admin\AccommodationBooking\EditController;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Entity\User;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Repository\Groups\AdditionalServiceRepository;
use App\Repository\Groups\BoardServiceRepository;
use App\Repository\UserRepository;
@@ -20,79 +20,47 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
/**
* Covers the status transition side effects only — the service and form behaviour
* they build on is tested in AccommodationBookingServiceTest.
* Covers what editing must NOT do — it never moves the booking on and never mails the
* customer — plus the Betreuer choices. The transitions themselves belong to the named
* actions and are tested in AccommodationBookingServiceTest and the action controllers.
*/
class EditControllerTest extends TestCase
{
public function testTransitionToOpenIssuesAccessLinkAndSendsCustomerEmail(): void
{
$bookingService = $this->assertNotified(AccommodationBookingStatus::Open);
$this->submitStatusChange(AccommodationBookingStatus::Draft, AccommodationBookingStatus::Open, $bookingService);
}
public function testTransitionToConfirmedSendsNothing(): void
{
// The binding confirmation only ever goes out through the explicit confirm action,
// never as a side effect of editing the status.
$bookingService = $this->assertNotNotified();
$this->submitStatusChange(AccommodationBookingStatus::Received, AccommodationBookingStatus::Confirmed, $bookingService);
}
public function testTransitionToDiscardedSendsNothing(): void
{
$bookingService = $this->assertNotNotified();
$this->submitStatusChange(AccommodationBookingStatus::Open, AccommodationBookingStatus::Discarded, $bookingService);
}
public function testSavingWithoutStatusChangeSendsNothing(): void
{
$bookingService = $this->assertNotNotified();
$this->submitStatusChange(AccommodationBookingStatus::Confirmed, AccommodationBookingStatus::Confirmed, $bookingService);
}
private function assertNotified(AccommodationBookingStatus $expected): AccommodationBookingService
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('refreshPriceSnapshot');
$bookingService
->expects(self::once())
->method('issueAccessLink')
->with(self::callback(static fn (AccommodationBooking $booking) => $expected === $booking->getStatus()));
$bookingService->expects(self::once())->method('sendCustomerConfirmationEmail');
return $bookingService;
}
private function assertNotNotified(): AccommodationBookingService
/**
* @dataProvider everyStatus
*/
public function testSavingNeverNotifiesTheCustomer(AccommodationBookingStatus $status): void
{
// Sending used to be a side effect of saving a status change, which is how an inquiry
// that arrived already Offen could never be offered at all. Editing is now inert.
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('refreshPriceSnapshot');
$bookingService->expects(self::never())->method('issueAccessLink');
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendOffer');
return $bookingService;
$booking = new AccommodationBooking();
$booking->setStatus($status);
$this->submitEdit($booking, $bookingService);
self::assertSame($status, $booking->getStatus(), 'editing leaves the status where it was');
}
private function submitStatusChange(
AccommodationBookingStatus $from,
AccommodationBookingStatus $to,
AccommodationBookingService $bookingService,
): void {
$booking = new AccommodationBooking();
$booking->setStatus($from);
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function everyStatus(): iterable
{
foreach (AccommodationBookingStatus::cases() as $status) {
yield $status->value => [$status];
}
}
// The form is what moves the entity to its new status during handleRequest().
private function submitEdit(AccommodationBooking $booking, AccommodationBookingService $bookingService): void
{
$form = $this->createMock(FormInterface::class);
$form->method('handleRequest')->willReturnCallback(static function () use ($booking, $to, $form) {
$booking->setStatus($to);
return $form;
});
$form->method('handleRequest')->willReturn($form);
$form->method('isSubmitted')->willReturn(true);
$form->method('isValid')->willReturn(true);
$form->method('has')->willReturn(false);
tests/Controller/Admin/AccommodationBooking/SendOfferControllerTest.php
+177
View File
@@ -0,0 +1,177 @@
<?php
declare(strict_types=1);
namespace App\Tests\Controller\Admin\AccommodationBooking;
use App\Controller\Admin\AccommodationBooking\SendOfferController;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Service\AccommodationBookingService;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
/**
* Covers the guards around sending an offer — the sending itself is tested in
* AccommodationBookingServiceTest.
*/
class SendOfferControllerTest extends TestCase
{
public function testGetRendersTheConfirmationModal(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendOffer');
$controller = new TestableSendOfferController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($this->requestedBooking(), Request::create('/admin/accommodation-booking/1/send-offer'));
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('admin/accommodation_booking/modal_send_offer.html.twig', $controller->renderedView);
}
/**
* @dataProvider statusesAwaitingAnOffer
*/
public function testPostSendsTheOfferAndRedirectsTheBrowser(AccommodationBookingStatus $status): void
{
$booking = $this->requestedBooking();
$booking->setStatus($status);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('sendOffer')->with($booking);
$controller = new TestableSendOfferController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/send-offer', 'POST'));
self::assertTrue($response->headers->has('HX-Redirect'));
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesAwaitingAnOffer(): iterable
{
// The admin-authored offer and the customer's inquiry converge on the same action.
yield 'draft' => [AccommodationBookingStatus::Draft];
yield 'requested' => [AccommodationBookingStatus::Requested];
}
/**
* @dataProvider statusesPastTheOffer
*/
public function testABookingThatIsNotAwaitingAnOfferGetsNone(AccommodationBookingStatus $status): void
{
$booking = $this->requestedBooking();
$booking->setStatus($status);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendOffer');
$controller = new TestableSendOfferController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/send-offer', 'POST'));
self::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesPastTheOffer(): iterable
{
yield 'open' => [AccommodationBookingStatus::Open];
yield 'received' => [AccommodationBookingStatus::Received];
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
}
public function testPostWithAnInvalidTokenIsDenied(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendOffer');
$controller = new TestableSendOfferController($bookingService, $this->createMock(LoggerInterface::class), tokenValid: false);
$this->expectException(AccessDeniedException::class);
$controller->index($this->requestedBooking(), Request::create('/admin/accommodation-booking/1/send-offer', 'POST'));
}
public function testABookingWithoutAnEmailAddressGetsNoOffer(): void
{
// The offer only exists for the customer as the mail carrying its link, so sending
// it nowhere would leave the booking waiting in Offen for an acceptance that cannot
// come — the dead end this whole flow is meant to remove.
$booking = $this->requestedBooking();
$booking->setEmail(null);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendOffer');
$controller = new TestableSendOfferController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/send-offer', 'POST'));
self::assertSame(['error'], array_column($controller->flashes, 'type'));
self::assertStringContainsString('app_admin_accommodationbooking_edit', (string) $response->headers->get('HX-Redirect'));
}
private function requestedBooking(): AccommodationBooking
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Requested);
$booking->setGroupName('Schulklasse 7b');
$booking->setEmail('[email protected]');
return $booking;
}
}
final class TestableSendOfferController extends SendOfferController
{
public ?string $renderedView = null;
/** @var list<array{type: string, message: mixed}> */
public array $flashes = [];
public function __construct(
AccommodationBookingService $bookingService,
LoggerInterface $logger,
private readonly bool $tokenValid = true,
) {
parent::__construct($bookingService, $logger);
}
protected function isCsrfTokenValid(string $id, #[\SensitiveParameter] ?string $token): bool
{
return $this->tokenValid;
}
/**
* @param array<string, mixed> $parameters
*/
protected function render(string $view, array $parameters = [], ?Response $response = null): Response
{
$this->renderedView = $view;
return new Response();
}
protected function addFlash(string $type, mixed $message): void
{
$this->flashes[] = ['type' => $type, 'message' => $message];
}
/**
* @param array<string, mixed> $parameters
*/
protected function generateUrl(string $route, array $parameters = [], int $referenceType = 1): string
{
return '/'.$route.'?'.http_build_query($parameters);
}
}
tests/Controller/Api/AccommodationBookingControllerTest.php
+7 -7
View File
@@ -7,8 +7,8 @@ namespace App\Tests\Controller\Api;
use App\Controller\Api\AccommodationBookingController;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingOrigin;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Enum\Groups\AccommodationBookingType;
use App\Repository\Groups\AccommodationBookingRepository;
use App\Service\AccommodationBookingBreakdownCalculator;
use App\Service\AccommodationBookingService;
@@ -57,7 +57,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setBoardServiceDiscount(20);
$booking->setAdditionalServicesDiscount(30);
$booking->setStatus(AccommodationBookingStatus::Confirmed);
$booking->setType(AccommodationBookingType::Booking);
$booking->setOrigin(AccommodationBookingOrigin::Direct);
$booking->setAcceptedAt(new \DateTimeImmutable('2026-07-15T10:00:00+00:00'));
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
@@ -88,7 +88,7 @@ class AccommodationBookingControllerTest extends TestCase
self::assertSame([
'uuid' => $booking->getUuid(),
'status' => 'confirmed',
'type' => 'booking',
'type' => 'direct',
'dateFrom' => '2026-07-20',
'dateTo' => '2026-07-25',
'nights' => 5,
@@ -139,7 +139,7 @@ class AccommodationBookingControllerTest extends TestCase
self::assertArrayNotHasKey('currency', $payload['accommodation']);
}
public function testSingleReturnsOpenStatusAndInquiryTypeForAnOffer(): void
public function testSingleReturnsOpenStatusAndOfferOriginForAnOffer(): void
{
$booking = new AccommodationBooking();
$booking->setDateFrom(new \DateTimeImmutable('2026-08-01'));
@@ -149,7 +149,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setLastName('Beispiel');
$booking->setEmail('[email protected]');
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setType(AccommodationBookingType::Inquiry);
$booking->setOrigin(AccommodationBookingOrigin::Offer);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository
@@ -166,7 +166,7 @@ class AccommodationBookingControllerTest extends TestCase
$payload = json_decode((string) $response->getContent(), true, 512, JSON_THROW_ON_ERROR);
self::assertSame('open', $payload['status']);
self::assertSame('inquiry', $payload['type']);
self::assertSame('offer', $payload['type']);
self::assertNull($payload['priceBreakdown']);
self::assertNull($payload['acceptedAt']);
}
@@ -230,7 +230,7 @@ class AccommodationBookingControllerTest extends TestCase
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('received', $payload['status']);
self::assertSame('inquiry', $payload['type']);
self::assertSame('offer', $payload['type']);
self::assertSame(AccommodationBookingStatus::Received, $booking->getStatus());
self::assertNotNull($booking->getAcceptedAt());
self::assertSame($booking->getAcceptedAt()->format(\DATE_ATOM), $payload['acceptedAt']);
tests/Controller/Groups/OfferControllerTest.php
+17 -2
View File
@@ -94,10 +94,13 @@ class OfferControllerTest extends TestCase
self::assertSame('groups/booking/offer_unavailable.html.twig', $controller->renderedView);
}
public function testAccessRendersUnavailableForDraft(): void
/**
* @dataProvider statusesTheCustomerMustNotSee
*/
public function testAccessRendersUnavailableForABookingThatIsNotOfferedYet(AccommodationBookingStatus $status): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Draft);
$booking->setStatus($status);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
@@ -119,6 +122,18 @@ class OfferControllerTest extends TestCase
self::assertSame('groups/booking/offer_unavailable.html.twig', $controller->renderedView);
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesTheCustomerMustNotSee(): iterable
{
// A scratch record and an inquiry the office has not worked through yet are both
// unfinished; a discarded one is over. All three behave like an expired link.
yield 'draft' => [AccommodationBookingStatus::Draft];
yield 'requested' => [AccommodationBookingStatus::Requested];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
}
public function testViewRendersUnavailableForDiscardedBooking(): void
{
$booking = new AccommodationBooking();
tests/Controller/Groups/Step4ControllerTest.php
+3 -3
View File
@@ -7,7 +7,7 @@ namespace App\Tests\Controller\Groups;
use App\Controller\Groups\Step4Controller;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingType;
use App\Enum\Groups\AccommodationBookingOrigin;
use App\Form\Model\AccommodationBookingDto;
use App\Service\AccommodationBookingService;
use App\Service\AccommodationSessionManager;
@@ -102,7 +102,7 @@ class Step4ControllerTest extends TestCase
->setCalendarCode('HOTEL')
->setMaxAdolescentAge(17);
$booking = (new AccommodationBooking())->setType(AccommodationBookingType::Inquiry);
$booking = (new AccommodationBooking())->setOrigin(AccommodationBookingOrigin::Offer);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->method('loadAccommodation')->with(1)->willReturn($accommodation);
@@ -275,7 +275,7 @@ class Step4ControllerTest extends TestCase
->setCalendarCode('HOTEL')
->setMaxAdolescentAge(17);
$booking = (new AccommodationBooking())->setType(AccommodationBookingType::Booking);
$booking = (new AccommodationBooking())->setOrigin(AccommodationBookingOrigin::Direct);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->method('loadAccommodation')->with(1)->willReturn($accommodation);
tests/Entity/Groups/AccommodationBookingTest.php
+88
View File
@@ -0,0 +1,88 @@
<?php
declare(strict_types=1);
namespace App\Tests\Entity\Groups;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingOrigin;
use App\Enum\Groups\AccommodationBookingStatus;
use PHPUnit\Framework\TestCase;
class AccommodationBookingTest extends TestCase
{
/**
* The label is what the backoffice prints next to the status, so it must never
* contradict it — "Angebot · Bestätigt" is the shape of mistake this replaces.
*
* @dataProvider statusesBeforeTheCustomerCommits
*/
public function testARecordIsCalledAnOfferUntilTheCustomerCommits(AccommodationBookingStatus $status): void
{
$booking = new AccommodationBooking();
$booking->setStatus($status);
self::assertNull($booking->getAcceptedAt());
self::assertSame('Angebot', $booking->recordLabel());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesBeforeTheCustomerCommits(): iterable
{
yield 'draft' => [AccommodationBookingStatus::Draft];
yield 'requested' => [AccommodationBookingStatus::Requested];
yield 'open' => [AccommodationBookingStatus::Open];
}
/**
* @dataProvider statusesAfterTheCustomerCommits
*/
public function testARecordIsCalledABookingOnceTheCustomerHasCommitted(AccommodationBookingStatus $status): void
{
$booking = new AccommodationBooking();
$booking->setStatus($status);
$booking->setAcceptedAt(new \DateTimeImmutable());
self::assertSame('Buchung', $booking->recordLabel());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesAfterTheCustomerCommits(): iterable
{
yield 'received' => [AccommodationBookingStatus::Received];
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
}
public function testADiscardedRecordKeepsWhicheverItHadBecome(): void
{
// An Absage can close either an offer nobody accepted or a booking that fell
// through, so the label follows the commitment rather than the status.
$unaccepted = new AccommodationBooking();
$unaccepted->setStatus(AccommodationBookingStatus::Discarded);
$accepted = new AccommodationBooking();
$accepted->setStatus(AccommodationBookingStatus::Discarded);
$accepted->setAcceptedAt(new \DateTimeImmutable());
self::assertSame('Angebot', $unaccepted->recordLabel());
self::assertSame('Buchung', $accepted->recordLabel());
}
public function testTheLabelIsIndependentOfWhereTheBookingCameFrom(): void
{
// Origin answers "how did this come about" and is deliberately not the same
// question — a confirmed booking that started as an offer is still a Buchung.
foreach (AccommodationBookingOrigin::cases() as $origin) {
$booking = new AccommodationBooking();
$booking->setOrigin($origin);
$booking->setStatus(AccommodationBookingStatus::Confirmed);
$booking->setAcceptedAt(new \DateTimeImmutable());
self::assertSame('Buchung', $booking->recordLabel(), $origin->value);
}
}
}
tests/Form/Admin/Groups/AccommodationBookingCreateTypeTest.php
+40 -42
View File
@@ -8,7 +8,7 @@ use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Form\Admin\Groups\AccommodationBookingCreateType;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Validator\Constraints\Email;
use Symfony\Component\Validator\Constraints\EmailValidator;
@@ -17,76 +17,74 @@ use Symfony\Component\Validator\Validation;
class AccommodationBookingCreateTypeTest extends TestCase
{
public function testDraftsAreValidatedWithoutTheOfferGroup(): void
public function testCreationIsAlwaysValidatedAsAScratchRecord(): void
{
self::assertSame(['Default'], $this->resolveValidationGroups(AccommodationBookingStatus::Draft));
self::assertSame(['Default'], $this->resolveValidationGroups());
}
public function testOffersAddTheOfferGroup(): void
public function testTheStatusCannotBeChosenOnCreation(): void
{
self::assertSame(['Default', 'offer'], $this->resolveValidationGroups(AccommodationBookingStatus::Open));
// A new record is always an Entwurf and only leaves that status through a named
// action, so offering the choice here would let it start out somewhere it cannot
// have arrived at legitimately.
self::assertNotContains('status', $this->builtFieldNames());
}
public function testDraftCanBeCreatedWithoutAnEmail(): void
public function testANewBookingStartsAsADraft(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Draft);
self::assertTrue((new AccommodationBooking())->isDraft());
}
$violations = $this->validate($booking, $this->resolveValidationGroups(AccommodationBookingStatus::Draft));
public function testABookingCanBeCreatedWithoutAnEmail(): void
{
// The address is enforced when the booking is actually sent somewhere — see
// SendOfferController and ConfirmController — not while it is still a scratch record.
$violations = $this->validate(new AccommodationBooking(), $this->resolveValidationGroups());
self::assertCount(0, $violations);
}
public function testOfferCannotBeCreatedWithoutAnEmail(): void
public function testAMalformedEmailIsStillRejectedOnceTheBookingIsEdited(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setStatus(AccommodationBookingStatus::Requested);
$booking->setEmail('not-an-address');
$violations = $this->validate($booking, $this->resolveValidationGroups(AccommodationBookingStatus::Open));
$violations = $this->validate($booking, ['edit']);
$properties = array_map(static fn ($violation) => $violation->getPropertyPath(), iterator_to_array($violations));
self::assertSame(['email'], $properties, 'only the address is enforced here — the rest of the contact data belongs to the edit form');
}
public function testOfferRejectsAMalformedEmail(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setEmail('not-an-address');
$violations = $this->validate($booking, $this->resolveValidationGroups(AccommodationBookingStatus::Open));
self::assertCount(1, $violations);
self::assertSame('email', $violations[0]->getPropertyPath());
}
public function testOfferWithAnEmailIsValid(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setEmail('[email protected]');
$violations = $this->validate($booking, $this->resolveValidationGroups(AccommodationBookingStatus::Open));
self::assertCount(0, $violations);
self::assertContains('email', $properties);
}
/**
* @return string[]
*/
private function resolveValidationGroups(AccommodationBookingStatus $status): array
private function resolveValidationGroups(): array
{
$resolver = new OptionsResolver();
(new AccommodationBookingCreateType())->configureOptions($resolver);
$booking = new AccommodationBooking();
$booking->setStatus($status);
return $resolver->resolve()['validation_groups'];
}
$form = $this->createMock(FormInterface::class);
$form->method('getData')->willReturn($booking);
/**
* @return string[]
*/
private function builtFieldNames(): array
{
$names = [];
return ($resolver->resolve()['validation_groups'])($form);
$builder = $this->createMock(FormBuilderInterface::class);
$builder->method('add')->willReturnCallback(static function (string $name) use (&$names, $builder) {
$names[] = $name;
return $builder;
});
(new AccommodationBookingCreateType())->buildForm($builder, ['data' => new AccommodationBooking()]);
return $names;
}
/**
tests/Form/Model/Filter/AccommodationBookingFilterDtoTest.php
+10 -5
View File
@@ -5,8 +5,8 @@ declare(strict_types=1);
namespace App\Tests\Form\Model\Filter;
use App\Entity\User;
use App\Enum\Groups\AccommodationBookingOrigin;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Enum\Groups\AccommodationBookingType;
use App\Form\Model\Filter\AccommodationBookingFilterDto;
use PHPUnit\Framework\TestCase;
@@ -17,9 +17,14 @@ class AccommodationBookingFilterDtoTest extends TestCase
$filter = AccommodationBookingFilterDto::defaults(true, new User('[email protected]'));
self::assertSame(
[AccommodationBookingStatus::Draft, AccommodationBookingStatus::Open, AccommodationBookingStatus::Received],
[
AccommodationBookingStatus::Draft,
AccommodationBookingStatus::Requested,
AccommodationBookingStatus::Open,
AccommodationBookingStatus::Received,
],
$filter->status,
'accepted and discarded bookings need no further work, so they stay out of the way',
'confirmed and discarded bookings need no further work, so they stay out of the way',
);
self::assertSame((new \DateTimeImmutable('today'))->format('Y-m-d'), $filter->dateFrom?->format('Y-m-d'));
self::assertNull($filter->managedBy, 'a group admin sees everybody’s bookings');
@@ -83,11 +88,11 @@ class AccommodationBookingFilterDtoTest extends TestCase
$filter->q = 'meier';
$filter->dateFrom = new \DateTimeImmutable('2026-08-01');
$filter->status = [AccommodationBookingStatus::Open, AccommodationBookingStatus::Confirmed];
$filter->type = [AccommodationBookingType::Booking];
$filter->origin = [AccommodationBookingOrigin::Direct];
self::assertSame(4, $filter->activeCount());
self::assertSame('Offen, Bestätigt', $this->chipFor($filter, 'Status')?->value);
self::assertSame('Buchung', $this->chipFor($filter, 'Art')?->value);
self::assertSame('Direktbuchung', $this->chipFor($filter, 'Herkunft')?->value);
self::assertSame('01.08.2026', $this->chipFor($filter, 'Aufenthalt ab')?->value);
}
tests/Service/AccommodationBookingPdfGeneratorTest.php
+16
View File
@@ -36,6 +36,19 @@ class AccommodationBookingPdfGeneratorTest extends TestCase
self::assertStringContainsString('buchung-2026-07-06-schulklasse-7b.pdf', (string) $response->headers->get('Content-Disposition'));
}
public function testADocumentForAnUnacceptedOfferIsNamedAsOne(): void
{
// The document describes whatever the record is at the time it is produced, so it
// must not call an offer nobody has accepted a booking.
$booking = $this->booking();
$booking->setAcceptedAt(null);
$booking->setConfirmedAt(null);
$response = $this->createGenerator($this->breakdown())->createDownloadResponse($booking);
self::assertStringContainsString('angebot-2026-07-06-schulklasse-7b.pdf', (string) $response->headers->get('Content-Disposition'));
}
public function testABookingWithoutPricesCannotBeRendered(): void
{
$this->expectException(\RuntimeException::class);
@@ -81,6 +94,9 @@ class AccommodationBookingPdfGeneratorTest extends TestCase
$booking->setBoardServiceLabel('Vollpension');
$booking->addAdditionalServiceSnapshot('Bettwäsche', 900, 'per_person', 5);
$booking->setRemarks('Zwei Vegetarier.');
// A confirmation is only ever released for a booking the customer committed to,
// so acceptedAt is always set by the time confirmedAt is.
$booking->setAcceptedAt(new \DateTimeImmutable('2026-08-17'));
$booking->setConfirmedAt(new \DateTimeImmutable('2026-08-18'));
return $booking;
tests/Service/AccommodationBookingServiceTest.php
+238 -8
View File
@@ -9,8 +9,9 @@ use App\Email\PdfAttachment;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationBooking;
use App\Entity\Groups\AccommodationPrice;
use App\Enum\Groups\AccommodationBookingOrigin;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Enum\Groups\AccommodationBookingType;
use App\Form\Model\AccommodationBookingDto;
use App\Model\AccommodationBookingQueryParams;
use App\Repository\Groups\AccommodationPriceRepository;
use App\Repository\Groups\AccommodationRepository;
@@ -69,14 +70,14 @@ class AccommodationBookingServiceTest extends TestCase
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
$booking = new AccommodationBooking();
$booking->setType(AccommodationBookingType::Booking);
$booking->setOrigin(AccommodationBookingOrigin::Direct);
$service->issueAccessLinkForDirectBooking($booking);
self::assertNotNull($booking->getAccessLinkIssuedAt());
}
public function testIssueAccessLinkForDirectBookingNoOpsForInquiry(): void
public function testIssueAccessLinkForDirectBookingNoOpsForAnOffer(): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::never())->method('flush');
@@ -84,7 +85,7 @@ class AccommodationBookingServiceTest extends TestCase
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
$booking = new AccommodationBooking();
$booking->setType(AccommodationBookingType::Inquiry);
$booking->setOrigin(AccommodationBookingOrigin::Offer);
$service->issueAccessLinkForDirectBooking($booking);
@@ -99,7 +100,7 @@ class AccommodationBookingServiceTest extends TestCase
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
$booking = new AccommodationBooking();
$booking->setType(AccommodationBookingType::Booking);
$booking->setOrigin(AccommodationBookingOrigin::Direct);
$issuedAt = new \DateTimeImmutable('2026-01-01');
$booking->setAccessLinkIssuedAt($issuedAt);
@@ -267,7 +268,236 @@ class AccommodationBookingServiceTest extends TestCase
self::assertNotSame($previousIssuedAt, $booking->getAccessLinkIssuedAt());
}
public function testAcceptBookingMovesOpenInquiryToReceivedAndNotifiesTheOfficeOnly(): void
public function testAnInquiryIsPersistedAsRequestedSoTheOfficeStillOwesAnOffer(): void
{
// Angefragt, not Offen: the customer has asked, nobody has offered anything yet.
$booking = $this->persistDto(forceInquiry: true);
self::assertSame(AccommodationBookingStatus::Requested, $booking->getStatus());
self::assertSame(AccommodationBookingOrigin::Offer, $booking->getOrigin());
self::assertNull($booking->getAcceptedAt(), 'asking is not committing');
}
public function testADirectBookingIsPersistedAsReceivedAwaitingTheOffice(): void
{
$booking = $this->persistDto(forceInquiry: false);
self::assertSame(AccommodationBookingStatus::Received, $booking->getStatus());
self::assertSame(AccommodationBookingOrigin::Direct, $booking->getOrigin());
self::assertNotNull($booking->getAcceptedAt(), 'booking directly is the commitment');
}
private function persistDto(bool $forceInquiry): AccommodationBooking
{
// A price covering the whole window with no minimum the booking misses, so
// computeInquiryStatus() has no reason of its own to force an inquiry.
$price = (new AccommodationPrice())
->setDateFrom(new \DateTimeImmutable('2026-07-01'))
->setDateTo(new \DateTimeImmutable('2026-09-30'))
->setIncludedPax(10)
->setMinNights(2);
$dto = new AccommodationBookingDto();
$dto->dateFrom = new \DateTimeImmutable('2026-08-01');
$dto->dateTo = new \DateTimeImmutable('2026-08-05');
$dto->paxCount = 40;
$dto->groupName = 'Schulklasse 7b';
$dto->email = '[email protected]';
$dto->forceInquiry = $forceInquiry;
$accommodation = (new Accommodation())->setName('Hotel')->setCalendarCode('HOTEL')->setMaxAdolescentAge(17);
return $this->createServiceWithAccommodation()->persist(
$dto,
$accommodation,
[$price],
['additionalServices' => [], 'boardServices' => []],
);
}
public function testSendOfferIssuesTheLinkMovesToOpenAndMailsTheCustomer(): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::atLeastOnce())->method('flush');
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Requested);
$booking->setEmail('[email protected]');
$mailer = $this->createMock(Mailer::class);
$mailer
->expects(self::once())
->method('createAndSendEmail')
->with(
self::anything(),
self::callback(static fn (array $options) => '[email protected]' === $options['to']
&& 'Dein Angebot ist bereit' === $options['subject']
&& 'email/accommodation_booking_customer.html.twig' === $options['template']),
);
$service = $this->createServiceWithAccommodation(entityManager: $entityManager, mailer: $mailer);
$service->sendOffer($booking);
self::assertSame(AccommodationBookingStatus::Open, $booking->getStatus());
self::assertNotNull($booking->getAccessLinkIssuedAt(), 'the mail links to the offer, so the link has to exist by the time it goes out');
}
public function testSendOfferPublishesAnAdminAuthoredDraftTheSameWay(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Draft);
$booking->setEmail('[email protected]');
$service = $this->createServiceWithAccommodation();
$service->sendOffer($booking);
self::assertSame(AccommodationBookingStatus::Open, $booking->getStatus());
}
public function testSendOfferKeepsAnAlreadyIssuedLinkSoEarlierLinksStayValid(): void
{
$issuedAt = new \DateTimeImmutable('2026-01-01');
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Requested);
$booking->setEmail('[email protected]');
$booking->setAccessLinkIssuedAt($issuedAt);
$service = $this->createServiceWithAccommodation();
$service->sendOffer($booking);
self::assertSame($issuedAt, $booking->getAccessLinkIssuedAt());
}
/**
* @dataProvider statusesThatAreNotAwaitingAnOffer
*/
public function testSendOfferNoOpsOnceTheOfferIsOut(AccommodationBookingStatus $status): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::never())->method('flush');
$mailer = $this->createMock(Mailer::class);
$mailer->expects(self::never())->method('createAndSendEmail');
$booking = new AccommodationBooking();
$booking->setStatus($status);
$booking->setEmail('[email protected]');
$service = $this->createServiceWithAccommodation(entityManager: $entityManager, mailer: $mailer);
$service->sendOffer($booking);
self::assertSame($status, $booking->getStatus());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function statusesThatAreNotAwaitingAnOffer(): iterable
{
yield 'open' => [AccommodationBookingStatus::Open];
yield 'received' => [AccommodationBookingStatus::Received];
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
}
public function testDiscardBookingClosesTheBookingSilently(): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::once())->method('flush');
$mailer = $this->createMock(Mailer::class);
$mailer->expects(self::never())->method('createAndSendEmail');
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setEmail('[email protected]');
$service = $this->createServiceWithAccommodation(entityManager: $entityManager, mailer: $mailer);
$service->discardBooking($booking);
self::assertSame(AccommodationBookingStatus::Discarded, $booking->getStatus());
}
/**
* @dataProvider closedStatuses
*/
public function testDiscardBookingNoOpsForAClosedBooking(AccommodationBookingStatus $status): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::never())->method('flush');
$booking = new AccommodationBooking();
$booking->setStatus($status);
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
$service->discardBooking($booking);
self::assertSame($status, $booking->getStatus());
}
/**
* @return iterable<string, array{AccommodationBookingStatus}>
*/
public static function closedStatuses(): iterable
{
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
yield 'discarded' => [AccommodationBookingStatus::Discarded];
}
/**
* The dead end this flow was rebuilt to remove: Offen used to mean both "inquiry not yet
* offered" and "offer out with the customer", and acceptBooking() additionally demanded
* the Anfrage type. A direct booking nudged into Offen therefore rendered an offer page
* whose accept button silently did nothing, forever. Offen is now reachable only through
* sendOffer(), and acceptance turns on the status alone.
*/
public function testAnOpenBookingCanAlwaysBeAcceptedWhateverItsOrigin(): void
{
foreach (AccommodationBookingOrigin::cases() as $origin) {
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setOrigin($origin);
$booking->setEmail('[email protected]');
$this->createServiceWithAccommodation()->acceptBooking($booking);
self::assertSame(
AccommodationBookingStatus::Received,
$booking->getStatus(),
sprintf('an offer that is out must be acceptable, %s origin included', $origin->value),
);
}
}
public function testTheOriginSurvivesTheWholeLifecycleUntouched(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Requested);
$booking->setOrigin(AccommodationBookingOrigin::Offer);
$booking->setEmail('[email protected]');
$service = $this->createServiceWithAccommodation();
$service->sendOffer($booking);
$service->acceptBooking($booking);
$service->confirmBooking($booking);
self::assertSame(AccommodationBookingStatus::Confirmed, $booking->getStatus());
self::assertSame(
AccommodationBookingOrigin::Offer,
$booking->getOrigin(),
'where a booking came from stays true at every point of its life',
);
}
public function testAcceptBookingMovesOpenOfferToReceivedAndNotifiesTheOfficeOnly(): void
{
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::once())->method('flush');
@@ -293,7 +523,7 @@ class AccommodationBookingServiceTest extends TestCase
$service->acceptBooking($booking);
self::assertSame(AccommodationBookingStatus::Received, $booking->getStatus());
self::assertSame(AccommodationBookingType::Inquiry, $booking->getType(), 'an accepted offer stays an Anfrage');
self::assertSame(AccommodationBookingOrigin::Offer, $booking->getOrigin(), 'accepting does not rewrite where the booking came from');
self::assertNotNull($booking->getAcceptedAt());
}
@@ -482,7 +712,7 @@ class AccommodationBookingServiceTest extends TestCase
$service = $this->createServiceWithAccommodation(entityManager: $entityManager, mailer: $mailer);
$booking = new AccommodationBooking();
$booking->setType(AccommodationBookingType::Inquiry);
$booking->setOrigin(AccommodationBookingOrigin::Offer);
$booking->setStatus(AccommodationBookingStatus::Draft);
$service->acceptBooking($booking);