Merge pull request #868 from HiEventsDev/develop

Author: daveearley

backend/app/DomainObjects/Status/OrderStatus.php

@@ -12,6 +12,7 @@ enum OrderStatus
     case CANCELLED;
     case COMPLETED;
     case AWAITING_OFFLINE_PAYMENT;
+    case ABANDONED;
 
     public static function getHumanReadableStatus(string $status): string
     {
@@ -20,6 +21,7 @@ public static function getHumanReadableStatus(string $status): string
             self::CANCELLED->name => __('Cancelled'),
             self::COMPLETED->name => __('Completed'),
             self::AWAITING_OFFLINE_PAYMENT->name => __('Awaiting offline payment'),
+            self::ABANDONED->name => __('Abandoned'),
         };
     }
 }

backend/app/Exports/AttendeesExport.php

@@ -97,14 +97,18 @@ public function map($attendee): array
 
         /** @var ProductDomainObject $ticket */
         $ticket = $attendee->getProduct();
-        $ticketName = $ticket->getTitle();
-        if ($ticket->getType() === ProductPriceType::TIERED->name) {
+        $ticketName = $ticket?->getTitle();
+        if ($ticket && $ticket->getType() === ProductPriceType::TIERED->name) {
             $ticketName .= ' - ' . $ticket
                     ->getProductPrices()
                     ->first(fn(ProductPriceDomainObject $tp) => $tp->getId() === $attendee->getProductPriceId())
                     ->getLabel();
         }
 
+        if (!$ticketName) {
+            $ticketName = __('Unknown');
+        }
+
         $checkIns = $attendee->getCheckIns()
             ? $attendee->getCheckIns()
                 ->map(fn($checkIn) => sprintf(

backend/app/Http/Actions/Orders/Public/AbandonOrderActionPublic.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace HiEvents\Http\Actions\Orders\Public;
+
+use HiEvents\Exceptions\ResourceConflictException;
+use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Http\Actions\BaseAction;
+use HiEvents\Resources\Order\OrderResourcePublic;
+use HiEvents\Services\Application\Handlers\Order\Public\AbandonOrderPublicHandler;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+
+class AbandonOrderActionPublic extends BaseAction
+{
+    public function __construct(
+        private readonly AbandonOrderPublicHandler $abandonOrderPublicHandler,
+    )
+    {
+    }
+
+    public function __invoke(int $eventId, string $orderShortId): JsonResponse
+    {
+        try {
+            $order = $this->abandonOrderPublicHandler->handle($orderShortId);
+
+            return $this->resourceResponse(
+                resource: OrderResourcePublic::class,
+                data: $order,
+            );
+        } catch (ResourceNotFoundException $e) {
+            return $this->errorResponse($e->getMessage(), Response::HTTP_NOT_FOUND);
+        } catch (ResourceConflictException $e) {
+            return $this->errorResponse($e->getMessage(), Response::HTTP_CONFLICT);
+        } catch (UnauthorizedException $e) {
+            return $this->errorResponse($e->getMessage(), Response::HTTP_UNAUTHORIZED);
+        }
+    }
+}

backend/app/Repository/Eloquent/OrderRepository.php

@@ -25,6 +25,7 @@ public function findByEventId(int $eventId, QueryParamsDTO $params): LengthAware
         $where = [
             [OrderDomainObjectAbstract::EVENT_ID, '=', $eventId],
             [OrderDomainObjectAbstract::STATUS, '!=', OrderStatus::RESERVED->name],
+            [OrderDomainObjectAbstract::STATUS, '!=', OrderStatus::ABANDONED->name],
         ];
 
         if ($params->query) {
@@ -64,6 +65,7 @@ public function findByOrganizerId(int $organizerId, int $accountId, QueryParamsD
     {
         $where = [
             ['orders.status', '!=', OrderStatus::RESERVED->name],
+            ['orders.status', '!=', OrderStatus::ABANDONED->name],
         ];
 
         if ($params->query) {

backend/app/Repository/Eloquent/ProductRepository.php

@@ -256,7 +256,11 @@ public function hasAssociatedOrders(int $productId): bool
     {
         return $this->db->table('order_items')
             ->join('orders', 'order_items.order_id', '=', 'orders.id')
-            ->whereIn('orders.status', [OrderStatus::COMPLETED->name, OrderStatus::CANCELLED->name])
+            ->whereIn('orders.status', [
+                OrderStatus::COMPLETED->name,
+                OrderStatus::CANCELLED->name,
+                OrderStatus::AWAITING_OFFLINE_PAYMENT->name,
+            ])
             ->where('order_items.product_id', $productId)
             ->exists();
     }

backend/app/Services/Application/Handlers/Order/Public/AbandonOrderPublicHandler.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace HiEvents\Services\Application\Handlers\Order\Public;
+
+use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;
+use HiEvents\DomainObjects\OrderDomainObject;
+use HiEvents\DomainObjects\Status\OrderStatus;
+use HiEvents\Exceptions\ResourceConflictException;
+use HiEvents\Exceptions\UnauthorizedException;
+use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
+use HiEvents\Services\Infrastructure\Session\CheckoutSessionManagementService;
+use Illuminate\Log\Logger;
+use Symfony\Component\Routing\Exception\ResourceNotFoundException;
+
+class AbandonOrderPublicHandler
+{
+    public function __construct(
+        private readonly OrderRepositoryInterface $orderRepository,
+        private readonly CheckoutSessionManagementService $sessionService,
+        private readonly Logger $logger,
+    )
+    {
+    }
+
+    /**
+     * @throws ResourceConflictException
+     */
+    public function handle(string $orderShortId): OrderDomainObject
+    {
+        $order = $this->orderRepository->findByShortId($orderShortId);
+
+        if (!$order) {
+            throw new ResourceNotFoundException(__('Order not found'));
+        }
+
+        if ($order->getStatus() !== OrderStatus::RESERVED->name) {
+            throw new ResourceConflictException(__('Order is not in a valid status to be abandoned'));
+        }
+
+        if ($order->isReservedOrderExpired()) {
+            throw new ResourceConflictException(__('Order has already expired'));
+        }
+
+        $this->verifySessionId($order->getSessionId());
+
+        $this->orderRepository->updateFromArray($order->getId(), [
+            OrderDomainObjectAbstract::STATUS => OrderStatus::ABANDONED->name,
+        ]);
+
+        $this->logger->info('Order abandoned by customer', [
+            'order_id' => $order->getId(),
+            'order_short_id' => $orderShortId,
+            'event_id' => $order->getEventId(),
+        ]);
+
+        return $this->orderRepository->findById($order->getId());
+    }
+
+    private function verifySessionId(string $orderSessionId): void
+    {
+        if (!$this->sessionService->verifySession($orderSessionId)) {
+            throw new UnauthorizedException(
+                __('Sorry, we could not verify your session. Please restart your order.')
+            );
+        }
+    }
+}