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

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

@@ -85,6 +85,7 @@ export class AgentsService {
         seats: {
           create: dto.passengers.map(p => ({
             seat: { connect: { id: p.seatId } },
+            scheduleId: dto.scheduleId,
             passengerName: p.fullName,
             idDocumentType: p.idDocumentType as IdDocumentType | undefined,
             idDocumentNumber: p.idDocumentNumber

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

@@ -910,6 +910,7 @@ export class BookingsService {
         seats: {
           create: passengersWithFares.map(p => ({
             seat: { connect: { id: p.seatId } },
+            scheduleId: dto.scheduleId,
             passengerName: p.passengerName,
             dateOfBirth: p.dateOfBirth,
             passengerCategory: p.category,

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

@@ -299,6 +299,7 @@ export class GuestBookingService {
         seats: {
           create: passengersWithFares.map((p) => ({
             seat: { connect: { id: p.seatId } },
+            scheduleId: dto.scheduleId,
             passengerName: p.passengerName,
             dateOfBirth: p.dateOfBirth,
             passengerCategory: p.category,

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

@@ -440,8 +440,8 @@ export class PackagesService {
           passengerCount,
           adultCount,
           childCount,
-          totalMinor,
-          currency: 'ETB',
+          totalMinor: displayTotalMinor,
+          currency: displayCurrency,
           displayCurrency,
           displayTotalMinor,
           status: 'PENDING_PAYMENT',

apps/edr-passenger-api/src/modules/payments/payments.e2e-spec.ts

@@ -118,6 +118,7 @@ describe("Payments E2E", () => {
       data: {
         bookingId: booking.id,
         seatId: seat.id,
+        scheduleId: schedule.id,
         passengerName: "Test Passenger",
       },
     });

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

@@ -535,8 +535,8 @@ export class SearchService {
       discountMinor: fare.discountMinor,
       taxesFeesMinor: 0,
       loyaltyRedemptionMinor: loyaltyMinor,
-      totalMinor,
-      currency: 'ETB',
+      totalMinor: displayTotalMinor,
+      currency: displayCurrency,
       displayCurrency,
       displayTotalMinor,
     };
@@ -653,8 +653,8 @@ export class SearchService {
       passengers: passengerLines,
       subtotalMinor,
       discountMinor,
-      totalMinor,
-      currency: 'ETB',
+      totalMinor: displayTotalMinor,
+      currency: displayCurrency,
       displayCurrency,
       displayTotalMinor,
     };

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

@@ -1020,7 +1020,7 @@ export class SeatsService {
         where: {
           OR: [
             { scheduleId: schedule.id },
-            { scheduleId: null, booking: { scheduleId: schedule.id } },
+            { booking: { scheduleId: schedule.id } },
           ],
           booking: { status: { in: ['CONFIRMED', 'BOARDED'] } },
         },