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

fix: enable bookings without ski passes

Browse Source
This commit is contained in:
Björn Fromme
2026-08-11 11:16:11 +02:00
parent 6c1073e41c
commit af04ff690d
10 changed files with 480 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Form/Model/ParticipantEditDtoTest.php
+125 -20
View File
@@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Tests\Form\Model;
use App\BusProNet\Constants;
use App\BusProNet\Model\Booking;
use App\BusProNet\Model\Address;
use App\Form\Model\AddressDto;
@@ -17,10 +18,12 @@ use App\Form\Model\ParticipantEditDto;
use App\Form\Service\ServiceAgeEvaluator;
use App\Service\BookingPriceCalculator;
use App\Service\ParticipantEligibilityChecker;
use App\Service\ServiceAvailabilityCalculator;
use App\Service\VoucherValidator;
use App\Validator\Constraints\MandatoryAdditionalServicesSelectedValidator;
use App\Validator\Constraints\PromoVoucherValidator;
use App\Validator\Constraints\PurchaseVoucherValidator;
use App\Validator\Constraints\SkiPassSelectionValidator;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\Constraints\Email;
@@ -49,13 +52,21 @@ class ParticipantEditDtoTest extends TestCase
$mockParticipantEligibilityChecker = $this->createMock(ParticipantEligibilityChecker::class);
$mockServiceAgeEvaluator = $this->createMock(ServiceAgeEvaluator::class);
// Ski pass validation is exercised against the real gate, not a mock: which participant
// needs a pass is exactly the behaviour under test here.
$participantEligibilityChecker = new ParticipantEligibilityChecker(
new ServiceAgeEvaluator(),
new ServiceAvailabilityCalculator()
);
// Create custom validator factory that can inject dependencies
$validatorFactory = new class($mockVoucherService, $mockPriceCalculatorService, $mockParticipantEligibilityChecker, $mockServiceAgeEvaluator) implements ConstraintValidatorFactoryInterface {
$validatorFactory = new class($mockVoucherService, $mockPriceCalculatorService, $mockParticipantEligibilityChecker, $mockServiceAgeEvaluator, $participantEligibilityChecker) implements ConstraintValidatorFactoryInterface {
public function __construct(
private readonly VoucherValidator $voucherService,
private readonly BookingPriceCalculator $priceCalculatorService,
private readonly ParticipantEligibilityChecker $participantEligibilityService,
private readonly ServiceAgeEvaluator $serviceAgeEvaluator,
private readonly ParticipantEligibilityChecker $realEligibilityChecker,
) {
}
@@ -75,6 +86,10 @@ class ParticipantEditDtoTest extends TestCase
return new EmailValidator(Email::VALIDATION_MODE_HTML5);
}
if (SkiPassSelectionValidator::class === $className) {
return new SkiPassSelectionValidator($this->realEligibilityChecker);
}
if (MandatoryAdditionalServicesSelectedValidator::class === $className) {
return new MandatoryAdditionalServicesSelectedValidator(
$this->participantEligibilityService,
@@ -312,9 +327,7 @@ class ParticipantEditDtoTest extends TestCase
public function testValidationInEditMode(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1); // hotelId must be int
@@ -483,9 +496,7 @@ class ParticipantEditDtoTest extends TestCase
public function testSkiPassNotRequiredForTwoYearOldInCreateMode(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1);
@@ -520,9 +531,7 @@ class ParticipantEditDtoTest extends TestCase
public function testSkiPassRequiredForThreeYearOldInCreateMode(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1);
@@ -555,11 +564,81 @@ class ParticipantEditDtoTest extends TestCase
$this->assertCount(1, $skiPassViolations, 'Participant over BABY_MAX_AGE (3 years) should require ski pass');
}
public function testSkiPassNotRequiredWhenTravelOffersNone(): void
{
$travel = $this->createTravelWithoutSkiPasses();
$bookingDto = new BookingDto($travel, 1);
$participant = $this->createParticipantWithoutSkiPass('[email protected]');
$participant->dateOfBirth = new \DateTimeImmutable('1990-01-01');
$participant->index = 0;
$participant->mobile = '+49 123 456789';
$participant->address = new Address();
$participant->address->street = 'Test Street 1';
$participant->address->postCode = '12345';
$participant->address->city = 'Test City';
$participant->address->country = 'DE';
$bookingDto->participants = [$participant];
$wrapper = new ParticipantEditDto(
participant: $bookingDto->participants[0],
bookingContext: $bookingDto,
);
$violations = $this->validator->validate($wrapper, null, ['strict_required']);
$skiPassViolations = array_filter(
iterator_to_array($violations),
fn ($v) => 'participant.skiPass' === $v->getPropertyPath()
);
$this->assertCount(0, $skiPassViolations, 'A travel offering no ski passes must be bookable without one');
}
public function testIneligibleParticipantIsReportedAsNotBookable(): void
{
// Ski passes exist, but the only one starts at 18 - a 14 year old cannot obtain any
$travel = $this->createTravelOfferingSkiPasses(ageFrom: 18);
$bookingDto = new BookingDto($travel, 1);
$participant = $this->createParticipantWithoutSkiPass('[email protected]');
$participant->dateOfBirth = $travel->dateFrom->modify('-14 years');
$participant->index = 0;
$participant->mobile = '+49 123 456789';
$participant->address = new Address();
$participant->address->street = 'Test Street 1';
$participant->address->postCode = '12345';
$participant->address->city = 'Test City';
$participant->address->country = 'DE';
$bookingDto->participants = [$participant];
$wrapper = new ParticipantEditDto(
participant: $bookingDto->participants[0],
bookingContext: $bookingDto,
);
$violations = $this->validator->validate($wrapper, null, ['strict_required']);
$skiPassViolations = array_values(array_filter(
iterator_to_array($violations),
fn ($v) => 'participant.skiPass' === $v->getPropertyPath()
));
$this->assertCount(1, $skiPassViolations);
$this->assertSame(
'Für Teilnehmer:in 1 ist keine Buchung möglich',
$skiPassViolations[0]->getMessage(),
'The user must not be asked to select from a field that is not rendered'
);
}
public function testSkiPassValidationSkippedInEditMode(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1);
@@ -599,9 +678,7 @@ class ParticipantEditDtoTest extends TestCase
public function testEditSubmissionValidatesApplicantAddressOnlyForFirstParticipant(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1);
$bookingDto->booking = new Booking();
@@ -644,9 +721,7 @@ class ParticipantEditDtoTest extends TestCase
public function testSkiPassAgeCalculatedAtTravelDate(): void
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1);
@@ -776,12 +851,42 @@ class ParticipantEditDtoTest extends TestCase
$this->assertCount(1, $insuranceViolations);
}
private function createBookingDtoWithParticipants(array $participants): BookingDto
/**
* Builds the default travel fixture: a regular travel that offers one unconstrained,
* available ski pass. Ski pass validation depends on the travel actually offering
* passes, so a travel without them is a distinct fixture, not the default.
*/
private function createTravelOfferingSkiPasses(?int $ageFrom = null): Travel
{
$travel = $this->createTravelWithoutSkiPasses();
$skiPass = new Service();
$skiPass->id = 900;
$skiPass->label = 'Test Ski Pass';
$skiPass->subType = Constants::TOKEN_SKI_PASS;
$skiPass->available = 10;
$skiPass->price = 100.0;
$skiPass->ageConstraintType = null === $ageFrom ? null : 'absolute_age';
$skiPass->ageFrom = $ageFrom;
$travel->additionalServices = [900 => $skiPass];
return $travel;
}
private function createTravelWithoutSkiPasses(): Travel
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('2025-06-01');
$travel->dateTo = new \DateTimeImmutable('2025-06-08');
return $travel;
}
private function createBookingDtoWithParticipants(array $participants): BookingDto
{
$travel = $this->createTravelOfferingSkiPasses();
$bookingDto = new BookingDto($travel, 1); // hotelId must be int
// Set index for each participant
tests/Form/Service/CreateFieldStateProviderTest.php
+6 -1
View File
@@ -9,7 +9,9 @@ use App\BusProNet\Model\Travel;
use App\Form\Model\BookingDto;
use App\Form\Model\ParticipantDto;
use App\Form\Service\CreateFieldStateProvider;
use App\Form\Service\ServiceAgeEvaluator;
use App\Service\ParticipantEligibilityChecker;
use App\Service\ServiceAvailabilityCalculator;
use PHPUnit\Framework\TestCase;
/**
@@ -24,7 +26,10 @@ class CreateFieldStateProviderTest extends TestCase
protected function setUp(): void
{
$this->provider = new CreateFieldStateProvider(new ParticipantEligibilityChecker());
$this->provider = new CreateFieldStateProvider(new ParticipantEligibilityChecker(
new ServiceAgeEvaluator(),
new ServiceAvailabilityCalculator()
));
}
public function testDependentInsuranceFieldHidesWhenApplicantSelectsFamilyInsuranceThenReappearsAfterSwitch(): void
tests/Form/Service/ParticipantFieldOptionsProviderSkiPassAvailabilityTest.php
+11
View File
@@ -134,6 +134,17 @@ class ParticipantFieldOptionsProviderSkiPassAvailabilityTest extends TestCase
}
}
public function testTravelWithoutSkiPassesRendersNoField(): void
{
$bookingDto = $this->createBookingDto([]);
$this->assertSame(
[],
$this->provider->getFieldOptions('skiPass', $bookingDto, 0),
'The field has to be absent entirely, not rendered with an empty choice list'
);
}
/** @return int[] */
private function getSkiPassChoiceIds(BookingDto $bookingDto): array
{
tests/Service/BookingEditPreFlightCheckerTest.php
+5
View File
@@ -21,6 +21,7 @@ use App\Form\Service\ServiceAgeEvaluator;
use App\Validator\Constraints\MandatoryAdditionalServicesSelectedValidator;
use App\Validator\Constraints\PromoVoucherValidator;
use App\Validator\Constraints\PurchaseVoucherValidator;
use App\Validator\Constraints\SkiPassSelectionValidator;
use Carbon\CarbonImmutable;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Validator\Constraint;
@@ -291,6 +292,10 @@ class BookingEditPreFlightCheckerTest extends TestCase
);
}
if (SkiPassSelectionValidator::class === $className) {
return new SkiPassSelectionValidator($this->participantEligibilityChecker);
}
return new $className();
}
};
tests/Service/ParticipantEligibilityCheckerTest.php
+144 -10
View File
@@ -9,7 +9,9 @@ use App\BusProNet\Model\Service;
use App\BusProNet\Model\Travel;
use App\Form\Model\BookingDto;
use App\Form\Model\ParticipantDto;
use App\Form\Service\ServiceAgeEvaluator;
use App\Service\ParticipantEligibilityChecker;
use App\Service\ServiceAvailabilityCalculator;
use PHPUnit\Framework\TestCase;
class ParticipantEligibilityCheckerTest extends TestCase
@@ -18,7 +20,10 @@ class ParticipantEligibilityCheckerTest extends TestCase
protected function setUp(): void
{
$this->service = new ParticipantEligibilityChecker();
$this->service = new ParticipantEligibilityChecker(
new ServiceAgeEvaluator(),
new ServiceAvailabilityCalculator()
);
}
public function testBabyParticipantIsAlwaysEligible(): void
@@ -53,9 +58,9 @@ class ParticipantEligibilityCheckerTest extends TestCase
$this->assertTrue($result, 'Participant at BABY_MAX_AGE (2 years) should be eligible');
}
public function testThreeYearOldParticipantIsNotBabyEligible(): void
public function testThreeYearOldParticipantIsNotExemptAsBaby(): void
{
$travel = $this->createTravelWithNoSkiPasses();
$travel = $this->createTravelWithSkiPasses(ageFrom: 6);
$bookingDto = new BookingDto($travel, 1);
// Create a participant just over BABY_MAX_AGE (3 years old at travel date)
@@ -64,9 +69,14 @@ class ParticipantEligibilityCheckerTest extends TestCase
$participant->dateOfBirth = $travel->dateFrom->modify('-3 years');
$bookingDto->participants[0] = $participant;
$result = $this->service->isParticipantEligible($bookingDto, 0);
$this->assertFalse($result, 'Participant over BABY_MAX_AGE (3 years) should not be eligible without ski passes');
$this->assertTrue(
$this->service->isSkiPassRequired($bookingDto, 0),
'Participant over BABY_MAX_AGE (3 years) should still need a ski pass'
);
$this->assertFalse(
$this->service->isParticipantEligible($bookingDto, 0),
'Participant over BABY_MAX_AGE (3 years) should not be eligible when no ski pass fits their age'
);
}
public function testAdultParticipantWithSkiPassIsEligible(): void
@@ -138,6 +148,128 @@ class ParticipantEligibilityCheckerTest extends TestCase
$this->assertTrue($result, 'Age should be calculated at travel date, not current date');
}
public function testAdultIsEligibleOnTravelWithoutSkiPasses(): void
{
$travel = $this->createTravelWithNoSkiPasses();
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-25 years');
$bookingDto->participants[0] = $participant;
$this->assertFalse(
$this->service->isSkiPassRequired($bookingDto, 0),
'A travel that offers no ski passes cannot require one'
);
$this->assertTrue(
$this->service->isParticipantEligible($bookingDto, 0),
'Adult should be eligible on a travel that offers no ski passes at all'
);
}
public function testTeenagerIsEligibleOnTravelWithoutSkiPasses(): void
{
$travel = $this->createTravelWithNoSkiPasses();
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-14 years');
$bookingDto->participants[0] = $participant;
$this->assertFalse($this->service->isSkiPassRequired($bookingDto, 0));
$this->assertTrue(
$this->service->isParticipantEligible($bookingDto, 0),
'Age must not be blamed when there is no ski pass to match against'
);
}
public function testParticipantIsNotEligibleWhenNoSkiPassMatchesTheirAge(): void
{
$travel = $this->createTravelWithSkiPasses(ageFrom: 18);
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-14 years');
$bookingDto->participants[0] = $participant;
$this->assertTrue($this->service->isSkiPassRequired($bookingDto, 0));
$this->assertFalse(
$this->service->isParticipantEligible($bookingDto, 0),
'Ski passes exist but none fits the age - the participant stays ineligible'
);
}
public function testParticipantIsNotEligibleWhenSkiPassIsSoldOut(): void
{
$travel = $this->createTravelWithSkiPasses(available: 0);
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-25 years');
$bookingDto->participants[0] = $participant;
$this->assertTrue(
$this->service->isSkiPassRequired($bookingDto, 0),
'A sold out ski pass must not turn the requirement off'
);
$this->assertFalse($this->service->isParticipantEligible($bookingDto, 0));
}
public function testParticipantIsNotEligibleWhenSkiPassIsOnBookingStop(): void
{
$travel = $this->createTravelWithSkiPasses(status: Constants::STATUS_BLOCKED);
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-25 years');
$bookingDto->participants[0] = $participant;
$this->assertTrue($this->service->isSkiPassRequired($bookingDto, 0));
$this->assertFalse($this->service->isParticipantEligible($bookingDto, 0));
}
public function testParticipantIsNotEligibleWhenLastSkiPassIsTakenByAnotherParticipant(): void
{
$travel = $this->createTravelWithSkiPasses(available: 1);
$bookingDto = new BookingDto($travel, 2);
$firstParticipant = new ParticipantDto();
$firstParticipant->index = 0;
$firstParticipant->dateOfBirth = $travel->dateFrom->modify('-25 years');
$firstParticipant->skiPass = $travel->additionalServices[1];
$bookingDto->participants[0] = $firstParticipant;
$secondParticipant = new ParticipantDto();
$secondParticipant->index = 1;
$secondParticipant->dateOfBirth = $travel->dateFrom->modify('-25 years');
$bookingDto->participants[1] = $secondParticipant;
$this->assertTrue($this->service->isParticipantEligible($bookingDto, 0));
$this->assertFalse(
$this->service->isParticipantEligible($bookingDto, 1),
'The only ski pass is consumed by the first participant'
);
}
public function testBabyNeedsNoSkiPassEvenWhenTravelOffersThem(): void
{
$travel = $this->createTravelWithSkiPasses();
$bookingDto = new BookingDto($travel, 1);
$participant = new ParticipantDto();
$participant->index = 0;
$participant->dateOfBirth = $travel->dateFrom->modify('-1 year');
$bookingDto->participants[0] = $participant;
$this->assertFalse($this->service->isSkiPassRequired($bookingDto, 0));
$this->assertTrue($this->service->isParticipantEligible($bookingDto, 0));
}
private function createTravelWithNoSkiPasses(): Travel
{
$travel = new Travel();
@@ -148,20 +280,22 @@ class ParticipantEligibilityCheckerTest extends TestCase
return $travel;
}
private function createTravelWithSkiPasses(): Travel
private function createTravelWithSkiPasses(?int $ageFrom = null, ?int $available = 10, ?string $status = null): Travel
{
$travel = new Travel();
$travel->dateFrom = new \DateTimeImmutable('+30 days');
$travel->dateTo = new \DateTimeImmutable('+37 days');
// Create a ski pass service available for all ages
// Create a ski pass service, by default available for all ages
$skiPass = new Service();
$skiPass->id = 1;
$skiPass->label = 'Test Ski Pass';
$skiPass->subType = Constants::TOKEN_SKI_PASS;
$skiPass->available = 10;
$skiPass->available = $available;
$skiPass->status = $status;
$skiPass->price = 100.0;
$skiPass->ageConstraintType = null; // No age constraint
$skiPass->ageConstraintType = null === $ageFrom ? null : 'absolute_age';
$skiPass->ageFrom = $ageFrom;
$skiPass->dateFrom = $travel->dateFrom;
$skiPass->dateTo = $travel->dateTo;