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

feat: re-generate access links for bookings when sent via email

Browse Source
This commit is contained in:
Björn Fromme
2026-08-20 14:21:02 +02:00
parent 98a303e941
commit ef439f6faf
9 changed files with 58 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Controller/Admin/AccommodationBooking/GenerateAccessLinkControllerTest.php
-146
View File
@@ -1,146 +0,0 @@
<?php
declare(strict_types=1);
namespace App\Tests\Controller\Admin\AccommodationBooking;
use App\Controller\Admin\AccommodationBooking\GenerateAccessLinkController;
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 issuing an access link — the issuing itself is tested in
* AccommodationBookingServiceTest.
*/
class GenerateAccessLinkControllerTest extends TestCase
{
public function testGetRendersTheConfirmationModal(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('regenerateAccessLink');
$controller = new TestableGenerateAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($this->openBooking(), Request::create('/admin/accommodation-booking/1/generate-access-link'));
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
self::assertSame('admin/accommodation_booking/modal_generate_access_link.html.twig', $controller->renderedView);
}
public function testPostGeneratesTheLinkAndRedirectsTheBrowser(): void
{
$booking = $this->openBooking();
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('regenerateAccessLink')->with($booking);
$controller = new TestableGenerateAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/generate-access-link', 'POST'));
self::assertTrue($response->headers->has('HX-Redirect'));
}
/**
* A draft is the office's own workbench: nothing has been offered, so a link would
* point the customer at a half-prepared record.
*
* @dataProvider requestMethods
*/
public function testADraftGetsNoAccessLinkAtAll(string $method): void
{
$booking = $this->openBooking();
$booking->setStatus(AccommodationBookingStatus::Draft);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('regenerateAccessLink');
$controller = new TestableGenerateAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
$response = $controller->index($booking, Request::create('/admin/accommodation-booking/1/generate-access-link', $method));
self::assertSame(Response::HTTP_FOUND, $response->getStatusCode());
self::assertNull($controller->renderedView, 'not even the modal offering the action');
}
/**
* @return iterable<string, array{string}>
*/
public static function requestMethods(): iterable
{
yield 'GET' => [Request::METHOD_GET];
yield 'POST' => [Request::METHOD_POST];
}
public function testPostWithAnInvalidTokenIsDenied(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('regenerateAccessLink');
$controller = new TestableGenerateAccessLinkController($bookingService, $this->createMock(LoggerInterface::class), tokenValid: false);
$this->expectException(AccessDeniedException::class);
$controller->index($this->openBooking(), Request::create('/admin/accommodation-booking/1/generate-access-link', 'POST'));
}
private function openBooking(): AccommodationBooking
{
$booking = new AccommodationBooking();
$booking->setStatus(AccommodationBookingStatus::Open);
$booking->setGroupName('Schulklasse 7b');
$booking->setEmail('[email protected]');
return $booking;
}
}
final class TestableGenerateAccessLinkController extends GenerateAccessLinkController
{
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/SendAccessLinkControllerTest.php
+6 -6
View File
@@ -23,7 +23,7 @@ class SendAccessLinkControllerTest extends TestCase
public function testGetRendersTheConfirmationModal(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendAccessLink');
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
@@ -38,7 +38,7 @@ class SendAccessLinkControllerTest extends TestCase
$booking = $this->openBooking();
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::once())->method('sendCustomerConfirmationEmail')->with($booking);
$bookingService->expects(self::once())->method('sendAccessLink')->with($booking);
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
@@ -53,7 +53,7 @@ class SendAccessLinkControllerTest extends TestCase
$booking->setAccessLinkIssuedAt(null);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendAccessLink');
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
@@ -74,7 +74,7 @@ class SendAccessLinkControllerTest extends TestCase
$booking->setStatus(AccommodationBookingStatus::Draft);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendAccessLink');
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
@@ -96,7 +96,7 @@ class SendAccessLinkControllerTest extends TestCase
public function testPostWithAnInvalidTokenIsDenied(): void
{
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendAccessLink');
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class), tokenValid: false);
@@ -111,7 +111,7 @@ class SendAccessLinkControllerTest extends TestCase
$booking->setEmail(null);
$bookingService = $this->createMock(AccommodationBookingService::class);
$bookingService->expects(self::never())->method('sendCustomerConfirmationEmail');
$bookingService->expects(self::never())->method('sendAccessLink');
$controller = new TestableSendAccessLinkController($bookingService, $this->createMock(LoggerInterface::class));
tests/Service/AccommodationBookingServiceTest.php
+25 -5
View File
@@ -245,8 +245,10 @@ class AccommodationBookingServiceTest extends TestCase
$service->sendCustomerConfirmationEmail($booking);
}
public function testRegenerateAccessLinkOverwritesAccessLinkIssuedAt(): void
public function testSendAccessLinkRefreshesTheLinkBeforeSending(): void
{
// The mail is the only way a link reaches the customer, so every send hands out a
// link that is good for another full TTL — the previous one stops working.
$booking = new AccommodationBooking();
$booking->setEmail('[email protected]');
$booking->setStatus(AccommodationBookingStatus::Open);
@@ -260,7 +262,7 @@ class AccommodationBookingServiceTest extends TestCase
$breakdownCalculator->method('compute')->willReturn(null);
$mailer = $this->createMock(Mailer::class);
$mailer->expects(self::never())->method('createAndSendEmail');
$mailer->expects(self::once())->method('createAndSendEmail');
$service = $this->createServiceWithAccommodation(
entityManager: $entityManager,
@@ -268,9 +270,28 @@ class AccommodationBookingServiceTest extends TestCase
breakdownCalculator: $breakdownCalculator,
);
$service->regenerateAccessLink($booking);
$service->sendAccessLink($booking);
self::assertNotSame($previousIssuedAt, $booking->getAccessLinkIssuedAt());
self::assertGreaterThan($previousIssuedAt, $booking->getAccessLinkIssuedAt());
}
public function testSendAccessLinkNoOpsForADraft(): void
{
$booking = new AccommodationBooking();
$booking->setEmail('[email protected]');
$booking->setStatus(AccommodationBookingStatus::Draft);
$entityManager = $this->createMock(EntityManagerInterface::class);
$entityManager->expects(self::never())->method('flush');
$mailer = $this->createMock(Mailer::class);
$mailer->expects(self::never())->method('createAndSendEmail');
$service = $this->createServiceWithAccommodation(entityManager: $entityManager, mailer: $mailer);
$service->sendAccessLink($booking);
self::assertNull($booking->getAccessLinkIssuedAt());
}
public function testADraftGetsNoAccessLinkGenerated(): void
@@ -287,7 +308,6 @@ class AccommodationBookingServiceTest extends TestCase
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
$service->issueAccessLink($booking);
$service->regenerateAccessLink($booking);
self::assertNull($booking->getAccessLinkIssuedAt());
}