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

feat: refactor participant card DTOs and labels

Browse Source
This commit is contained in:
Björn Fromme
2026-04-11 18:28:32 +02:00
parent f22ceae41c
commit 1b0e479e49
10 changed files with 299 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Form/Model/ParticipantCardDataDto.php
+43
View File
@@ -0,0 +1,43 @@
<?php
declare(strict_types=1);
namespace App\Form\Model;
/**
* Typed participant card payload for create/edit overview rendering.
*/
final class ParticipantCardDataDto
{
/**
* @param array<string> $errorMessages
*/
public function __construct(
public readonly string $name,
public readonly string $email,
public readonly string $roomName,
public readonly ParticipantCardPriceDto $price,
public readonly bool $isCanceled,
public readonly bool $isValid = true,
public readonly array $errorMessages = [],
) {
}
/**
* Returns a copy with validation state applied.
*
* @param array<string> $errorMessages
*/
public function withValidation(bool $isValid, array $errorMessages): self
{
return new self(
name: $this->name,
email: $this->email,
roomName: $this->roomName,
price: $this->price,
isCanceled: $this->isCanceled,
isValid: $isValid,
errorMessages: $errorMessages,
);
}
}
src/Form/Model/ParticipantCardPriceDto.php
+17
View File
@@ -0,0 +1,17 @@
<?php
declare(strict_types=1);
namespace App\Form\Model;
/**
* Typed price display state for a participant card.
*/
final class ParticipantCardPriceDto
{
public function __construct(
public readonly ?float $amount,
public readonly bool $showDash,
) {
}
}
src/Form/Service/ParticipantFieldOptionsProvider.php
+11 -69
View File
@@ -16,6 +16,7 @@ use App\Form\Model\RoomSelectionDto;
use App\Form\Service\Abstract\AbstractFieldOptionsProvider;
use App\Service\BookingPriceCalculatorService;
use App\Service\InsuranceService;
use App\Service\ServiceLabelFormatter;
use App\Service\ServiceAvailabilityCalculator;
use Symfony\Contracts\Translation\TranslatorInterface;
@@ -42,6 +43,7 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
private readonly ServiceAvailabilityCalculator $serviceAvailabilityCalculator,
private readonly InsuranceService $insuranceService,
private readonly BookingPriceCalculatorService $priceCalculatorService,
private readonly ServiceLabelFormatter $serviceLabelFormatter,
private readonly TranslatorInterface $translator,
) {
parent::__construct();
@@ -303,11 +305,8 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
if (null === $service) {
return null;
}
$priceLabel = (null === $service->price || 0.0 === $service->price)
? 'inkl.'
: number_format($service->price, 2, ',', '.').' €';
return $service->label.' ('.$priceLabel.')';
return $this->serviceLabelFormatter->formatServiceLabel($service);
},
'choice_attr' => function (?Service $service) use ($bookingDto, $participantIndex) {
if (null === $service) {
@@ -405,7 +404,10 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
// Rental insurance field provider - provides rental insurance options when rental services are selected
$this->fieldOptionProviders['rentalInsurance'] = fn (BookingDto $bookingDto, int $participantIndex, array $options = []) => [
'label' => $this->getRentalInsuranceCheckboxLabel($bookingDto->travel->getAdditionalServicesBySubTypes(Constants::TOKEN_RENTAL_INSURANCE, true)),
'label' => $this->serviceLabelFormatter->formatServiceLabelForServices(
Constants::SERVICE_LABELS[Constants::TOKEN_RENTAL_INSURANCE],
$bookingDto->travel->getAdditionalServicesBySubTypes(Constants::TOKEN_RENTAL_INSURANCE, true)
),
'required' => false,
'property_path' => 'rentalInsuranceSelected',
'help' => $this->getRentalInsuranceDescription($bookingDto->travel->getAdditionalServicesBySubTypes(Constants::TOKEN_RENTAL_INSURANCE, true)),
@@ -645,7 +647,10 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
}
return [
'label' => $this->getParkingCheckboxLabel($parkingServices),
'label' => $this->serviceLabelFormatter->formatServiceLabelForServices(
Constants::SERVICE_LABELS[Constants::TOKEN_PARKING],
$parkingServices
),
'required' => false,
];
};
@@ -833,56 +838,6 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
});
}
/**
* Formats service label with pricing information.
*
* @param Service|null $service The service to format
*
* @return string The formatted label
*/
private function formatServiceLabelWithPrice(?Service $service): string
{
if (null === $service) {
return '';
}
if (null === $service->price) {
return $service->label;
}
if (0.0 === $service->price) {
return sprintf('%s (inkl.)', $service->label);
}
if ($service->price < 0) {
// Negative prices are discounts
return sprintf('%s (-%s€ Rabatt)', $service->label, number_format(abs($service->price), 2, ',', '.'));
}
return sprintf('%s (€%s)', $service->label, number_format($service->price, 2, ',', '.'));
}
/**
* Gets the parking checkbox label with pricing information.
*
* Creates a checkbox label for the single parking service including pricing.
* Since there's only ever one parking type, we take the first available service.
*
* @param array $parkingServices Array of available parking services
*
* @return string The formatted checkbox label with pricing
*/
private function getParkingCheckboxLabel(array $parkingServices): string
{
if (empty($parkingServices)) {
return Constants::SERVICE_LABELS[Constants::TOKEN_PARKING];
}
$parkingService = reset($parkingServices); // Get the first (and only) parking service
return $this->formatServiceLabelWithPrice($parkingService);
}
/**
* Checks if a service should be rendered as read-only due to unavailability.
*
@@ -1154,19 +1109,6 @@ class ParticipantFieldOptionsProvider extends AbstractFieldOptionsProvider
return '';
}
/**
* Generates label for rental insurance checkbox including pricing information.
*/
private function getRentalInsuranceCheckboxLabel(array $rentalInsuranceServices): string
{
if (empty($rentalInsuranceServices)) {
return Constants::SERVICE_LABELS[Constants::TOKEN_RENTAL_INSURANCE];
}
$rentalInsuranceService = reset($rentalInsuranceServices); // Get the first (and only) rental insurance service
return $this->formatServiceLabelWithPrice($rentalInsuranceService);
}
/**
* Gets the rental insurance description for help text.
*/
src/Service/ParticipantCardDataService.php
+30 -29
View File
@@ -5,6 +5,8 @@ declare(strict_types=1);
namespace App\Service;
use App\Form\Model\BookingDto;
use App\Form\Model\ParticipantCardDataDto;
use App\Form\Model\ParticipantCardPriceDto;
use App\Form\Model\ParticipantEditDto;
use Symfony\Component\Validator\Validator\ValidatorInterface;
@@ -25,9 +27,9 @@ class ParticipantCardDataService
/**
* Get card data for a single participant.
*
* @return array{name: string, email: string, roomName: string, price: string, isCanceled: bool}
* @return ParticipantCardDataDto
*/
public function getCardData(BookingDto $bookingDto, int $index): array
public function getCardData(BookingDto $bookingDto, int $index): ParticipantCardDataDto
{
$participant = $bookingDto->participants[$index] ?? null;
@@ -44,31 +46,31 @@ class ParticipantCardDataService
// Extract room name
$roomName = $this->getRoomName($bookingDto, $participant);
// Calculate and format individual price
$price = $this->getFormattedPrice($bookingDto, $index);
// Calculate pricing state for display
$priceData = $this->getPriceData($bookingDto, $index);
// Check if participant is canceled
$isCanceled = $participant->isCanceled();
return [
'name' => $name,
'email' => $email,
'roomName' => $roomName,
'price' => $price,
'isCanceled' => $isCanceled,
];
return new ParticipantCardDataDto(
name: $name,
email: $email,
roomName: $roomName,
price: $priceData,
isCanceled: $isCanceled,
);
}
/**
* Get card data for all participants.
*
* @return array<int, array{name: string, email: string, roomName: string, price: string, isCanceled: bool}>
* @return array<int, ParticipantCardDataDto>
*/
public function getAllCardsData(BookingDto $bookingDto): array
{
$cardsData = [];
foreach ($bookingDto->participants as $index => $participant) {
foreach ($bookingDto->participants as $index => $_participant) {
$cardsData[$index] = $this->getCardData($bookingDto, $index);
}
@@ -118,12 +120,14 @@ class ParticipantCardDataService
}
/**
* Calculate and format individual participant price.
* Calculate individual participant price display state.
*
* Returns a dash (-) when the price is zero and no room is assigned,
* Returns a dash marker when the price is zero and no room is assigned,
* indicating incomplete configuration rather than a zero-cost booking.
*
* @return ParticipantCardPriceDto
*/
private function getFormattedPrice(BookingDto $bookingDto, int $index): string
private function getPriceData(BookingDto $bookingDto, int $index): ParticipantCardPriceDto
{
// Check if canceled (only possible in edit mode when booking property is set)
$isCanceled = ($bookingDto->booking?->participantsStatus[$index] ?? null) === 'S';
@@ -131,7 +135,7 @@ class ParticipantCardDataService
if (true === $isCanceled) {
// Calculate surcharge total for canceled participant
if (null === $bookingDto->booking) {
return '-';
return new ParticipantCardPriceDto(null, true);
}
$surcharges = $bookingDto->booking->getSurchargesForParticipant($index);
@@ -143,10 +147,10 @@ class ParticipantCardDataService
// Show nothing if no surcharges, otherwise show "x,xx € Stornokosten"
if (0.0 === $surchargeTotal) {
return '-';
return new ParticipantCardPriceDto(null, true);
}
return number_format($surchargeTotal, 2, ',', '.').' € Stornokosten';
return new ParticipantCardPriceDto($surchargeTotal, false);
}
// For active participants: existing price calculation logic
@@ -157,18 +161,18 @@ class ParticipantCardDataService
// Display dash when price is zero and no room assigned (incomplete configuration)
$participant = $bookingDto->participants[$index] ?? null;
if (0.0 === $price && (null === $participant || null === $participant->assignedRoomId)) {
return '-';
return new ParticipantCardPriceDto(null, true);
}
return number_format($price, 2, ',', '.').' €';
return new ParticipantCardPriceDto($price, false);
}
/**
* Get card data for a single participant with validation state.
*
* @return array{name: string, email: string, roomName: string, price: string, isCanceled: bool, isValid: bool, errorMessages: array<string>}
* @return ParticipantCardDataDto
*/
public function getCardDataWithValidation(BookingDto $bookingDto, int $index): array
public function getCardDataWithValidation(BookingDto $bookingDto, int $index): ParticipantCardDataDto
{
$participant = $bookingDto->participants[$index] ?? null;
@@ -199,22 +203,19 @@ class ParticipantCardDataService
$errorMessages[] = $violation->getMessage();
}
return array_merge($cardData, [
'isValid' => $isValid,
'errorMessages' => $errorMessages,
]);
return $cardData->withValidation($isValid, $errorMessages);
}
/**
* Get card data for all participants with validation state.
*
* @return array<int, array{name: string, email: string, roomName: string, price: string, isCanceled: bool, isValid: bool, errorMessages: array<string>}>
* @return array<int, ParticipantCardDataDto>
*/
public function getAllCardsDataWithValidation(BookingDto $bookingDto): array
{
$cardsData = [];
foreach ($bookingDto->participants as $index => $participant) {
foreach ($bookingDto->participants as $index => $_participant) {
$cardsData[$index] = $this->getCardDataWithValidation($bookingDto, $index);
}
src/Service/ServiceLabelFormatter.php
+49
View File
@@ -0,0 +1,49 @@
<?php
declare(strict_types=1);
namespace App\Service;
use App\BusProNet\Model\Service;
/**
* Formats service labels for form and UI display.
*/
final class ServiceLabelFormatter
{
public function formatServiceLabel(Service $service): string
{
$label = $service->label ?? '';
if (null === $service->price) {
return $label;
}
if (0.0 === $service->price) {
return sprintf('%s (inkl.)', $label);
}
if ($service->price < 0) {
return sprintf('%s (-%s€ Rabatt)', $label, number_format(abs($service->price), 2, ',', '.'));
}
return sprintf('%s (€%s)', $label, number_format($service->price, 2, ',', '.'));
}
/**
* @param array<int, Service> $services
*/
public function formatServiceLabelForServices(string $fallbackLabel, array $services): string
{
$service = reset($services);
if (false === $service) {
return $fallbackLabel;
}
if (!($service instanceof Service)) {
return $fallbackLabel;
}
return $this->formatServiceLabel($service);
}
}