First passenger and back office portal commit

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

@@ -1,10 +1,11 @@
 import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query } from '@nestjs/common';
-import { ApiTags, ApiOperation, ApiBearerAuth, ApiResponse } from '@nestjs/swagger';
+import { ApiTags, ApiOperation, ApiBearerAuth, ApiResponse, ApiQuery } from '@nestjs/swagger';
 import { BookingsService } from './bookings.service';
 import { GuestBookingService } from './guest-booking.service';
 import { CreateBookingDto, ModifyBookingDto, CancelBookingDto } from './bookings.dto';
 import { CreateGuestBookingDto, GetSavedPassengersDto } from './guest-booking.dto';
 import { JwtGuard } from '../../common/jwt.guard';
+import { IamGuard } from '../../common/iam-adapter';
 
 @ApiTags('Booking')
 @Controller('bookings')
@@ -14,6 +15,29 @@ export class BookingsController {
     private guestService: GuestBookingService,
   ) {}
   
+  @Get()
+  @ApiOperation({ 
+    summary: 'List all bookings with filters (Admin/Agent)',
+    description: 'Returns paginated list of bookings with search and status filters'
+  })
+  @ApiQuery({ name: 'search', required: false, description: 'Search by booking reference, email, or phone' })
+  @ApiQuery({ name: 'status', required: false, description: 'Filter by booking status' })
+  @ApiQuery({ name: 'page', required: false, description: 'Page number' })
+  @ApiQuery({ name: 'pageSize', required: false, description: 'Items per page' })
+  findAll(
+    @Query('search') search?: string,
+    @Query('status') status?: string,
+    @Query('page') page?: string,
+    @Query('pageSize') pageSize?: string,
+  ) {
+    return this.service.findAll({ 
+      search, 
+      status, 
+      page: page ? parseInt(page) : 1, 
+      pageSize: pageSize ? parseInt(pageSize) : 20 
+    });
+  }
+  
   @Post('guest')
   @ApiOperation({ 
     summary: 'Create guest booking without login (optional account creation)',

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

@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+import { HttpModule } from '@nestjs/axios';
 import { BookingsController } from './bookings.controller';
 import { BookingsService } from './bookings.service';
 import { GuestBookingService } from './guest-booking.service';
@@ -7,7 +8,7 @@ import { VerifaydaModule } from '../verifayda/verifayda.module';
 import { CurrencyModule } from '../currency/currency.module';
 
 @Module({ 
-  imports: [SeatsModule, VerifaydaModule, CurrencyModule], 
+  imports: [SeatsModule, VerifaydaModule, CurrencyModule, HttpModule], 
   controllers: [BookingsController], 
   providers: [BookingsService, GuestBookingService], 
   exports: [BookingsService, GuestBookingService] 

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

@@ -21,6 +21,13 @@ function calculateAge(dateOfBirth: Date): number {
   return age;
 }
 
+interface BookingFilters {
+  search?: string;
+  status?: string;
+  page?: number;
+  pageSize?: number;
+}
+
 @Injectable()
 export class BookingsService {
   constructor(
@@ -31,6 +38,72 @@ export class BookingsService {
     private currencyService: CurrencyService,
   ) {}
 
+  async findAll(filters: BookingFilters = {}) {
+    const { search, status, page = 1, pageSize = 20 } = filters;
+    const skip = (page - 1) * pageSize;
+    
+    const where: any = {};
+    
+    if (search) {
+      where.OR = [
+        { bookingRef: { contains: search, mode: 'insensitive' } },
+        { contactEmail: { contains: search, mode: 'insensitive' } },
+        { contactPhone: { contains: search, mode: 'insensitive' } },
+        { passenger: { user: { fullName: { contains: search, mode: 'insensitive' } } } },
+      ];
+    }
+    
+    if (status) {
+      where.status = status;
+    }
+    
+    const [items, total] = await Promise.all([
+      this.prisma.booking.findMany({
+        where,
+        skip,
+        take: pageSize,
+        orderBy: { createdAt: 'desc' },
+        include: {
+          passenger: { include: { user: true } },
+          schedule: { include: { originStation: true, destinationStation: true, train: true } },
+          paymentIntent: true,
+          seats: { include: { seat: true } },
+        },
+      }),
+      this.prisma.booking.count({ where }),
+    ]);
+    
+    return {
+      items: items.map(booking => ({
+        id: booking.id,
+        bookingRef: booking.bookingRef,
+        status: booking.status,
+        totalMinor: booking.totalMinor,
+        currency: 'ETB',
+        displayCurrency: booking.displayCurrency,
+        displayTotalMinor: booking.displayTotalMinor,
+        contactEmail: booking.contactEmail,
+        contactPhone: booking.contactPhone,
+        createdAt: booking.createdAt,
+        passenger: booking.passenger?.user,
+        schedule: {
+          train: booking.schedule.train,
+          originStation: booking.schedule.originStation,
+          destinationStation: booking.schedule.destinationStation,
+          departureAt: booking.schedule.departureAt,
+        },
+        paymentIntent: booking.paymentIntent,
+        seatCount: booking.seats.length,
+      })),
+      meta: {
+        page,
+        pageSize,
+        total,
+        totalPages: Math.ceil(total / pageSize),
+      },
+    };
+  }
+
   async create(dto: CreateBookingDto) {
     const hold = await this.prisma.seatHold.findUnique({ where: { id: dto.holdId } });
     if (!hold || hold.expiresAt < new Date()) throw new BadRequestException('Seat hold expired');

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

@@ -71,8 +71,11 @@ export class GuestBookingService {
       let verifaydaData: Record<string, any> | undefined;
       let nationality = passenger.nationality;
 
-      // Verifayda verification for Ethiopian nationals
-      if (passenger.idDocumentType === IdDocumentType.NATIONAL_ID && passenger.idDocumentNumber) {
+      // Verifayda verification ONLY for Ethiopian nationals with National ID
+      const isEthiopian = !passenger.nationality || passenger.nationality === 'Ethiopian' || 
+                          (passenger.idDocumentType === IdDocumentType.NATIONAL_ID && !passenger.passportCountry);
+      
+      if (isEthiopian && passenger.idDocumentType === IdDocumentType.NATIONAL_ID && passenger.idDocumentNumber) {
         const verification = await this.verifaydaService.verifyNationalId(passenger.idDocumentNumber);
         if (!verification.verified) {
           throw new BadRequestException(
@@ -82,12 +85,15 @@ export class GuestBookingService {
         passengerName = verification.passengerData?.fullName || passengerName;
         verifaydaVerified = true;
         verifaydaData = verification.passengerData?.profileData;
-        nationality = nationality || 'Ethiopian';
+        nationality = 'Ethiopian';
       } else if (passenger.idDocumentType === IdDocumentType.PASSPORT) {
         if (!passenger.passportNumber || !passenger.passportCountry) {
           throw new BadRequestException(`Passport number and country required for ${passenger.passengerName}`);
         }
         nationality = nationality || (passenger.passportCountry === 'Djibouti' ? 'Djiboutian' : 'Other');
+      } else if (passenger.idDocumentType === IdDocumentType.NATIONAL_ID && !isEthiopian) {
+        // Non-Ethiopian with national ID (e.g., Djiboutian national ID)
+        nationality = nationality || 'Other';
       }
 
       passengersData.push({