wip: modernized edit flow, fix insurance tier calculation

tests/BusProNet/DataProcessor/BookingDataProcessorTest.php

@@ -14,7 +14,7 @@ use App\BusProNet\Model\Pickup;
 use App\BusProNet\Model\Room;
 use App\BusProNet\Model\Service;
 use App\BusProNet\Model\Travel;
-use App\Form\Model\BookingEditDto;
+use App\Form\Model\BookingDto;
 use App\Form\Model\ParticipantDto;
 use PHPUnit\Framework\TestCase;
 
@@ -210,29 +210,31 @@ class BookingDataProcessorTest extends TestCase
         $this->assertArrayNotHasKey('zustiege', $result);
     }
 
-    private function createCompleteFormData(): BookingEditDto
+    private function createCompleteFormData(): BookingDto
     {
-        $formData = new BookingEditDto($this->createMockBooking(), $this->createMockTravel());
-        $formData->participants = [
+        $bookingDto = new BookingDto($this->createMockTravel(), 1);
+        $bookingDto->booking = $this->createMockBooking();
+        $bookingDto->participants = [
             $this->createMockParticipantDto(0, 'F'),
             $this->createMockParticipantDto(1, 'F'),
         ];
 
-        return $formData;
+        return $bookingDto;
     }
 
-    private function createFormDataWithCanceledParticipant(): BookingEditDto
+    private function createFormDataWithCanceledParticipant(): BookingDto
     {
-        $formData = new BookingEditDto($this->createMockBooking(), $this->createMockTravel());
-        $formData->participants = [
+        $bookingDto = new BookingDto($this->createMockTravel(), 1);
+        $bookingDto->booking = $this->createMockBooking();
+        $bookingDto->participants = [
             $this->createMockParticipantDto(0, 'F'),
             $this->createMockParticipantDto(1, 'S'), // Canceled
         ];
 
-        return $formData;
+        return $bookingDto;
     }
 
-    private function createFormDataWithAdditionalServices(): BookingEditDto
+    private function createFormDataWithAdditionalServices(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -243,7 +245,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithTransportation(): BookingEditDto
+    private function createFormDataWithTransportation(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -254,7 +256,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithBusPickup(): BookingEditDto
+    private function createFormDataWithBusPickup(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -267,7 +269,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithNonBusTransportation(): BookingEditDto
+    private function createFormDataWithNonBusTransportation(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -279,7 +281,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithUnusedServices(): BookingEditDto
+    private function createFormDataWithUnusedServices(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -289,7 +291,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithUpdatedPersonalData(): BookingEditDto
+    private function createFormDataWithUpdatedPersonalData(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -302,7 +304,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithInactiveParticipant(): BookingEditDto
+    private function createFormDataWithInactiveParticipant(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -318,7 +320,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataForApplicantSync(): BookingEditDto
+    private function createFormDataForApplicantSync(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -330,7 +332,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithBankAccount(): BookingEditDto
+    private function createFormDataWithBankAccount(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -345,7 +347,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithoutBankAccount(): BookingEditDto
+    private function createFormDataWithoutBankAccount(): BookingDto
     {
         $formData = $this->createCompleteFormData();
         $formData->booking->bankAccount = null;
@@ -353,7 +355,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithRooms(): BookingEditDto
+    private function createFormDataWithRooms(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -371,7 +373,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithoutExistingCommunication(): BookingEditDto
+    private function createFormDataWithoutExistingCommunication(): BookingDto
     {
         $formData = $this->createCompleteFormData();
 
@@ -384,7 +386,7 @@ class BookingDataProcessorTest extends TestCase
         return $formData;
     }
 
-    private function createFormDataWithoutPickups(): BookingEditDto
+    private function createFormDataWithoutPickups(): BookingDto
     {
         $formData = $this->createCompleteFormData();
         $formData->booking->pickupsOutbound = [];