feat: manual sorting of additional services

src/Controller/Admin/Accommodation/EditController.php

@@ -12,6 +12,7 @@ use App\Service\CmsDataProvider;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
@@ -57,8 +58,8 @@ class EditController extends AbstractController
         $boardServices = $accommodation->getBoardServices()->toArray();
         usort($boardServices, $this->compareServices(...));
 
+        // Additional services are ordered manually, see #[ORM\OrderBy] on the association.
         $additionalServices = $accommodation->getAdditionalServices()->toArray();
-        usort($additionalServices, $this->compareServices(...));
 
         return $this->render('admin/accommodation/edit.html.twig', [
             'accommodation' => $accommodation,
@@ -69,10 +70,59 @@ class EditController extends AbstractController
         ]);
     }
 
+    /**
+     * Receives the additional service ids in their new order and renumbers the positions.
+     *
+     * Ids are only accepted when they belong to the given accommodation; services missing from the
+     * payload (e.g. created in another tab in the meantime) are appended in their previous order.
+     */
+    #[Route('/admin/accommodation/{id}/additional-services/order', name: 'app_admin_accommodation_additionalservices_order', methods: ['POST'])]
+    public function orderAdditionalServices(Accommodation $accommodation, Request $request): Response
+    {
+        try {
+            $payload = json_decode($request->getContent(), true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException) {
+            return new JsonResponse(['error' => 'Malformed payload'], Response::HTTP_BAD_REQUEST);
+        }
+
+        if (!\is_array($payload) || !\is_array($payload['ids'] ?? null)) {
+            return new JsonResponse(['error' => 'Malformed payload'], Response::HTTP_BAD_REQUEST);
+        }
+
+        /** @var array<int, AdditionalService> $remaining */
+        $remaining = [];
+
+        foreach ($accommodation->getAdditionalServices() as $additionalService) {
+            $remaining[$additionalService->getId()] = $additionalService;
+        }
+
+        $position = 0;
+
+        foreach ($payload['ids'] as $id) {
+            $id = \is_numeric($id) ? (int) $id : null;
+
+            if (null === $id || !isset($remaining[$id])) {
+                continue;
+            }
+
+            $remaining[$id]->setPosition(++$position);
+            unset($remaining[$id]);
+        }
+
+        // Whatever was not part of the payload keeps its relative order behind the sorted ones.
+        foreach ($remaining as $additionalService) {
+            $additionalService->setPosition(++$position);
+        }
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(['status' => 'ok']);
+    }
+
     /**
      * DateFrom ascending, then free (price 0) before paid, then alphabetically by label.
      */
-    private function compareServices(BoardService|AdditionalService $a, BoardService|AdditionalService $b): int
+    private function compareServices(BoardService $a, BoardService $b): int
     {
         $aFree = 0 === $a->getPrice() ? 0 : 1;
         $bFree = 0 === $b->getPrice() ? 0 : 1;

src/Entity/Groups/Accommodation.php

@@ -52,7 +52,7 @@ class Accommodation implements BlameableEntityInterface, TimestampableEntityInte
      * @var Collection<int, AdditionalService>
      */
     #[ORM\OneToMany(targetEntity: AdditionalService::class, mappedBy: 'accommodation', cascade: ['all'])]
-    #[ORM\OrderBy(['dateFrom' => 'ASC', 'label' => 'ASC'])]
+    #[ORM\OrderBy(['position' => 'ASC', 'dateFrom' => 'ASC', 'id' => 'ASC'])]
     private Collection $additionalServices;
 
     #[ORM\Column]

src/Entity/Groups/AdditionalService.php

@@ -59,6 +59,12 @@ class AdditionalService implements BlameableEntityInterface, TimestampableEntity
     #[ORM\Column]
     private bool $isExclusive = false;
 
+    /**
+     * Manual presentation order within the accommodation, maintained by drag & drop in the admin.
+     */
+    #[ORM\Column]
+    private int $position = 0;
+
     public function __clone()
     {
         $this->id = null;
@@ -188,4 +194,16 @@ class AdditionalService implements BlameableEntityInterface, TimestampableEntity
 
         return $this;
     }
+
+    public function getPosition(): int
+    {
+        return $this->position;
+    }
+
+    public function setPosition(int $position): self
+    {
+        $this->position = $position;
+
+        return $this;
+    }
 }

src/Repository/Groups/AdditionalServiceRepository.php

@@ -6,6 +6,7 @@ namespace App\Repository\Groups;
 
 use App\Entity\Groups\AdditionalService;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ManagerRegistry;
 
 /**
@@ -20,4 +21,16 @@ class AdditionalServiceRepository extends ServiceEntityRepository
     {
         parent::__construct($registry, AdditionalService::class);
     }
+
+    /**
+     * Additional services are ordered manually in the admin; dateFrom and id only break ties
+     * between records that share a position (newly created or duplicated ones).
+     */
+    protected function applyOrdering(QueryBuilder $queryBuilder): void
+    {
+        $queryBuilder
+            ->orderBy('s.position', 'ASC')
+            ->addOrderBy('s.dateFrom', 'ASC')
+            ->addOrderBy('s.id', 'ASC');
+    }
 }

src/Repository/Groups/FindsByAccommodationAndDateRangeTrait.php

@@ -6,6 +6,7 @@ namespace App\Repository\Groups;
 
 use App\Entity\Groups\Accommodation;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\ORM\QueryBuilder;
 
 /**
  * @template T of object
@@ -26,16 +27,26 @@ trait FindsByAccommodationAndDateRangeTrait
         \DateTimeImmutable $dateFrom,
         \DateTimeImmutable $dateTo,
     ): array {
-        return $this->createQueryBuilder('s')
+        $queryBuilder = $this->createQueryBuilder('s')
             ->where('s.accommodation = :accommodation')
             ->andWhere('s.dateFrom <= :dateTo')
             ->andWhere('s.dateTo >= :dateFrom')
             ->setParameter('accommodation', $accommodation)
             ->setParameter('dateFrom', $dateFrom)
-            ->setParameter('dateTo', $dateTo)
+            ->setParameter('dateTo', $dateTo);
+
+        $this->applyOrdering($queryBuilder);
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+
+    /**
+     * Ordering applied to the query above; override to sort by something else.
+     */
+    protected function applyOrdering(QueryBuilder $queryBuilder): void
+    {
+        $queryBuilder
             ->orderBy('s.dateFrom', 'ASC')
-            ->addOrderBy('s.label', 'ASC')
-            ->getQuery()
-            ->getResult();
+            ->addOrderBy('s.label', 'ASC');
     }
 }

src/Service/AccommodationBookingService.php

@@ -156,11 +156,9 @@ class AccommodationBookingService
             }
         }
 
+        // Additional services keep the repository order (manual position), which also makes the
+        // groups appear in the order of their lowest-positioned member.
         $boardServices = $this->sortServicesByPriceThenLabel($boardServices);
-        $ungrouped = $this->sortServicesByPriceThenLabel($ungrouped);
-        foreach ($grouped as $groupName => $groupServices) {
-            $grouped[$groupName] = $this->sortServicesByPriceThenLabel($groupServices);
-        }
 
         return [
             'boardServices' => $boardServices,
@@ -171,17 +169,15 @@ class AccommodationBookingService
     }
 
     /**
-     * Free services (price 0) first, then alphabetically; each group sorted alphabetically.
+     * Free services (price 0) first, then alphabetically.
      *
-     * @template T of BoardService|AdditionalService
+     * @param BoardService[] $services
      *
-     * @param T[] $services
-     *
-     * @return T[]
+     * @return BoardService[]
      */
     private function sortServicesByPriceThenLabel(array $services): array
     {
-        usort($services, static function (BoardService|AdditionalService $a, BoardService|AdditionalService $b): int {
+        usort($services, static function (BoardService $a, BoardService $b): int {
             $aFree = 0 === $a->getPrice() ? 0 : 1;
             $bFree = 0 === $b->getPrice() ? 0 : 1;