feat: edit selected accommodation of bookings in draft
This commit is contained in:
Björn Fromme
@@ -0,0 +1,205 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Controller\Admin\AccommodationBooking;
|
||||
|
||||
use App\Controller\Admin\AccommodationBooking\ChangeAccommodationController;
|
||||
use App\Entity\Groups\Accommodation;
|
||||
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\Form\FormInterface;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
||||
/**
|
||||
* Covers the guards around correcting the Gruppenhaus — the transition itself is tested in
|
||||
* AccommodationBookingServiceTest.
|
||||
*/
|
||||
class ChangeAccommodationControllerTest extends TestCase
|
||||
{
|
||||
public function testGetRendersTheModalForADraft(): void
|
||||
{
|
||||
$bookingService = $this->createMock(AccommodationBookingService::class);
|
||||
$bookingService->expects(self::never())->method('changeAccommodation');
|
||||
|
||||
$controller = $this->buildController($bookingService, $this->unsubmittedForm());
|
||||
|
||||
$response = $controller->index($this->draft(), $this->request());
|
||||
|
||||
self::assertSame(Response::HTTP_OK, $response->getStatusCode());
|
||||
self::assertSame('admin/accommodation_booking/modal_change_accommodation.html.twig', $controller->renderedView);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider lockedStatuses
|
||||
*/
|
||||
public function testABookingThatHasLeftEntwurfCannotMoveHouse(AccommodationBookingStatus $status): void
|
||||
{
|
||||
// The customer may already be looking at the offer under their access link.
|
||||
$booking = $this->draft();
|
||||
$booking->setStatus($status);
|
||||
$selected = new Accommodation();
|
||||
|
||||
$bookingService = $this->createMock(AccommodationBookingService::class);
|
||||
$bookingService->expects(self::never())->method('changeAccommodation');
|
||||
|
||||
$controller = $this->buildController($bookingService, $this->submittedForm($selected));
|
||||
|
||||
$response = $controller->index($booking, $this->request('POST'));
|
||||
|
||||
self::assertTrue($response->headers->has('HX-Redirect'));
|
||||
self::assertNull($controller->renderedView);
|
||||
self::assertSame('error', $controller->flashes[0]['type']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return iterable<string, array{AccommodationBookingStatus}>
|
||||
*/
|
||||
public static function lockedStatuses(): iterable
|
||||
{
|
||||
yield 'requested' => [AccommodationBookingStatus::Requested];
|
||||
yield 'open' => [AccommodationBookingStatus::Open];
|
||||
yield 'received' => [AccommodationBookingStatus::Received];
|
||||
yield 'confirmed' => [AccommodationBookingStatus::Confirmed];
|
||||
yield 'discarded' => [AccommodationBookingStatus::Discarded];
|
||||
}
|
||||
|
||||
public function testAValidSubmitChangesTheHouseAndSendsTheBrowserBackToTheEditForm(): void
|
||||
{
|
||||
$booking = $this->draft();
|
||||
$selected = new Accommodation();
|
||||
|
||||
$bookingService = $this->createMock(AccommodationBookingService::class);
|
||||
$bookingService->expects(self::once())->method('changeAccommodation')->with($booking, $selected);
|
||||
|
||||
$controller = $this->buildController($bookingService, $this->submittedForm($selected));
|
||||
|
||||
$response = $controller->index($booking, $this->request('POST'));
|
||||
|
||||
self::assertSame(
|
||||
'/app_admin_accommodationbooking_edit?r=%2Fadmin%2Faccommodation-booking%3Fpage%3D2',
|
||||
$response->headers->get('HX-Redirect'),
|
||||
'the still-encoded return url has to survive so the edit page leads back to the list',
|
||||
);
|
||||
self::assertSame('success', $controller->flashes[0]['type']);
|
||||
}
|
||||
|
||||
public function testPickingTheSameHouseIsNotReportedAsAChange(): void
|
||||
{
|
||||
$booking = $this->draft();
|
||||
$accommodation = $booking->getAccommodation();
|
||||
self::assertNotNull($accommodation);
|
||||
|
||||
$bookingService = $this->createMock(AccommodationBookingService::class);
|
||||
$bookingService->expects(self::never())->method('changeAccommodation');
|
||||
|
||||
$controller = $this->buildController($bookingService, $this->submittedForm($accommodation));
|
||||
|
||||
$response = $controller->index($booking, $this->request('POST'));
|
||||
|
||||
self::assertTrue($response->headers->has('HX-Redirect'));
|
||||
self::assertSame([], $controller->flashes);
|
||||
}
|
||||
|
||||
private function draft(): AccommodationBooking
|
||||
{
|
||||
$booking = new AccommodationBooking();
|
||||
$booking->setStatus(AccommodationBookingStatus::Draft);
|
||||
$booking->setAccommodation((new Accommodation())->setName('Seehaus'));
|
||||
|
||||
return $booking;
|
||||
}
|
||||
|
||||
private function request(string $method = 'GET'): Request
|
||||
{
|
||||
// Every entry point is htmx — the button opens the modal, the modal posts back — so
|
||||
// the header is what makes htmxRedirect() answer with HX-Redirect rather than a 302.
|
||||
return Request::create(
|
||||
'/admin/accommodation-booking/1/change-accommodation?r=%2Fadmin%2Faccommodation-booking%3Fpage%3D2',
|
||||
$method,
|
||||
server: ['HTTP_HX-Request' => 'true'],
|
||||
);
|
||||
}
|
||||
|
||||
private function unsubmittedForm(): FormInterface
|
||||
{
|
||||
$form = $this->createMock(FormInterface::class);
|
||||
$form->method('handleRequest')->willReturn($form);
|
||||
$form->method('isSubmitted')->willReturn(false);
|
||||
|
||||
return $form;
|
||||
}
|
||||
|
||||
private function submittedForm(Accommodation $selected): FormInterface
|
||||
{
|
||||
$field = $this->createMock(FormInterface::class);
|
||||
$field->method('getData')->willReturn($selected);
|
||||
|
||||
$form = $this->createMock(FormInterface::class);
|
||||
$form->method('handleRequest')->willReturn($form);
|
||||
$form->method('isSubmitted')->willReturn(true);
|
||||
$form->method('isValid')->willReturn(true);
|
||||
$form->method('get')->with('accommodation')->willReturn($field);
|
||||
|
||||
return $form;
|
||||
}
|
||||
|
||||
private function buildController(
|
||||
AccommodationBookingService $bookingService,
|
||||
FormInterface $form,
|
||||
): TestableChangeAccommodationController {
|
||||
return new TestableChangeAccommodationController(
|
||||
$bookingService,
|
||||
$this->createMock(LoggerInterface::class),
|
||||
$form,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
final class TestableChangeAccommodationController extends ChangeAccommodationController
|
||||
{
|
||||
public ?string $renderedView = null;
|
||||
|
||||
/** @var list<array{type: string, message: mixed}> */
|
||||
public array $flashes = [];
|
||||
|
||||
public function __construct(
|
||||
AccommodationBookingService $bookingService,
|
||||
LoggerInterface $logger,
|
||||
private readonly FormInterface $form,
|
||||
) {
|
||||
parent::__construct($bookingService, $logger);
|
||||
}
|
||||
|
||||
protected function createForm(string $type, mixed $data = null, array $options = []): FormInterface
|
||||
{
|
||||
return $this->form;
|
||||
}
|
||||
|
||||
/**
|
||||
* @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);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace App\Tests\Form\Admin\Groups;
|
||||
|
||||
use App\Entity\Groups\Accommodation;
|
||||
use App\Form\Admin\Groups\AccommodationBookingChangeAccommodationType;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use Symfony\Component\Form\FormBuilderInterface;
|
||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||
|
||||
class AccommodationBookingChangeAccommodationTypeTest extends TestCase
|
||||
{
|
||||
public function testTheHouseIsTheOnlyThingOnOffer(): void
|
||||
{
|
||||
self::assertSame(['accommodation'], array_keys($this->builtFields()));
|
||||
}
|
||||
|
||||
public function testTheFieldIsUnmapped(): void
|
||||
{
|
||||
// Swapping the house drops the booked services with it, so the change has to go
|
||||
// through AccommodationBookingService::changeAccommodation() as one transition — the
|
||||
// form must not write it onto the booking on its own, least of all on a failed submit.
|
||||
self::assertFalse($this->builtFields()['accommodation']['mapped']);
|
||||
}
|
||||
|
||||
public function testTheCurrentHouseIsPreselected(): void
|
||||
{
|
||||
$accommodation = (new Accommodation())->setName('Seehaus');
|
||||
|
||||
$fields = $this->builtFields(['current_accommodation' => $accommodation]);
|
||||
|
||||
self::assertSame($accommodation, $fields['accommodation']['data']);
|
||||
}
|
||||
|
||||
public function testADraftIsValidatedAsAScratchRecord(): void
|
||||
{
|
||||
// The action is limited to Entwurf, whose contact data is deliberately still incomplete.
|
||||
$resolver = new OptionsResolver();
|
||||
(new AccommodationBookingChangeAccommodationType())->configureOptions($resolver);
|
||||
|
||||
self::assertSame(['Default'], $resolver->resolve()['validation_groups']);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array<string, mixed> $options
|
||||
*
|
||||
* @return array<string, array<string, mixed>>
|
||||
*/
|
||||
private function builtFields(array $options = []): array
|
||||
{
|
||||
$fields = [];
|
||||
|
||||
$builder = $this->createMock(FormBuilderInterface::class);
|
||||
$builder->method('add')->willReturnCallback(
|
||||
static function (string $name, ?string $type = null, array $fieldOptions = []) use (&$fields, $builder) {
|
||||
$fields[$name] = $fieldOptions;
|
||||
|
||||
return $builder;
|
||||
},
|
||||
);
|
||||
|
||||
$resolver = new OptionsResolver();
|
||||
$type = new AccommodationBookingChangeAccommodationType();
|
||||
$type->configureOptions($resolver);
|
||||
$type->buildForm($builder, $resolver->resolve($options));
|
||||
|
||||
return $fields;
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ use App\Entity\Groups\AccommodationBooking;
|
||||
use App\Entity\Groups\AccommodationPrice;
|
||||
use App\Enum\Groups\AccommodationBookingOrigin;
|
||||
use App\Enum\Groups\AccommodationBookingStatus;
|
||||
use App\Enum\Groups\AdditionalServiceType;
|
||||
use App\Form\Model\AccommodationBookingDto;
|
||||
use App\Model\AccommodationBookingQueryParams;
|
||||
use App\Repository\Groups\AccommodationPriceRepository;
|
||||
@@ -859,6 +860,76 @@ class AccommodationBookingServiceTest extends TestCase
|
||||
self::assertSame(1, $booking->getPricingVersion());
|
||||
}
|
||||
|
||||
public function testChangeAccommodationSwapsTheHouseAndDropsTheBookedServices(): void
|
||||
{
|
||||
$entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
$entityManager->expects(self::once())->method('flush');
|
||||
|
||||
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
|
||||
|
||||
$booking = $this->draftWithServices();
|
||||
$newAccommodation = (new Accommodation())->setName('Berghaus')->setCalendarCode('BERG');
|
||||
|
||||
$service->changeAccommodation($booking, $newAccommodation);
|
||||
|
||||
self::assertSame($newAccommodation, $booking->getAccommodation());
|
||||
// The services belong to the old house's catalog and would carry its prices along.
|
||||
self::assertNull($booking->getBoardServiceLabel());
|
||||
self::assertNull($booking->getBoardServicePrice());
|
||||
self::assertNull($booking->getBoardServiceOriginalId());
|
||||
self::assertSame([], $booking->getAdditionalServices());
|
||||
self::assertNull($booking->getTotalPrice(), 'the frozen price belonged to the old house');
|
||||
}
|
||||
|
||||
public function testChangeAccommodationNoOpsForANonDraft(): void
|
||||
{
|
||||
$entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
$entityManager->expects(self::never())->method('flush');
|
||||
|
||||
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
|
||||
|
||||
$booking = $this->draftWithServices();
|
||||
$booking->setStatus(AccommodationBookingStatus::Open);
|
||||
$oldAccommodation = $booking->getAccommodation();
|
||||
|
||||
$service->changeAccommodation($booking, (new Accommodation())->setName('Berghaus'));
|
||||
|
||||
self::assertSame($oldAccommodation, $booking->getAccommodation());
|
||||
self::assertSame('Vollpension', $booking->getBoardServiceLabel());
|
||||
self::assertCount(1, $booking->getAdditionalServices());
|
||||
}
|
||||
|
||||
public function testChangeAccommodationNoOpsWhenTheHouseIsUnchanged(): void
|
||||
{
|
||||
$entityManager = $this->createMock(EntityManagerInterface::class);
|
||||
$entityManager->expects(self::never())->method('flush');
|
||||
|
||||
$service = $this->createServiceWithAccommodation(entityManager: $entityManager);
|
||||
|
||||
$booking = $this->draftWithServices();
|
||||
$accommodation = $booking->getAccommodation();
|
||||
self::assertNotNull($accommodation);
|
||||
|
||||
$service->changeAccommodation($booking, $accommodation);
|
||||
|
||||
self::assertSame('Vollpension', $booking->getBoardServiceLabel());
|
||||
self::assertCount(1, $booking->getAdditionalServices());
|
||||
}
|
||||
|
||||
private function draftWithServices(): AccommodationBooking
|
||||
{
|
||||
$booking = new AccommodationBooking();
|
||||
$booking->setStatus(AccommodationBookingStatus::Draft);
|
||||
$booking->setAccommodation((new Accommodation())->setName('Seehaus')->setCalendarCode('SEE'));
|
||||
$booking->setBoardServiceLabel('Vollpension');
|
||||
$booking->setBoardServicePrice(4500);
|
||||
$booking->setBoardServiceOriginalId(7);
|
||||
$booking->addAdditionalServiceSnapshot('Bettwäsche', 1200, AdditionalServiceType::Flat, 12);
|
||||
$booking->setPriceSnapshot(['total' => 12345], 12345, 'EUR', 1);
|
||||
|
||||
return $booking;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param AccommodationPrice[] $prices
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user