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

feat: additional status

Browse Source
This commit is contained in:
Björn Fromme
2026-08-04 18:09:40 +02:00
parent dc86e715cb
commit 2c381ee741
20 changed files with 588 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Controller/Admin/AccommodationBooking/EditControllerTest.php
+143
View File
@@ -0,0 +1,143 @@
<?php
declare(strict_types=1);
namespace App\Tests\Controller\Admin\AccommodationBooking;
use App\Controller\Admin\AccommodationBooking\EditController;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Repository\Groups\AdditionalServiceRepository;
use App\Repository\Groups\BoardServiceRepository;
use App\Service\AccommodationBookingService;
use Doctrine\ORM\EntityManagerInterface;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Symfony\Component\Form\FormInterface;
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.
*/
class EditControllerTest extends TestCase
{
public function testTransitionToInquiryIssuesAccessLinkAndSendsCustomerEmail(): void
{
$bookingService = $this->assertNotified(AccommodationBookingStatus::Inquiry);
$this->submitStatusChange(AccommodationBookingStatus::Draft, AccommodationBookingStatus::Inquiry, $bookingService);
}
public function testTransitionToBookingIssuesAccessLinkAndSendsCustomerEmail(): void
{
$bookingService = $this->assertNotified(AccommodationBookingStatus::Booking);
$this->submitStatusChange(AccommodationBookingStatus::Draft, AccommodationBookingStatus::Booking, $bookingService);
}
public function testTransitionToDiscardedSendsNothing(): void
{
$bookingService = $this->assertNotNotified();
$this->submitStatusChange(AccommodationBookingStatus::Inquiry, AccommodationBookingStatus::Discarded, $bookingService);
}
public function testSavingWithoutStatusChangeSendsNothing(): void
{
$bookingService = $this->assertNotNotified();
$this->submitStatusChange(AccommodationBookingStatus::Booking, AccommodationBookingStatus::Booking, $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
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('refreshPriceSnapshot');
$bookingService->expects(self::never())->method('issueAccessLink');
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
return $bookingService;
}
private function submitStatusChange(
AccommodationBookingStatus $from,
AccommodationBookingStatus $to,
AccommodationBookingService $bookingService,
): void {
$booking = new AccommodationBooking();
$booking->setStatus($from);
// The form is what moves the entity to its new status during handleRequest().
$form = $this->createMock(FormInterface::class);
$form->method('handleRequest')->willReturnCallback(static function () use ($booking, $to, $form) {
$booking->setStatus($to);
return $form;
});
$form->method('isSubmitted')->willReturn(true);
$form->method('isValid')->willReturn(true);
$form->method('has')->willReturn(false);
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::once())->method('flush');
$controller = new TestableEditController(
$entityManager,
$this->createMock(LoggerInterface::class),
$this->createMock(BoardServiceRepository::class),
$this->createMock(AdditionalServiceRepository::class),
$bookingService,
$form,
);
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/edit', 'POST'));
self::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
}
}
final class TestableEditController extends EditController
{
public function __construct(
EntityManagerInterface $entityManager,
LoggerInterface $logger,
BoardServiceRepository $boardServiceRepo,
AdditionalServiceRepository $additionalServiceRepo,
AccommodationBookingService $bookingService,
private readonly FormInterface $form,
) {
parent::__construct($entityManager, $logger, $boardServiceRepo, $additionalServiceRepo, $bookingService);
}
protected function createForm(string $type, mixed $data = null, array $options = []): FormInterface
{
return $this->form;
}
protected function addFlash(string $type, mixed $message): void
{
}
/**
* @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 -6
View File
@@ -7,6 +7,7 @@ namespace App\Tests\Controller\Api;
use App\Controller\Api\AccommodationBookingController;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Repository\Groups\AccommodationBookingRepository;
use App\Service\AccommodationBookingBreakdownCalculator;
use App\Service\AccommodationBookingService;
@@ -54,7 +55,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setAccommodationDiscount(10);
$booking->setBoardServiceDiscount(20);
$booking->setAdditionalServicesDiscount(30);
$booking->setIsInquiry(false);
$booking->setStatus(AccommodationBookingStatus::Booking);
$booking->setAcceptedAt(new \DateTimeImmutable('2026-07-15T10:00:00+00:00'));
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
@@ -143,7 +144,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setFirstName('Tom');
$booking->setLastName('Beispiel');
$booking->setEmail('[email protected]');
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository
@@ -194,7 +195,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setFirstName('Tom');
$booking->setLastName('Beispiel');
$booking->setEmail('[email protected]');
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository
@@ -212,7 +213,7 @@ class AccommodationBookingControllerTest extends TestCase
->method('acceptBooking')
->with($booking)
->willReturnCallback(static function (AccommodationBooking $b): void {
$b->setIsInquiry(false);
$b->setStatus(AccommodationBookingStatus::Booking);
$b->setAcceptedAt(new \DateTimeImmutable());
});
@@ -223,7 +224,7 @@ class AccommodationBookingControllerTest extends TestCase
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('booking', $payload['status']);
self::assertFalse($booking->isInquiry());
self::assertSame(AccommodationBookingStatus::Booking, $booking->getStatus());
self::assertNotNull($booking->getAcceptedAt());
self::assertSame($booking->getAcceptedAt()->format(\DATE_ATOM), $payload['acceptedAt']);
}
@@ -239,7 +240,7 @@ class AccommodationBookingControllerTest extends TestCase
$booking->setFirstName('Tom');
$booking->setLastName('Beispiel');
$booking->setEmail('[email protected]');
$booking->setIsInquiry(false);
$booking->setStatus(AccommodationBookingStatus::Booking);
$booking->setAcceptedAt($acceptedAt);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
tests/Controller/Groups/OfferControllerTest.php
+63 -6
View File
@@ -7,6 +7,7 @@ namespace App\Tests\Controller\Groups;
use App\Controller\Groups\OfferController;
use App\Entity\Groups\Accommodation;
use App\Entity\Groups\AccommodationBooking;
use App\Enum\Groups\AccommodationBookingStatus;
use App\Repository\Groups\AccommodationBookingRepository;
use App\Service\AccommodationBookingBreakdownCalculator;
use App\Service\AccommodationBookingLinkSigner;
@@ -24,6 +25,7 @@ class OfferControllerTest extends TestCase
public function testAccessAuthorizesSessionAndRedirectsToView(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->with(['uuid' => $booking->getUuid()])->willReturn($booking);
@@ -90,10 +92,65 @@ class OfferControllerTest extends TestCase
self::assertSame('groups/booking/offer_unavailable.html.twig', $controller->renderedView);
}
public function testAccessRendersUnavailableForDraft(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Draft);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
$linkSigner = $this->createMock(AccommodationBookingLinkSigner::class);
$linkSigner->method('isValidLinkRequest')->willReturn(true);
$linkSigner->expects(self::never())->method('authorizeSession');
$controller = new TestableOfferController(
$bookingRepository,
$linkSigner,
$this->createMock(AccommodationBookingBreakdownCalculator::class),
$this->createMock(AccommodationBookingService::class),
);
$response = $controller->access($booking->getUuid(), Request::create('/groups/booking/offer/'.$booking->getUuid()));
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('groups/booking/offer_unavailable.html.twig', $controller->renderedView);
}
public function testViewRendersUnavailableForDiscardedBooking(): void
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Discarded);
$booking->setAccommodation(new Accommodation());
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
$linkSigner = $this->createMock(AccommodationBookingLinkSigner::class);
$linkSigner->method('isSessionAuthorized')->willReturn(true);
$breakdownCalculator = $this->createMock(AccommodationBookingBreakdownCalculator::class);
$breakdownCalculator->expects(self::never())->method('compute');
$controller = new TestableOfferController(
$bookingRepository,
$linkSigner,
$breakdownCalculator,
$this->createMock(AccommodationBookingService::class),
);
$request = Request::create('/groups/booking/offer/'.$booking->getUuid().'/view');
$request->setSession(new Session(new MockArraySessionStorage()));
$response = $controller->view($booking->getUuid(), $request);
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('groups/booking/offer_unavailable.html.twig', $controller->renderedView);
}
public function testViewRendersOfferWhenSessionAuthorized(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$booking->setAccommodation(new Accommodation());
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
@@ -149,7 +206,7 @@ class OfferControllerTest extends TestCase
public function testConfirmGetRendersModalWithFreshForm(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->with(['uuid' => $booking->getUuid()])->willReturn($booking);
@@ -180,7 +237,7 @@ class OfferControllerTest extends TestCase
public function testConfirmPostValidAcceptsBookingAndRedirects(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
@@ -215,7 +272,7 @@ class OfferControllerTest extends TestCase
public function testConfirmPostValidViaHtmxReturnsHxRedirect(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
@@ -250,7 +307,7 @@ class OfferControllerTest extends TestCase
public function testConfirmPostInvalidReRendersModalWithoutAccepting(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(true);
$booking->setStatus(AccommodationBookingStatus::Inquiry);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
@@ -284,7 +341,7 @@ class OfferControllerTest extends TestCase
public function testConfirmRedirectsWhenAlreadyAccepted(): void
{
$booking = new AccommodationBooking();
$booking->setIsInquiry(false);
$booking->setStatus(AccommodationBookingStatus::Booking);
$bookingRepository = $this->createMock(AccommodationBookingRepository::class);
$bookingRepository->method('findOneBy')->willReturn($booking);
tests/Controller/Groups/Step4ControllerTest.php
+3 -2
View File
@@ -7,6 +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\AccommodationBookingStatus;
use App\Form\Model\AccommodationBookingDto;
use App\Service\AccommodationBookingService;
use App\Service\AccommodationSessionManager;
@@ -100,7 +101,7 @@ class Step4ControllerTest extends TestCase
->setCalendarCode('HOTEL')
->setMaxAdolescentAge(17);
$booking = (new AccommodationBooking())->setIsInquiry(true);
$booking = (new AccommodationBooking())->setStatus(AccommodationBookingStatus::Inquiry);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->method('loadAccommodation')->with(1)->willReturn($accommodation);
@@ -273,7 +274,7 @@ class Step4ControllerTest extends TestCase
->setCalendarCode('HOTEL')
->setMaxAdolescentAge(17);
$booking = (new AccommodationBooking())->setIsInquiry(false);
$booking = (new AccommodationBooking())->setStatus(AccommodationBookingStatus::Booking);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->method('loadAccommodation')->with(1)->willReturn($accommodation);