Prepare codebase for Vapor deployment (#351)

Author: daveearley

.github/workflows/deploy-production.yml

@@ -0,0 +1,58 @@
+name: Deploy to Vapor Production
+
+on:
+  push:
+    branches:
+      - master
+      - feat/vapor
+
+jobs:
+  vapor:
+    name: Deploy to Vapor Production
+    runs-on: ubuntu-latest
+
+    steps:
+      # Step 1: Checkout the repository
+      - uses: actions/checkout@v2
+
+      # Step 2: Setup PHP
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          tools: composer:v2
+          coverage: none
+
+      # Step 3: Prepare Laravel Environment
+      - name: Prepare Laravel Environment
+        working-directory: ./backend
+        run: |
+          mkdir -p bootstrap/cache
+          chmod -R 775 bootstrap/cache
+
+      # Step 4: Prepare HTMLPurifier Cache Directory
+      - name: Prepare HTMLPurifier Cache Directory
+        working-directory: ./backend
+        run: |
+          mkdir -p storage/app/htmlpurifier
+          chmod -R 775 storage/app/htmlpurifier
+
+      # Step 5: Install Dependencies
+      - name: Install Dependencies
+        working-directory: ./backend
+        run: composer install --no-dev --no-progress --no-scripts --optimize-autoloader
+
+      # Step 6: Install Vapor CLI
+      - name: Install Vapor CLI
+        run: composer global require laravel/vapor-cli
+
+      # Step 7: Log the branch being deployed (Optional enhancement)
+      - name: Log Branch
+        run: echo "Deploying branch ${{ github.ref_name }}"
+
+      # Step 8: Deploy to the Vapor Production Environment
+      - name: Deploy to Production
+        working-directory: ./backend
+        run: vapor deploy production
+        env:
+          VAPOR_API_TOKEN: ${{ secrets.VAPOR_API_TOKEN }}

.gitignore

@@ -6,3 +6,5 @@
 frontend/.env
 backend/.env
 todo.md
+
+.vercel

backend/.env.example

@@ -16,7 +16,7 @@ STRIPE_PUBLIC_KEY=
 STRIPE_SECRET_KEY=
 STRIPE_WEBHOOK_SECRET=
 
-CORS_ALLOWED_ORIGINS=http://localhost:5173
+CORS_ALLOWED_ORIGINS=*
 
 LOG_CHANNEL=stderr
 LOG_DEPRECATIONS_CHANNEL=null

backend/.gitignore

@@ -8,6 +8,7 @@
 .env
 .env.backup
 .env.production
+.env.staging
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml

backend/app/Http/Actions/Common/Webhooks/StripeIncomingWebhookAction.php

@@ -12,20 +12,24 @@
 
 class StripeIncomingWebhookAction extends BaseAction
 {
-    private IncomingWebhookHandler $webhookHandler;
-
-    public function __construct(IncomingWebhookHandler $webhookHandler)
-    {
-        $this->webhookHandler = $webhookHandler;
-    }
-
     public function __invoke(Request $request): Response
     {
         try {
-            $this->webhookHandler->handle(new StripeWebhookDTO(
-                headerSignature: $request->server('HTTP_STRIPE_SIGNATURE'),
-                payload: $request->getContent(),
-            ));
+            $headerSignature = $request->server('HTTP_STRIPE_SIGNATURE');
+            $payload = $request->getContent();
+
+            dispatch(static function (IncomingWebhookHandler $handler) use ($headerSignature, $payload) {
+                $handler->handle(new StripeWebhookDTO(
+                    headerSignature: $headerSignature,
+                    payload: $payload,
+                ));
+            })->catch(function (Throwable $exception) use ($payload) {
+                logger()->error(__('Failed to handle incoming Stripe webhook'), [
+                    'exception' => $exception,
+                    'payload' => $payload,
+                ]);
+            });
+
         } catch (Throwable $exception) {
             logger()?->error($exception->getMessage(), $exception->getTrace());
             return $this->noContentResponse(ResponseCodes::HTTP_BAD_REQUEST);

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

@@ -38,8 +38,8 @@ public function __invoke(CreateOrderRequest $request, int $eventId): JsonRespons
         $sessionId = $this->sessionIdentifierService->getSessionId();
 
         $order = $this->orderHandler->handle(
-            $eventId,
-            CreateOrderPublicDTO::fromArray([
+            eventId: $eventId,
+            createOrderPublicDTO: CreateOrderPublicDTO::fromArray([
                 'is_user_authenticated' => $this->isUserAuthenticated(),
                 'promo_code' => $request->input('promo_code'),
                 'products' => ProductOrderDetailsDTO::collectionFromArray($request->input('products')),

backend/app/Http/Actions/Products/GetProductAction.php

@@ -6,12 +6,13 @@
 
 use HiEvents\DomainObjects\EventDomainObject;
 use HiEvents\DomainObjects\Generated\ProductDomainObjectAbstract;
-use HiEvents\DomainObjects\TaxAndFeesDomainObject;
 use HiEvents\DomainObjects\ProductPriceDomainObject;
+use HiEvents\DomainObjects\TaxAndFeesDomainObject;
 use HiEvents\Http\Actions\BaseAction;
 use HiEvents\Repository\Interfaces\ProductRepositoryInterface;
 use HiEvents\Resources\Product\ProductResource;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
 
 class GetProductAction extends BaseAction
 {
@@ -22,16 +23,22 @@ public function __construct(ProductRepositoryInterface $productRepository)
         $this->productRepository = $productRepository;
     }
 
-    public function __invoke(int $eventId, int $productId): JsonResponse
+    public function __invoke(int $eventId, int $productId): JsonResponse|Response
     {
         $this->isActionAuthorized($eventId, EventDomainObject::class);
 
-        return $this->resourceResponse(ProductResource::class, $this->productRepository
+        $product = $this->productRepository
             ->loadRelation(TaxAndFeesDomainObject::class)
             ->loadRelation(ProductPriceDomainObject::class)
             ->findFirstWhere([
                 ProductDomainObjectAbstract::EVENT_ID => $eventId,
                 ProductDomainObjectAbstract::ID => $productId,
-            ]));
+            ]);
+
+        if ($product === null) {
+            return $this->notFoundResponse();
+        }
+
+        return $this->resourceResponse(ProductResource::class, $product);
     }
 }

backend/app/Services/Application/Handlers/Account/CreateAccountHandler.php

@@ -60,6 +60,12 @@ public function handle(CreateAccountDTO $accountData): AccountDomainObject
                 // If the app is not running in SaaS mode, we can immediately verify the account.
                 // Same goes for the email verification below.
                 'account_verified_at' => $isSaasMode ? null : now()->toDateTimeString(),
+                'configuration' => [
+                    'application_fee' => [
+                        'percentage' => config('app.saas_stripe_application_fee_percent'),
+                        'fixed' => config('app.saas_stripe_application_fee_fixed') ?? 0,
+                    ],
+                ],
             ]);
 
             $user = $this->getExistingUser($accountData) ?? $this->userRepository->create([

backend/app/Services/Application/Handlers/Event/UpdateEventHandler.php

@@ -11,7 +11,7 @@
 use HiEvents\Repository\Interfaces\EventRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Event\DTO\UpdateEventDTO;
-use HTMLPurifier;
+use HiEvents\Services\Infrastructure\HtmlPurifier\HtmlPurifierService;
 use Illuminate\Database\DatabaseManager;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Throwable;
@@ -23,7 +23,7 @@ public function __construct(
         private Dispatcher               $dispatcher,
         private DatabaseManager          $databaseManager,
         private OrderRepositoryInterface $orderRepository,
-        private HTMLPurifier             $purifier,
+        private HtmlPurifierService      $purifier,
     )
     {
     }

backend/app/Services/Application/Handlers/EventSettings/UpdateEventSettingsHandler.php

@@ -5,15 +5,15 @@
 use HiEvents\DomainObjects\EventSettingDomainObject;
 use HiEvents\Repository\Interfaces\EventSettingsRepositoryInterface;
 use HiEvents\Services\Application\Handlers\EventSettings\DTO\UpdateEventSettingsDTO;
-use HTMLPurifier;
+use HiEvents\Services\Infrastructure\HtmlPurifier\HtmlPurifierService;
 use Illuminate\Database\DatabaseManager;
 use Throwable;
 
 readonly class UpdateEventSettingsHandler
 {
     public function __construct(
         private EventSettingsRepositoryInterface $eventSettingsRepository,
-        private HTMLPurifier                     $purifier,
+        private HtmlPurifierService                     $purifier,
         private DatabaseManager                  $databaseManager,
     )
     {