Merge pull request #241 from HiEventsDev/add-missing-order-validation

HiEventsDev · Sep 22, 2024 · 3fece1f · 3fece1f
2 parents 440245f + d1993f6
commit 3fece1f
Show file tree

Hide file tree

Showing 4 changed files with 330 additions and 11 deletions.
diff --git a/backend/app/Listeners/Order/SendOrderDetailsEmailListener.php b/backend/app/Listeners/Order/SendOrderDetailsEmailListener.php
@@ -5,7 +5,7 @@
 use HiEvents\Events\OrderStatusChangedEvent;
 use HiEvents\Jobs\Order\SendOrderDetailsEmailJob;
 
-readonly class SendOrderDetailsEmailListener
+class SendOrderDetailsEmailListener
 {
     public function handle(OrderStatusChangedEvent $changedEvent): void
     {

diff --git a/backend/app/Services/Handlers/Order/CompleteOrderHandler.php b/backend/app/Services/Handlers/Order/CompleteOrderHandler.php
@@ -15,10 +15,12 @@
 use HiEvents\DomainObjects\Status\AttendeeStatus;
 use HiEvents\DomainObjects\Status\OrderPaymentStatus;
 use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\DomainObjects\TicketDomainObject;
 use HiEvents\DomainObjects\TicketPriceDomainObject;
 use HiEvents\Events\OrderStatusChangedEvent;
 use HiEvents\Exceptions\ResourceConflictException;
 use HiEvents\Helper\IdHelper;
+use HiEvents\Repository\Eloquent\Value\Relationship;
 use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Repository\Interfaces\QuestionAnswerRepositoryInterface;
@@ -37,14 +39,14 @@
 /**
  * @todo - Tidy this up
  */
-readonly class CompleteOrderHandler
+class CompleteOrderHandler
 {
     public function __construct(
-        private OrderRepositoryInterface          $orderRepository,
-        private AttendeeRepositoryInterface       $attendeeRepository,
-        private QuestionAnswerRepositoryInterface $questionAnswersRepository,
-        private TicketQuantityUpdateService       $ticketQuantityUpdateService,
-        private TicketPriceRepositoryInterface    $ticketPriceRepository,
+        private readonly OrderRepositoryInterface          $orderRepository,
+        private readonly AttendeeRepositoryInterface       $attendeeRepository,
+        private readonly QuestionAnswerRepositoryInterface $questionAnswersRepository,
+        private readonly TicketQuantityUpdateService       $ticketQuantityUpdateService,
+        private readonly TicketPriceRepositoryInterface    $ticketPriceRepository,
     )
     {
     }
@@ -89,14 +91,14 @@ public function handle(string $orderShortId, CompleteOrderDTO $orderData): Order
     private function createAttendees(Collection $attendees, OrderDomainObject $order): void
     {
         $inserts = [];
-        $publicIdIndex = 1;
 
         $ticketsPrices = $this->ticketPriceRepository->findWhereIn(
             field: TicketPriceDomainObjectAbstract::ID,
             values: $attendees->pluck('ticket_price_id')->toArray(),
         );
 
         $this->validateTicketPriceIdsMatchOrder($order, $ticketsPrices);
+        $this->validateAttendees($order, $attendees);
 
         foreach ($attendees as $attendee) {
             $ticketId = $ticketsPrices->first(
@@ -192,7 +194,7 @@ private function createAttendeeQuestions(
     private function validateOrder(OrderDomainObject $order): void
     {
         if ($order->getEmail() !== null) {
-            throw new ResourceConflictException(__('This order is has already been processed'));
+            throw new ResourceConflictException(__('This order has already been processed'));
         }
 
         if (Carbon::createFromTimeString($order->getReservedUntil())->isPast()) {
@@ -210,7 +212,11 @@ private function validateOrder(OrderDomainObject $order): void
     private function getOrder(string $orderShortId): OrderDomainObject
     {
         $order = $this->orderRepository
-            ->loadRelation(OrderItemDomainObject::class)
+            ->loadRelation(
+                new Relationship(
+                    domainObject: OrderItemDomainObject::class,
+                    nested: [new Relationship(TicketDomainObject::class, name: 'ticket')]
+                ))
             ->findByShortId($orderShortId);
 
         if ($order === null) {
@@ -258,4 +264,18 @@ private function validateTicketPriceIdsMatchOrder(OrderDomainObject $order, Coll
             throw new ResourceConflictException(__('There is an unexpected ticket price ID in the order'));
         }
     }
+
+    /**
+     * @throws ResourceConflictException
+     */
+    private function validateAttendees(OrderDomainObject $order, Collection $attendees): void
+    {
+        $orderAttendeeCount = $order->getOrderItems()->sum(fn(OrderItemDomainObject $orderItem) => $orderItem->getQuantity());
+
+        if ($orderAttendeeCount !== $attendees->count()) {
+            throw new ResourceConflictException(
+                __('The number of attendees does not match the number of tickets in the order')
+            );
+        }
+    }
 }
diff --git a/backend/phpunit.xml b/backend/phpunit.xml
@@ -21,7 +21,7 @@
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <env name="DB_DATABASE" value="testing"/>
+<!--        <env name="DB_DATABASE" value="testing"/>-->
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>