Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha

apps/edr-passenger-api/src/modules/tickets/tickets.service.ts

@@ -1,4 +1,4 @@
-import { Injectable, NotFoundException, BadRequestException } from '@nestjs/common';
+import { Injectable, NotFoundException, BadRequestException, HttpException, HttpStatus } from '@nestjs/common';
 import { InjectDataSource } from '@nestjs/typeorm';
 import { DataSource } from 'typeorm';
 import { PrismaService } from '../../common/prisma.service';
@@ -127,12 +127,37 @@ export class TicketsService {
     });
     if (!booking) throw new NotFoundException(`Booking ${bookingId} not found`);
 
+    // No payment intent record at all
+    if (!booking.paymentIntent) {
+      throw new HttpException(
+        { status: 'error', message: 'Payment not completed', code: 400 },
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    // Payment intent exists but not yet succeeded
+    if (booking.paymentIntent.status !== 'SUCCEEDED') {
+      throw new HttpException(
+        {
+          status: 'error',
+          message: 'Payment not completed',
+          code: 400,
+          detail: `Payment status: ${booking.paymentIntent.status}`,
+        },
+        HttpStatus.BAD_REQUEST,
+      );
+    }
+
+    // Booking not in CONFIRMED state (safety net — should align with SUCCEEDED)
     if (booking.status !== 'CONFIRMED') {
-      const paymentStatus = booking.paymentIntent?.status ?? null;
-      throw new BadRequestException(
-        `Payment not completed. Please complete your payment before accessing the ticket. ` +
-        `Booking status: ${booking.status}` +
-        (paymentStatus ? `. Payment status: ${paymentStatus}` : ''),
+      throw new HttpException(
+        {
+          status: 'error',
+          message: 'Payment not completed',
+          code: 400,
+          detail: `Booking status: ${booking.status}`,
+        },
+        HttpStatus.BAD_REQUEST,
       );
     }