Booking and ticketing related updates

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

@@ -106,14 +106,27 @@ export class BookingsService {
     const { search, status, page = 1, pageSize = 20 } = filters;
     const skip = (page - 1) * pageSize;
     
-    const where: any = { passenger: { user: { devices: { some: { id: deviceId } } } } };
+    // Find user with this device ID
+    const device = await this.prisma.device.findUnique({
+      where: { id: deviceId },
+      include: { user: { include: { passenger: true } } },
+    }).catch(() => null);
+    
+    const searchConditions = search ? [
+      { bookingRef: { contains: search, mode: 'insensitive' } },
+      { schedule: { originStation: { name: { contains: search, mode: 'insensitive' } } } },
+      { schedule: { destinationStation: { name: { contains: search, mode: 'insensitive' } } } },
+    ] : [];
+    
+    const where: any = {
+      OR: [
+        { userAgent: deviceId },
+        ...(device?.user?.passenger ? [{ passengerId: device.user.passenger.id }] : []),
+      ],
+    };
     
     if (search) {
-      where.OR = [
-        { bookingRef: { contains: search, mode: 'insensitive' } },
-        { schedule: { originStation: { name: { contains: search, mode: 'insensitive' } } } },
-        { schedule: { destinationStation: { name: { contains: search, mode: 'insensitive' } } } },
-      ];
+      where.AND = [{ OR: searchConditions }];
     }
     
     if (status) {
@@ -135,13 +148,8 @@ export class BookingsService {
       this.prisma.booking.count({ where }),
     ]);
     
-    const savedPassengers = await this.prisma.savedPassengerProfile.findMany({
-      where: { deviceId },
-      orderBy: { createdAt: 'desc' },
-    });
-    
     return {
-      bookings: items.map(booking => ({
+      items: items.map(booking => ({
         id: booking.id,
         bookingRef: booking.bookingRef,
         status: booking.status,
@@ -162,17 +170,6 @@ export class BookingsService {
         paymentIntent: booking.paymentIntent,
         seatCount: booking.seats.length,
       })),
-      savedPassengers: savedPassengers.map(p => ({
-        id: p.id,
-        passengerName: p.passengerName,
-        dateOfBirth: p.dateOfBirth.toISOString().split('T')[0],
-        idDocumentType: p.idDocumentType,
-        passportNumber: p.passportNumber || undefined,
-        passportCountry: p.passportCountry || undefined,
-        nationality: p.nationality || undefined,
-        phone: p.phone || undefined,
-        email: p.email || undefined,
-      })),
       meta: {
         page,
         pageSize,
@@ -298,7 +295,6 @@ export class BookingsService {
       passengersData.push({ ...passenger, passengerName, dateOfBirth, category, verifaydaVerified, verifaydaData, nationality });
     }
 
-    // Use first passenger's nationality for fare lookup (or allow per-passenger pricing)
     const primaryNationality = passengersData[0]?.nationality;
     const baseFareMinor = await this.getBaseFare(dto.scheduleId, dto.seatClassId, segmentRoute, fullRoute, primaryNationality);
     const adultFareMinor = baseFareMinor * adultCount;

apps/edr-passenger-api/src/modules/bookings/guest-booking.service.ts

@@ -250,6 +250,7 @@ export class GuestBookingService {
         displayCurrency,
         displayTotalMinor,
         bookingType: 'ONE_WAY',
+        userAgent: dto.deviceId,
         // contactEmail: firstPassenger.email,  // Temporarily disabled until migration
         // contactPhone: firstPassenger.phone,  // Temporarily disabled until migration
         seats: {