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

fix: keep the booking room assignment when restoring an edit draft

Browse Source
This commit is contained in:
fromme
2026-09-14 15:02:04 +02:00
parent b41820c39d
commit 7aad54e6f2
2 changed files with 138 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Service/BookingEditDraftMerger.php
+23 -7
View File
@@ -18,8 +18,9 @@ use App\Form\Model\ParticipantDto;
*
* Service selections are gated by travel-level mutability flags (additionalServicesMutable,
* transportationServicesMutable, pickupsMutable). Insurance is always applied regardless
* of mutability. Merge strategy (only apply if resolves to a valid service) is used for
* single-select fields; overwrite strategy is used for multi-select and boolean fields.
* of mutability. Merge strategy (only apply if it resolves against the travel data) is used
* for single-select fields, room assignment included; overwrite strategy is used for
* multi-select, boolean and free-text fields.
*/
class BookingEditDraftMerger
{
@@ -52,7 +53,7 @@ class BookingEditDraftMerger
// Room assignment
if (true === isset($data['roomAssignment']) && true === is_array($data['roomAssignment'])) {
$this->applyRoomAssignment($participant, $data['roomAssignment']);
$this->applyRoomAssignment($participant, $data['roomAssignment'], $travel);
}
// License plate
@@ -156,12 +157,27 @@ class BookingEditDraftMerger
}
}
/** @param array<string, mixed> $data */
private function applyRoomAssignment(ParticipantDto $participant, array $data): void
/**
* Applies the drafted room assignment to the participant.
*
* The room id uses the same merge strategy as single-select services: it is only
* applied when it resolves to a room of the current travel. A draft may therefore move
* a participant to another room, but never unassign one. Edit mode renders the room as
* static text and never submits assignedRoomId, so a null in the draft is only ever an
* artefact of a snapshot taken before BusPro reported the assignment - replaying it
* would drop the participant's room, both in the UI and in the outbound zuordnung.
*
* remarksRoom keeps overwrite semantics: it is free text the user can deliberately clear.
*
* @param array<string, mixed> $data
*/
private function applyRoomAssignment(ParticipantDto $participant, array $data, Travel $travel): void
{
if (true === array_key_exists('assignedRoomId', $data)) {
$participant->assignedRoomId = $data['assignedRoomId'];
$assignedRoomId = $data['assignedRoomId'] ?? null;
if (null !== $assignedRoomId && null !== $travel->getRoomById((int) $assignedRoomId)) {
$participant->assignedRoomId = (int) $assignedRoomId;
}
if (true === array_key_exists('remarksRoom', $data)) {
$participant->remarksRoom = $data['remarksRoom'];
}