UAT findings resolutions and enhancements

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

@@ -206,6 +206,13 @@ export class FleetController {
     return this.service.listCoaches(dto);
   }
 
+  @Get('coaches/utilization')
+  @ApiOperation({ summary: 'Coach utilization report — seats, bookings, and assignment history per coach' })
+  @ApiResponse({ status: 200, description: 'Coach utilization data' })
+  getCoachUtilization() {
+    return this.service.getCoachUtilization();
+  }
+
   @Get('coaches/:id')
   @ApiOperation({ summary: 'Get single coach with seat layout' })
   @ApiParam({ name: 'id', description: 'Coach UUID' })

apps/edr-passenger-api/src/modules/fleet/fleet.dto.ts

@@ -1,4 +1,5 @@
 import { IsString, IsInt, IsOptional, IsArray, IsBoolean } from 'class-validator';
+import { Transform } from 'class-transformer';
 import { ApiProperty, ApiPropertyOptional, PartialType, OmitType } from '@nestjs/swagger';
 
 export class CreateTrainDto {
@@ -7,7 +8,7 @@ export class CreateTrainDto {
   @ApiPropertyOptional({ example: 'EDR', description: 'Operator ID (defaults to op_edr)' }) @IsOptional() @IsString() operatorId?: string;
   @ApiPropertyOptional({ example: 'Ethiopian-Djibouti Railway' }) @IsOptional() @IsString() operatorName?: string;
   @ApiPropertyOptional({ example: 'Addis-Djibouti Express' }) @IsOptional() @IsString() description?: string;
-  @ApiPropertyOptional({ example: true, description: 'Whether the train is active' }) @IsOptional() @IsBoolean() isActive?: boolean;
+  @ApiPropertyOptional({ example: true, description: 'Whether the train is active' }) @IsOptional() @Transform(({ value }) => value === 'true' ? true : value === 'false' ? false : value) @IsBoolean() isActive?: boolean;
 }
 
 export class CreateCoachDto {

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

@@ -593,6 +593,58 @@ export class FleetService {
     };
   }
 
+  async getCoachUtilization() {
+    const coaches = await this.prisma.coach.findMany({
+      include: {
+        coachType: true,
+        seats: { select: { id: true, status: true } },
+        assignments: {
+          include: {
+            schedule: {
+              select: { id: true, departureAt: true, status: true, _count: { select: { bookings: true } } },
+            },
+          },
+          orderBy: { schedule: { departureAt: 'desc' } },
+          take: 10,
+        },
+      },
+      orderBy: { sequence: 'asc' },
+    });
+
+    return coaches.map((coach) => {
+      const totalSeats = coach.seats.length;
+      const bookedSeats = coach.seats.filter((s) => s.status === 'BOOKED').length;
+      const blockedSeats = coach.seats.filter((s) => s.status === 'BLOCKED').length;
+      const maintenanceSeats = coach.seats.filter((s) => (s.status as string) === 'UNDER_MAINTENANCE').length;
+      const availableSeats = coach.seats.filter((s) => s.status === 'AVAILABLE').length;
+      const totalAssignments = coach.assignments.length;
+      const totalBookings = coach.assignments.reduce((sum, a) => sum + ((a.schedule as any)._count?.bookings ?? 0), 0);
+      const utilizationRate = totalSeats > 0 ? +((bookedSeats / totalSeats) * 100).toFixed(2) : 0;
+
+      return {
+        id: coach.id,
+        number: coach.number,
+        sequence: coach.sequence,
+        coachType: coach.coachType?.name,
+        status: coach.status,
+        totalSeats,
+        availableSeats,
+        bookedSeats,
+        blockedSeats,
+        maintenanceSeats,
+        utilizationRate,
+        totalAssignments,
+        totalBookings,
+        recentSchedules: coach.assignments.slice(0, 5).map((a) => ({
+          scheduleId: a.scheduleId,
+          departureAt: a.schedule.departureAt,
+          scheduleStatus: a.schedule.status,
+          bookings: (a.schedule as any)._count?.bookings ?? 0,
+        })),
+      };
+    });
+  }
+
   async getAnalytics() {
     const [totalTrains, totalSchedules, totalSeats, bookedSeats] = await Promise.all([
       this.prisma.train.count(),