Merge branch 'quick-fix-main' of github.com:Tria-plc/edr-platform into quick-fix-main

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

@@ -13,8 +13,8 @@ export class DashboardService {
   async getBackofficeStats() {
     const [totalBookings, totalPackageBookings, totalTickets, totalPassengers, revenueRows, packageRevenueRows] =
       await Promise.all([
-        this.prisma.booking.count(),
-        this.prisma.booking.count({ where: { packageId: { not: null } } }),
+        this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] } } }),
+        this.prisma.booking.count({ where: { status: { in: ['CONFIRMED', 'BOARDED'] }, packageId: { not: null } } }),
         this.prisma.ticket.count(),
         this.prisma.passenger.count(),
         this.prisma.$queryRaw<{ currency: string; total: bigint }[]>`

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

@@ -95,13 +95,18 @@ export class ReportsService {
       where: { departureAt: { gte: dateFrom, lte: dateTo } },
       include: {
         coachAssignments: { include: { coach: { include: { seats: true } } } },
-        bookings: { include: { seats: true } },
+        bookings: {
+          where: { status: { in: ['CONFIRMED', 'BOARDED'] } },
+          include: { seats: true },
+        },
       },
     });
 
     const tripData = schedules.map(schedule => {
       const totalSeats = schedule.coachAssignments.reduce((sum, a) => sum + a.coach.seats.length, 0);
-      const bookedSeats = schedule.bookings.reduce((sum, b) => sum + b.seats.length, 0);
+      const bookedSeats = schedule.bookings.reduce(
+        (sum, b) => sum + b.seats.filter((s: any) => s.leg === 1).length, 0,
+      );
       const occupancyRate = totalSeats > 0 ? (bookedSeats / totalSeats) * 100 : 0;
       return { scheduleId: schedule.id, departureAt: schedule.departureAt, totalSeats, bookedSeats, occupancyRate: +occupancyRate.toFixed(2) };
     });
@@ -212,6 +217,7 @@ export class ReportsService {
           where: { status: { in: ['CONFIRMED', 'BOARDED'] } },
           include: {
             seats: {
+              where: { leg: 1 },
               include: {
                 seat: { include: { coach: { include: { coachType: true } } } },
               },
@@ -307,8 +313,8 @@ export class ReportsService {
   async getPassengerList(scheduleId: string) {
     const seats = await this.prisma.bookingSeat.findMany({
       where: {
-        scheduleId,
-        booking: { status: { in: ['CONFIRMED', 'BOARDED'] } },
+        leg: 1,
+        booking: { scheduleId, status: { in: ['CONFIRMED', 'BOARDED'] } },
       },
       include: {
         booking: {
@@ -324,20 +330,25 @@ export class ReportsService {
         },
         seat: { include: { coach: { select: { number: true, coachType: { select: { name: true } } } } } },
       },
-      orderBy: [{ seat: { coach: { number: 'asc' } } }],
+      orderBy: [{ seat: { coach: { number: 'asc' } } }, { seat: { seatNumber: 'asc' } }],
     });
 
+    // Resolve station names in one query
     const stationIds = [...new Set(
-      seats.flatMap(bs => [bs.booking.originStationId, bs.booking.destinationStationId]).filter(Boolean) as string[]
+      seats.flatMap(bs => [bs.booking.originStationId, bs.booking.destinationStationId]).filter(Boolean) as string[],
     )];
-    const stations = stationIds.length
+    const stations = stationIds.length > 0
       ? await this.prisma.station.findMany({ where: { id: { in: stationIds } }, select: { id: true, name: true } })
       : [];
-    const stationMap = new Map(stations.map(s => [s.id, s.name]));
+    const stationName = new Map(stations.map(s => [s.id, s.name]));
+
+    const schedule = await this.prisma.trainSchedule.findUnique({
+      where: { id: scheduleId },
+      select: { departureAt: true },
+    });
 
     return seats.map(bs => ({
       bookingRef: bs.booking.bookingRef,
-      bookingStatus: bs.booking.status,
       passengerName: bs.passengerName,
       passengerCategory: bs.passengerCategory,
       idDocumentType: bs.idDocumentType,
@@ -347,8 +358,8 @@ export class ReportsService {
       seatLabel: bs.seatLabelSnapshot,
       coachNumber: bs.seat?.coach?.number ?? null,
       coachType: (bs.seat?.coach as any)?.coachType?.name ?? null,
-      origin: bs.booking.originStationId ? (stationMap.get(bs.booking.originStationId) ?? null) : null,
-      destination: bs.booking.destinationStationId ? (stationMap.get(bs.booking.destinationStationId) ?? null) : null,
+      origin: bs.booking.originStationId ? (stationName.get(bs.booking.originStationId) ?? null) : null,
+      destination: bs.booking.destinationStationId ? (stationName.get(bs.booking.destinationStationId) ?? null) : null,
       amountPaidMinor: bs.booking.totalMinor,
       currency: bs.booking.currency ?? 'ETB',
       isGroupBooking: (bs.booking._count?.seats ?? 0) > 1,

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

@@ -29,6 +29,16 @@ import { PASSENGER_PERMS } from "../../seed/passenger-permissions.registry";
 export class SeatsController {
   constructor(private service: SeatsService) {}
 
+  // ── Blocked Seats ─────────────────────────────────────────────────────────
+  @Get('blocks')
+  @PassengerStaff([PASSENGER_PERMS.seats.manage, PASSENGER_PERMS.admin])
+  @ApiBearerAuth('IAM-auth')
+  @ApiOperation({ summary: 'List all blocked seats with reason and coach info' })
+  @ApiResponse({ status: 200, description: 'Blocked seat records' })
+  getBlockedSeats() {
+    return this.service.getBlockedSeats();
+  }
+
   // ── Coach Availability ────────────────────────────────────────────────────
   @Get('coaches/:scheduleId')
   @SetMetadata('isPublic', true)

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

@@ -598,6 +598,29 @@ export class SeatsService {
     await this.prisma.journey.deleteMany({ where: { bookingId } as any });
   }
 
+  async getBlockedSeats() {
+    const blocks = await this.prisma.seatBlock.findMany({
+      where: {
+        NOT: { reason: { startsWith: 'MAINTENANCE:' } },
+      },
+      include: {
+        seat: { include: { coach: { select: { number: true } } } },
+      },
+      orderBy: { blockedAt: 'desc' },
+    });
+    return blocks.map(b => ({
+      id: b.id,
+      seatId: b.seatId,
+      seatNumber: b.seat.seatNumber,
+      coachNumber: b.seat.coach.number,
+      scheduleId: b.scheduleId,
+      reason: b.reason,
+      blockedBy: b.blockedBy,
+      blockedAt: b.blockedAt,
+      unblockAt: b.unblockAt,
+    }));
+  }
+
   async getCoachesWithAvailability(scheduleId: string, originStationId?: string, destinationStationId?: string) {
     const schedule = await this.prisma.trainSchedule.findUnique({
       where: { id: scheduleId },