feat: replace *Service suffix with role-based class names

src/Controller/Account/PersonalDataController.php

@@ -13,10 +13,10 @@ use App\Exception\NewsletterProviderException;
 use App\Form\PersonalDataType;
 use App\Repository\NewsletterOptInConfirmationRepository;
 use App\Security\Crypt;
-use App\Service\BookingEditDataLoaderService;
+use App\Service\BookingEditDataLoader;
 use App\Service\ProfileCompletenessChecker;
-use App\Service\MailjetNewsletterService;
-use App\Service\NewsletterDoubleOptInService;
+use App\Service\MailjetApiClient;
+use App\Service\NewsletterManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -39,7 +39,7 @@ class PersonalDataController extends AbstractController
     /**
      * @param ApiClient                    $apiClient           BusProNet API client for data operations
      * @param Crypt                        $crypt               Encryption service for password handling
-     * @param BookingEditDataLoaderService $dataLoader          Data loader for cache invalidation
+     * @param BookingEditDataLoader $dataLoader          Data loader for cache invalidation
      * @param ProfileCompletenessChecker   $completenessChecker Profile validation service
      * @param EntityManagerInterface       $entityManager       Entity manager for persisting user changes
      * @param LoggerInterface              $logger              Logger for audit trails and debugging
@@ -47,11 +47,11 @@ class PersonalDataController extends AbstractController
     public function __construct(
         private readonly ApiClient $apiClient,
         private readonly Crypt $crypt,
-        private readonly BookingEditDataLoaderService $dataLoader,
+        private readonly BookingEditDataLoader $dataLoader,
         private readonly ProfileCompletenessChecker $completenessChecker,
         private readonly EntityManagerInterface $entityManager,
-        private readonly MailjetNewsletterService $newsletterService,
-        private readonly NewsletterDoubleOptInService $doubleOptInService,
+        private readonly MailjetApiClient $newsletterService,
+        private readonly NewsletterManager $doubleOptInService,
         private readonly NewsletterOptInConfirmationRepository $newsletterConfirmationRepository,
         private readonly LoggerInterface $logger,
     ) {

src/Controller/Admin/BookingEditDraftCrudController.php

@@ -7,7 +7,7 @@ namespace App\Controller\Admin;
 use App\Admin\Field\JsonDataField;
 use App\Entity\BookingEditDraft;
 use App\Entity\User;
-use App\Service\BookingExportService;
+use App\Service\BookingExporter;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -22,7 +22,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class BookingEditDraftCrudController extends AbstractCrudController
 {
     public function __construct(
-        private readonly BookingExportService $exportService,
+        private readonly BookingExporter $exportService,
         private readonly AdminUrlGenerator $adminUrlGenerator,
     ) {
     }

src/Controller/Admin/LogEntryCrudController.php

@@ -7,7 +7,7 @@ namespace App\Controller\Admin;
 use App\Admin\Field\JsonDataField;
 use App\Entity\LogEntry;
 use App\Repository\LogEntryRepository;
-use App\Service\XmlDumpService;
+use App\Service\XmlDumpReader;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
@@ -70,7 +70,7 @@ class LogEntryCrudController extends AbstractCrudController
         yield JsonDataField::new('extra', 'Extra')->onlyOnDetail();
     }
 
-    public function xmlDumps(Request $request, XmlDumpService $xmlDumpService): Response
+    public function xmlDumps(Request $request, XmlDumpReader $xmlDumpService): Response
     {
         $entityId = $request->query->getInt('entityId');
         if ($entityId <= 0) {

src/Controller/Admin/XmlDumpController.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace App\Controller\Admin;
 
 use App\Repository\LogEntryRepository;
-use App\Service\XmlDumpService;
+use App\Service\XmlDumpReader;
 use League\Flysystem\FilesystemException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -19,7 +19,7 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
 class XmlDumpController extends AbstractController
 {
     public function __construct(
-        private readonly XmlDumpService $xmlDumpService,
+        private readonly XmlDumpReader $xmlDumpService,
         private readonly LogEntryRepository $logEntryRepository,
     ) {
     }

src/Controller/Api/TravelController.php

@@ -6,7 +6,7 @@ use App\BusProNet\ApiClient;
 use App\BusProNet\Exception\ApiClientException;
 use App\BusProNet\Model\Travel;
 use App\BusProNet\Utility\DateCodeUtility;
-use App\Service\TravelDataService;
+use App\Service\TravelDataProvider;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -21,7 +21,7 @@ class TravelController extends AbstractController
 {
     public function __construct(
         private readonly ApiClient $apiClient,
-        private readonly TravelDataService $travelDataService,
+        private readonly TravelDataProvider $travelDataService,
     ) {
     }
 

src/Controller/Booking/Create/IndexController.php

@@ -11,9 +11,9 @@ use App\Exception\NoRoomsAvailableException;
 use App\Exception\TravelNotFoundException;
 use App\Htmx\HxTrait;
 use App\Model\BookingQueryParams;
-use App\Service\BookingService;
-use App\Service\BookingSessionService;
-use App\Service\BookingSummaryDataService;
+use App\Service\BookingConfigurator;
+use App\Service\BookingSessionStore;
+use App\Service\BookingSummaryAssembler;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -32,10 +32,10 @@ class IndexController extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingService $bookingService,
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingConfigurator $bookingService,
+        private readonly BookingSessionStore $bookingSessionService,
         private readonly AgencyLoader $agencyLoader,
-        private readonly BookingSummaryDataService $summaryDataService,
+        private readonly BookingSummaryAssembler $summaryDataService,
     ) {
     }
 

src/Controller/Booking/Create/Step1Controller.php

@@ -10,8 +10,8 @@ use App\Form\BookingCreateStep1Type;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
 use App\Service\BookingCreateContextFactory;
-use App\Service\BookingService;
-use App\Service\BookingSessionService;
+use App\Service\BookingConfigurator;
+use App\Service\BookingSessionStore;
 use App\Service\RoomPricingCalculator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,8 +31,8 @@ class Step1Controller extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingService $bookingService,
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingConfigurator $bookingService,
+        private readonly BookingSessionStore $bookingSessionService,
         private readonly BookingCreateContextFactory $createContextFactory,
     ) {
     }

src/Controller/Booking/Create/Step2ParticipantController.php

@@ -8,11 +8,11 @@ use App\Form\BookingParticipantType;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
 use App\Service\BookingCreateContextFactory;
-use App\Service\BookingService;
-use App\Service\BookingSessionService;
-use App\Service\ParticipantFormSupportService;
-use App\Service\ParticipantPrepopulationService;
-use App\Service\TravelDataService;
+use App\Service\BookingConfigurator;
+use App\Service\BookingSessionStore;
+use App\Service\ParticipantFormSupport;
+use App\Service\ParticipantDataPrefiller;
+use App\Service\TravelDataProvider;
 use App\Service\RoomPricingCalculator;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
@@ -28,12 +28,12 @@ class Step2ParticipantController extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingService $bookingService,
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingConfigurator $bookingService,
+        private readonly BookingSessionStore $bookingSessionService,
         private readonly BookingCreateContextFactory $createContextFactory,
-        private readonly TravelDataService $travelDataService,
-        private readonly ParticipantPrepopulationService $prepopulationService,
-        private readonly ParticipantFormSupportService $participantFormSupportService,
+        private readonly TravelDataProvider $travelDataService,
+        private readonly ParticipantDataPrefiller $prepopulationService,
+        private readonly ParticipantFormSupport $participantFormSupportService,
     ) {
     }
 

src/Controller/Booking/Create/Step3Controller.php

@@ -14,10 +14,10 @@ use App\Form\BookingCreateStep3Type;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
 use App\Service\BookingCreateContextFactory;
-use App\Service\BookingPriceCalculatorService;
-use App\Service\BookingPriceMismatchDiagnosticsService;
-use App\Service\BookingService;
-use App\Service\BookingSessionService;
+use App\Service\BookingPriceCalculator;
+use App\Service\BookingPriceMismatchAnalyzer;
+use App\Service\BookingConfigurator;
+use App\Service\BookingSessionStore;
 use App\Service\RoomPricingCalculator;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -36,11 +36,11 @@ class Step3Controller extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingService $bookingService,
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingConfigurator $bookingService,
+        private readonly BookingSessionStore $bookingSessionService,
         private readonly BookingCreateContextFactory $createContextFactory,
-        private readonly BookingPriceCalculatorService $priceCalculator,
-        private readonly BookingPriceMismatchDiagnosticsService $priceMismatchDiagnostics,
+        private readonly BookingPriceCalculator $priceCalculator,
+        private readonly BookingPriceMismatchAnalyzer $priceMismatchDiagnostics,
         private readonly ApiClient $apiClient,
         private readonly LoggerInterface $logger,
     ) {

src/Controller/Booking/Create/Step4Controller.php

@@ -15,11 +15,11 @@ use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
 use App\Entity\User;
 use App\Service\BookingCreateContextFactory;
-use App\Service\BookingPriceCalculatorService;
-use App\Service\BookingService;
-use App\Service\BookingSessionService;
-use App\Service\MailjetNewsletterService;
-use App\Service\NewsletterDoubleOptInService;
+use App\Service\BookingPriceCalculator;
+use App\Service\BookingConfigurator;
+use App\Service\BookingSessionStore;
+use App\Service\MailjetApiClient;
+use App\Service\NewsletterManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormInterface;
@@ -38,14 +38,14 @@ class Step4Controller extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingService $bookingService,
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingConfigurator $bookingService,
+        private readonly BookingSessionStore $bookingSessionService,
         private readonly BookingCreateContextFactory $createContextFactory,
-        private readonly BookingPriceCalculatorService $priceCalculator,
+        private readonly BookingPriceCalculator $priceCalculator,
         private readonly ApiClient $apiClient,
         private readonly CacheInterface $cache,
-        private readonly MailjetNewsletterService $newsletterService,
-        private readonly NewsletterDoubleOptInService $doubleOptInService,
+        private readonly MailjetApiClient $newsletterService,
+        private readonly NewsletterManager $doubleOptInService,
         private readonly LoggerInterface $logger,
     ) {
     }

src/Controller/Booking/Create/SuccessController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controller\Booking\Create;
 
-use App\Service\BookingSessionService;
+use App\Service\BookingSessionStore;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -16,7 +16,7 @@ use Symfony\Component\Routing\Attribute\Route;
 class SuccessController extends AbstractController
 {
     public function __construct(
-        private readonly BookingSessionService $bookingSessionService,
+        private readonly BookingSessionStore $bookingSessionService,
     ) {
     }
 

src/Controller/Booking/Edit/IndexController.php

@@ -11,12 +11,12 @@ use App\Exception\TravelNotFoundException;
 use App\Form\BookingEditType;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
-use App\Service\BookingEditDataLoaderService;
-use App\Service\BookingEditDraftService;
+use App\Service\BookingEditDataLoader;
+use App\Service\BookingEditDraftManager;
 use App\Service\BookingEditContextFactory;
-use App\Service\BookingFingerprintService;
-use App\Service\BookingEditSubmitService;
-use App\Service\BookingSessionService;
+use App\Service\BookingChangeTracker;
+use App\Service\BookingEditSubmitter;
+use App\Service\BookingSessionStore;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -30,7 +30,7 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
  * - Card overview with lazy-loaded individual participant forms
  * - Handles canceled participants (status 'S')
  * - Applies mutability constraints via EditFieldStateProvider
- * - Final submission is delegated to BookingEditSubmitService
+ * - Final submission is delegated to BookingEditSubmitter
  */
 class IndexController extends AbstractController
 {
@@ -38,12 +38,12 @@ class IndexController extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingEditDataLoaderService $dataLoader,
-        private readonly BookingEditDraftService $draftService,
-        private readonly BookingSessionService $bookingSessionService,
-        private readonly BookingFingerprintService $fingerprintService,
+        private readonly BookingEditDataLoader $dataLoader,
+        private readonly BookingEditDraftManager $draftService,
+        private readonly BookingSessionStore $bookingSessionService,
+        private readonly BookingChangeTracker $fingerprintService,
         private readonly BookingEditContextFactory $editContextFactory,
-        private readonly BookingEditSubmitService $submitService,
+        private readonly BookingEditSubmitter $submitService,
     ) {
     }
 

src/Controller/Booking/Edit/ParticipantController.php

@@ -10,11 +10,11 @@ use App\Entity\User;
 use App\Form\BookingParticipantType;
 use App\Form\Model\BookingDto;
 use App\Htmx\HxTrait;
-use App\Service\BookingEditDataLoaderService;
+use App\Service\BookingEditDataLoader;
 use App\Service\BookingEditContextFactory;
-use App\Service\BookingEditDraftService;
-use App\Service\BookingSessionService;
-use App\Service\ParticipantFormSupportService;
+use App\Service\BookingEditDraftManager;
+use App\Service\BookingSessionStore;
+use App\Service\ParticipantFormSupport;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -29,11 +29,11 @@ class ParticipantController extends AbstractController
     use HxTrait;
 
     public function __construct(
-        private readonly BookingEditDataLoaderService $dataLoader,
-        private readonly BookingEditDraftService $draftService,
+        private readonly BookingEditDataLoader $dataLoader,
+        private readonly BookingEditDraftManager $draftService,
         private readonly BookingEditContextFactory $editContextFactory,
-        private readonly BookingSessionService $bookingSessionService,
-        private readonly ParticipantFormSupportService $participantFormSupportService,
+        private readonly BookingSessionStore $bookingSessionService,
+        private readonly ParticipantFormSupport $participantFormSupportService,
     ) {
     }
 

src/Controller/Booking/Traits/BookingExceptionHandlerTrait.php

@@ -10,7 +10,7 @@ use App\Exception\HotelNotInTravelException;
 use App\Exception\NoRoomsAvailableException;
 use App\Exception\TravelNotFoundException;
 use App\Form\Model\BookingDto;
-use App\Service\BookingSessionService;
+use App\Service\BookingSessionStore;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -29,7 +29,7 @@ trait BookingExceptionHandlerTrait
      * Handles all booking-related exceptions and provides appropriate user feedback
      * by redirecting to the error page with flash messages.
      */
-    protected function getOrCreateBookingCreateDto(BookingSessionService $bookingSessionService, Request $request): BookingDto|RedirectResponse
+    protected function getOrCreateBookingCreateDto(BookingSessionStore $bookingSessionService, Request $request): BookingDto|RedirectResponse
     {
         try {
             return $bookingSessionService->getOrCreateBookingCreateDto($request);
@@ -62,7 +62,7 @@ trait BookingExceptionHandlerTrait
      * Returns empty 400 responses for HTMX requests when exceptions occur,
      * allowing the frontend to handle errors appropriately.
      */
-    protected function getOrCreateBookingCreateDtoForHtmx(BookingSessionService $bookingSessionService, Request $request): mixed
+    protected function getOrCreateBookingCreateDtoForHtmx(BookingSessionStore $bookingSessionService, Request $request): mixed
     {
         try {
             return $bookingSessionService->getOrCreateBookingCreateDto($request);

src/Controller/Newsletter/ConfirmController.php

@@ -6,7 +6,7 @@ namespace App\Controller\Newsletter;
 
 use App\Exception\NewsletterProviderException;
 use App\Model\NewsletterConfirmationResult;
-use App\Service\NewsletterDoubleOptInService;
+use App\Service\NewsletterManager;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Response;
@@ -16,7 +16,7 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
 class ConfirmController extends AbstractController
 {
     public function __construct(
-        private readonly NewsletterDoubleOptInService $doubleOptInService,
+        private readonly NewsletterManager $doubleOptInService,
         private readonly LoggerInterface $logger,
     ) {
     }

src/Controller/SecurityController.php

@@ -2,8 +2,8 @@
 
 namespace App\Controller;
 
-use App\Service\BookingSessionService;
-use App\Service\BookingSummaryDataService;
+use App\Service\BookingSessionStore;
+use App\Service\BookingSummaryAssembler;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -18,11 +18,11 @@ class SecurityController extends AbstractController
     public function login(
         AuthenticationUtils $authenticationUtils,
         Request $request,
-        BookingSessionService $bookingSessionService,
-        BookingSummaryDataService $summaryDataService,
+        BookingSessionStore $bookingSessionService,
+        BookingSummaryAssembler $summaryDataService,
     ): Response {
         // Check if this is a booking flow (BookingDto exists in session)
-        $bookingDto = $bookingSessionService->getBookingDto($request, BookingSessionService::BOOKING_CREATE_KEY);
+        $bookingDto = $bookingSessionService->getBookingDto($request, BookingSessionStore::BOOKING_CREATE_KEY);
         $isBookingFlow = null !== $bookingDto;
 
         // If authenticated and in booking flow, proceed to Step 1