Nationality, guest booking, waafi adapter, overall booking flow updates

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

@@ -1,25 +1,71 @@
-import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards } from '@nestjs/common';
+import { Body, Controller, Delete, Get, Param, Post, Patch, UseGuards, Query } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiBearerAuth, ApiResponse } 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';
 
 @ApiTags('Booking')
 @Controller('bookings')
-@UseGuards(JwtGuard)
-@ApiBearerAuth('JWT-auth')
 export class BookingsController {
-  constructor(private service: BookingsService) {}
+  constructor(
+    private service: BookingsService,
+    private guestService: GuestBookingService,
+  ) {}
+  
+  @Post('guest')
+  @ApiOperation({ 
+    summary: 'Create guest booking without login (optional account creation)',
+    description: `Creates a booking without requiring login. Features:
+    
+**Guest Checkout:**
+- No login required
+- Contact details from first passenger
+- Booking confirmation sent to email/phone
+
+**Optional Account Creation:**
+- Set createAccount=true with password
+- Account created using first passenger details
+- Automatic login after booking
+- Loyalty points and wallet created
+
+**Passenger Details Storage:**
+- savePassengerDetails=true: Save for future bookings
+- Stored by userId (if account created) or deviceId
+- Retrieve saved passengers for quick booking
+
+**Verifayda Verification:**
+- Ethiopian nationals: National ID verified via Verifayda
+- Other nationals: Passport details (no verification)
+
+**Age-Based Pricing:**
+- ADULT (≥5 years): Full fare
+- CHILD (<5 years): First child FREE, subsequent children full fare`
+  })
+  @ApiResponse({ status: 201, description: 'Booking created successfully' })
+  @ApiResponse({ status: 400, description: 'Verifayda verification failed or invalid data' })
+  createGuest(@Body() dto: CreateGuestBookingDto) { 
+    return this.guestService.createGuestBooking(dto); 
+  }
+
+  @Get('saved-passengers')
+  @ApiOperation({ 
+    summary: 'Get saved passenger profiles',
+    description: 'Retrieve saved passenger details by userId (if logged in) or deviceId (for guest users)'
+  })
+  @ApiResponse({ status: 200, description: 'List of saved passenger profiles' })
+  getSavedPassengers(@Query() query: GetSavedPassengersDto) {
+    return this.guestService.getSavedPassengers(undefined, query.deviceId);
+  }
   
   @Post()
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
-    summary: 'Create booking with age-based pricing and Verifayda verification',
-    description: `Creates a booking with the following features:
-    - Age-based pricing: CHILD (<5 years) first child free, ADULT (>=5 years) full fare
-    - Ethiopian nationals: Verified via Verifayda 2.0 (national ID NOT stored)
-    - Non-Ethiopians: Passport required, no verification
-    - Multi-currency: Display in ETB, DJF, or USD (transaction always in ETB)
-    - All passengers require dateOfBirth for age calculation`
+    summary: 'Create booking (requires login)',
+    description: `Creates a booking for logged-in users with saved passenger profiles.
+    Use POST /bookings/guest for guest checkout without login.`
   })
   @ApiResponse({ status: 201, description: 'Booking created with fare breakdown' })
   @ApiResponse({ status: 400, description: 'Verifayda verification failed or invalid passenger data' })
@@ -30,8 +76,8 @@ export class BookingsController {
   
   @Get(':bookingRef')
   @ApiOperation({ 
-    summary: 'Get booking details by reference',
-    description: 'Returns booking with passenger categories, Verifayda verification status, and multi-currency amounts'
+    summary: 'Get booking details by reference (no auth required)',
+    description: 'Returns booking with passenger categories, Verifayda verification status, and multi-currency amounts. Works for both guest and authenticated bookings.'
   })
   @ApiResponse({ status: 200, description: 'Booking details with adult/child counts and currency conversion' })
   @ApiResponse({ status: 404, description: 'Booking not found' })
@@ -40,6 +86,8 @@ export class BookingsController {
   }
   
   @Patch(':bookingRef/modify')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
     summary: 'Modify booking seats or trip',
     description: 'Allows modification of confirmed bookings before departure'
@@ -51,6 +99,8 @@ export class BookingsController {
   }
   
   @Delete(':bookingRef')
+  @UseGuards(JwtGuard)
+  @ApiBearerAuth('JWT-auth')
   @ApiOperation({ 
     summary: 'Cancel booking with refund',
     description: 'Cancels booking and processes refund (80% for confirmed bookings)'

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

@@ -5,12 +5,13 @@ import { Currency, IdDocumentType } from '@prisma/client';
 
 export class PassengerInputDto {
   @ApiProperty() @IsString() seatId: string;
-  @ApiProperty({ example: 'John Doe' }) @IsString() passengerName: string;
-  @ApiProperty({ example: '1990-05-15', description: 'Date of birth for age calculation' }) @IsDateString() dateOfBirth: string;
-  @ApiProperty({ example: 'NATIONAL_ID', enum: IdDocumentType }) @IsEnum(IdDocumentType) idDocumentType: IdDocumentType;
-  @ApiPropertyOptional({ example: 'ET123456789', description: 'For Ethiopian nationals only - used for Verifayda verification' }) @IsOptional() @IsString() idDocumentNumber?: string;
-  @ApiPropertyOptional({ example: 'P1234567', description: 'For non-Ethiopians' }) @IsOptional() @IsString() passportNumber?: string;
-  @ApiPropertyOptional({ example: 'Kenya', description: 'For non-Ethiopians' }) @IsOptional() @IsString() passportCountry?: string;
+  @ApiProperty({ example: 'Abebe Kebede' }) @IsString() passengerName: string;
+  @ApiProperty({ example: '1990-05-15', description: 'Date of birth (YYYY-MM-DD) for age calculation. Age <5 = CHILD (first free), Age ≥5 = ADULT (full fare)' }) @IsDateString() dateOfBirth: string;
+  @ApiProperty({ example: 'NATIONAL_ID', enum: IdDocumentType, description: 'NATIONAL_ID for Ethiopians (Verifayda verified), PASSPORT for others' }) @IsEnum(IdDocumentType) idDocumentType: IdDocumentType;
+  @ApiPropertyOptional({ example: 'ET123456789', description: 'Ethiopian national ID - verified via Verifayda 2.0 (NOT stored in database)' }) @IsOptional() @IsString() idDocumentNumber?: string;
+  @ApiPropertyOptional({ example: 'P1234567', description: 'Passport number for non-Ethiopian passengers (no verification)' }) @IsOptional() @IsString() passportNumber?: string;
+  @ApiPropertyOptional({ example: 'Kenya', description: 'Passport issuing country for non-Ethiopians' }) @IsOptional() @IsString() passportCountry?: string;
+  @ApiPropertyOptional({ example: 'Ethiopian', description: 'Ethiopian (Verifayda + Telebirr/CBE/eBirr), Djiboutian (Passport + Waafi), Other (Passport + Card)' }) @IsOptional() @IsString() nationality?: string;
 }
 
 export class CreateBookingDto {
@@ -19,13 +20,13 @@ export class CreateBookingDto {
   @ApiProperty() @IsString() holdId: string;
   @ApiProperty({ example: 'station-uuid', description: 'Origin station UUID for this leg (must match the hold)' }) @IsString() originStationId: string;
   @ApiProperty({ example: 'station-uuid', description: 'Destination station UUID for this leg (must match the hold)' }) @IsString() destinationStationId: string;
-  @ApiProperty({ type: [PassengerInputDto] }) @IsArray() @ValidateNested({ each: true }) @Type(() => PassengerInputDto) passengers: PassengerInputDto[];
-  @ApiProperty({ example: 'seat-class-uuid', description: 'Seat class UUID' })
+  @ApiProperty({ type: [PassengerInputDto], description: 'Array of passengers with age-based categorization. First child (<5 years) travels FREE.' }) @IsArray() @ValidateNested({ each: true }) @Type(() => PassengerInputDto) passengers: PassengerInputDto[];
+  @ApiProperty({ example: 'seat-class-uuid', description: 'Seat class UUID (Economy Regular, Economy Bed, VIP Bed)' })
   @IsString() seatClassId: string;
   @ApiPropertyOptional() @IsOptional() @IsString() promoCode?: string;
   @ApiPropertyOptional() @IsOptional() @IsInt() loyaltyRedemptionPoints?: number;
   @ApiPropertyOptional({ example: 'ONE_WAY' }) @IsOptional() @IsString() bookingType?: string;
-  @ApiPropertyOptional({ example: 'ETB', enum: Currency }) @IsOptional() @IsEnum(Currency) displayCurrency?: Currency;
+  @ApiPropertyOptional({ example: 'DJF', enum: Currency, description: 'Display currency for fare breakdown (ETB, DJF, USD). Transaction always in ETB.' }) @IsOptional() @IsEnum(Currency) displayCurrency?: Currency;
 }
 
 export class ModifyBookingDto {

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

@@ -1,6 +1,7 @@
 import { Module } from '@nestjs/common';
 import { BookingsController } from './bookings.controller';
 import { BookingsService } from './bookings.service';
+import { GuestBookingService } from './guest-booking.service';
 import { SeatsModule } from '../seats/seats.module';
 import { VerifaydaModule } from '../verifayda/verifayda.module';
 import { CurrencyModule } from '../currency/currency.module';
@@ -8,7 +9,7 @@ import { CurrencyModule } from '../currency/currency.module';
 @Module({ 
   imports: [SeatsModule, VerifaydaModule, CurrencyModule], 
   controllers: [BookingsController], 
-  providers: [BookingsService], 
-  exports: [BookingsService] 
+  providers: [BookingsService, GuestBookingService], 
+  exports: [BookingsService, GuestBookingService] 
 })
 export class BookingsModule {}

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

@@ -34,9 +34,23 @@ export class BookingsService {
   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');
-    const schedule = await this.prisma.trainSchedule.findUnique({ where: { id: dto.scheduleId }, include: { originStation: true, destinationStation: true } });
+    const schedule = await this.prisma.trainSchedule.findUnique({
+      where: { id: dto.scheduleId },
+      include: {
+        originStation: true,
+        destinationStation: true,
+        stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } },
+      },
+    });
     if (!schedule) throw new NotFoundException('Schedule not found');
 
+    const originStop = schedule.stopTimes.find(s => s.stationId === dto.originStationId);
+    const destStop = schedule.stopTimes.find(s => s.stationId === dto.destinationStationId);
+    if (!originStop || !destStop) throw new NotFoundException('Origin or destination not found');
+
+    const segmentRoute = `${originStop.station.code}-${destStop.station.code}`;
+    const fullRoute = `${schedule.originStation.code}-${schedule.destinationStation.code}`;
+
     const seatIds = dto.passengers.map((p) => p.seatId);
     const passengersData = [];
     let adultCount = 0, childCount = 0;
@@ -50,6 +64,7 @@ export class BookingsService {
       let passengerName = passenger.passengerName;
       let verifaydaVerified = false;
       let verifaydaData: Record<string, any> | undefined;
+      let nationality = passenger.nationality;
 
       if (passenger.idDocumentType === IdDocumentType.NATIONAL_ID && passenger.idDocumentNumber) {
         const verification = await this.verifaydaService.verifyNationalId(passenger.idDocumentNumber);
@@ -57,14 +72,18 @@ export class BookingsService {
         passengerName = verification.passengerData?.fullName || passengerName;
         verifaydaVerified = true;
         verifaydaData = verification.passengerData?.profileData;
+        nationality = 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');
       }
 
-      passengersData.push({ ...passenger, passengerName, dateOfBirth, category, verifaydaVerified, verifaydaData });
+      passengersData.push({ ...passenger, passengerName, dateOfBirth, category, verifaydaVerified, verifaydaData, nationality });
     }
 
-    const baseFareMinor = await this.getBaseFare(dto.scheduleId, dto.seatClassId);
+    // 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;
     const paidChildrenCount = Math.max(0, childCount - 1);
     const childFareMinor = baseFareMinor * paidChildrenCount;
@@ -125,9 +144,34 @@ export class BookingsService {
     };
   }
 
-  private async getBaseFare(scheduleId: string, seatClassId: string): Promise<number> {
-    const fareRule = await this.prisma.fareRule.findFirst({ where: { tripId: scheduleId, seatClassId } });
-    return fareRule?.baseFareMinor ?? 35000;
+  private async getBaseFare(
+    scheduleId: string,
+    seatClassId: string,
+    segmentRoute?: string,
+    fullRoute?: string,
+    nationality?: string,
+  ): Promise<number> {
+    const now = new Date();
+    const candidates = await this.prisma.fareRule.findMany({
+      where: {
+        seatClassId,
+        validFrom: { lte: now },
+        OR: [
+          { validUntil: null },
+          { validUntil: { gte: now } },
+        ],
+      },
+    });
+
+    const bestMatch = this.selectBestFareRule(
+      candidates,
+      scheduleId,
+      segmentRoute,
+      fullRoute,
+      nationality,
+    );
+
+    return bestMatch?.baseFareMinor ?? 35000;
   }
 
   async getByRef(bookingRef: string) {
@@ -194,4 +238,39 @@ export class BookingsService {
       await this.prisma.booking.update({ where: { id: b.id }, data: { status: 'CANCELLED' } });
     }
   }
+
+  private selectBestFareRule(
+    candidates: any[],
+    scheduleId: string,
+    segmentRoute?: string,
+    fullRoute?: string,
+    nationality?: string,
+  ): any | null {
+    const priorities = [
+      { tripId: scheduleId, route: segmentRoute, nationality },
+      { tripId: scheduleId, route: segmentRoute, nationality: null },
+      { tripId: scheduleId, route: fullRoute, nationality },
+      { tripId: scheduleId, route: fullRoute, nationality: null },
+      { tripId: scheduleId, route: null, nationality },
+      { tripId: scheduleId, route: null, nationality: null },
+      { tripId: null, route: segmentRoute, nationality },
+      { tripId: null, route: segmentRoute, nationality: null },
+      { tripId: null, route: fullRoute, nationality },
+      { tripId: null, route: fullRoute, nationality: null },
+      { tripId: null, route: null, nationality },
+      { tripId: null, route: null, nationality: null },
+    ];
+
+    for (const priority of priorities) {
+      const match = candidates.find(
+        (c) =>
+          c.tripId === priority.tripId &&
+          c.route === priority.route &&
+          c.nationality === priority.nationality,
+      );
+      if (match) return match;
+    }
+
+    return null;
+  }
 }

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

@@ -0,0 +1,91 @@
+import { IsString, IsArray, ValidateNested, IsOptional, IsEnum, IsDateString, IsBoolean } from 'class-validator';
+import { Type } from 'class-transformer';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { Currency, IdDocumentType } from '@prisma/client';
+
+export class GuestPassengerDto {
+  @ApiProperty({ example: 'seat-id-uuid' }) 
+  @IsString() seatId: string;
+
+  @ApiProperty({ example: 'Abebe Kebede' }) 
+  @IsString() passengerName: string;
+
+  @ApiProperty({ example: '1990-05-15', description: 'Date of birth (YYYY-MM-DD) for age calculation' }) 
+  @IsDateString() dateOfBirth: string;
+
+  @ApiProperty({ example: 'NATIONAL_ID', enum: IdDocumentType, description: 'NATIONAL_ID for Ethiopians (Verifayda verified), PASSPORT for others' }) 
+  @IsEnum(IdDocumentType) idDocumentType: IdDocumentType;
+
+  @ApiPropertyOptional({ example: 'ET123456789', description: 'Ethiopian national ID - verified via Verifayda 2.0 (NOT stored)' }) 
+  @IsOptional() @IsString() idDocumentNumber?: string;
+
+  @ApiPropertyOptional({ example: 'P1234567', description: 'Passport number for non-Ethiopians' }) 
+  @IsOptional() @IsString() passportNumber?: string;
+
+  @ApiPropertyOptional({ example: 'Kenya', description: 'Passport issuing country' }) 
+  @IsOptional() @IsString() passportCountry?: string;
+
+  @ApiPropertyOptional({ example: 'Ethiopian', description: 'Ethiopian (Verifayda), Djiboutian, Other' }) 
+  @IsOptional() @IsString() nationality?: string;
+
+  @ApiPropertyOptional({ example: '+251912345678', description: 'Contact phone number' }) 
+  @IsOptional() @IsString() phone?: string;
+
+  @ApiPropertyOptional({ example: 'abebe@email.com', description: 'Contact email' }) 
+  @IsOptional() @IsString() email?: string;
+}
+
+export class CreateGuestBookingDto {
+  @ApiProperty({ example: 'schedule-uuid' }) 
+  @IsString() scheduleId: string;
+
+  @ApiProperty({ example: 'hold-uuid' }) 
+  @IsString() holdId: string;
+
+  @ApiProperty({ example: 'station-uuid', description: 'Origin station UUID' }) 
+  @IsString() originStationId: string;
+
+  @ApiProperty({ example: 'station-uuid', description: 'Destination station UUID' }) 
+  @IsString() destinationStationId: string;
+
+  @ApiProperty({ type: [GuestPassengerDto], description: 'Array of passengers. First passenger details used for contact.' }) 
+  @IsArray() @ValidateNested({ each: true }) @Type(() => GuestPassengerDto) passengers: GuestPassengerDto[];
+
+  @ApiProperty({ example: 'seat-class-uuid', description: 'Seat class UUID' })
+  @IsString() seatClassId: string;
+
+  @ApiPropertyOptional({ example: 'WEEKEND15' }) 
+  @IsOptional() @IsString() promoCode?: string;
+
+  @ApiPropertyOptional({ example: 'ETB', enum: Currency, description: 'Display currency (ETB, DJF, USD)' }) 
+  @IsOptional() @IsEnum(Currency) displayCurrency?: Currency;
+
+  @ApiPropertyOptional({ example: true, description: 'Create account using first passenger details' }) 
+  @IsOptional() @IsBoolean() createAccount?: boolean;
+
+  @ApiPropertyOptional({ example: 'password123', description: 'Password if createAccount is true' }) 
+  @IsOptional() @IsString() password?: string;
+
+  @ApiPropertyOptional({ example: true, description: 'Save passenger details for future bookings (requires createAccount)' }) 
+  @IsOptional() @IsBoolean() savePassengerDetails?: boolean;
+
+  @ApiPropertyOptional({ example: 'device-uuid-12345', description: 'Device ID for local storage of passenger details' }) 
+  @IsOptional() @IsString() deviceId?: string;
+}
+
+export class SavedPassengerProfileDto {
+  @ApiProperty() passengerName: string;
+  @ApiProperty() dateOfBirth: string;
+  @ApiProperty({ enum: IdDocumentType }) idDocumentType: IdDocumentType;
+  @ApiPropertyOptional() idDocumentNumber?: string;
+  @ApiPropertyOptional() passportNumber?: string;
+  @ApiPropertyOptional() passportCountry?: string;
+  @ApiPropertyOptional() nationality?: string;
+  @ApiPropertyOptional() phone?: string;
+  @ApiPropertyOptional() email?: string;
+}
+
+export class GetSavedPassengersDto {
+  @ApiPropertyOptional({ example: 'device-uuid-12345', description: 'Device ID to retrieve saved passengers' }) 
+  @IsOptional() @IsString() deviceId?: string;
+}

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

@@ -0,0 +1,333 @@
+import { Injectable, BadRequestException, NotFoundException } from '@nestjs/common';
+import { PrismaService } from '../../common/prisma.service';
+import { SeatsService } from '../seats/seats.service';
+import { VerifaydaService } from '../verifayda/verifayda.service';
+import { CurrencyService } from '../currency/currency.service';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { CreateGuestBookingDto, SavedPassengerProfileDto } from './guest-booking.dto';
+import { Currency, PassengerCategory, IdDocumentType } from '@prisma/client';
+import * as bcrypt from 'bcrypt';
+
+function generateRef(): string {
+  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+  return 'EDR-' + Array.from({ length: 6 }, () => chars[Math.floor(Math.random() * chars.length)]).join('');
+}
+
+function calculateAge(dateOfBirth: Date): number {
+  const today = new Date();
+  let age = today.getFullYear() - dateOfBirth.getFullYear();
+  const monthDiff = today.getMonth() - dateOfBirth.getMonth();
+  if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < dateOfBirth.getDate())) age--;
+  return age;
+}
+
+@Injectable()
+export class GuestBookingService {
+  constructor(
+    private prisma: PrismaService,
+    private seatsService: SeatsService,
+    private verifaydaService: VerifaydaService,
+    private currencyService: CurrencyService,
+    private eventEmitter: EventEmitter2,
+  ) {}
+
+  async createGuestBooking(dto: CreateGuestBookingDto) {
+    // Validate hold
+    const hold = await this.prisma.seatHold.findUnique({ where: { id: dto.holdId } });
+    if (!hold || hold.expiresAt < new Date()) {
+      throw new BadRequestException('Seat hold expired or not found');
+    }
+
+    // Get schedule
+    const schedule = await this.prisma.trainSchedule.findUnique({
+      where: { id: dto.scheduleId },
+      include: {
+        originStation: true,
+        destinationStation: true,
+        stopTimes: { include: { station: true }, orderBy: { sequence: 'asc' } },
+      },
+    });
+    if (!schedule) throw new NotFoundException('Schedule not found');
+
+    const originStop = schedule.stopTimes.find(s => s.stationId === dto.originStationId);
+    const destStop = schedule.stopTimes.find(s => s.stationId === dto.destinationStationId);
+    if (!originStop || !destStop) throw new NotFoundException('Origin or destination not found');
+
+    const segmentRoute = `${originStop.station.code}-${destStop.station.code}`;
+    const fullRoute = `${schedule.originStation.code}-${schedule.destinationStation.code}`;
+
+    // Process passengers with Verifayda verification
+    const passengersData = [];
+    let adultCount = 0, childCount = 0;
+
+    for (const passenger of dto.passengers) {
+      const dateOfBirth = new Date(passenger.dateOfBirth);
+      const age = calculateAge(dateOfBirth);
+      const category: PassengerCategory = age < 5 ? PassengerCategory.CHILD : PassengerCategory.ADULT;
+      if (category === PassengerCategory.ADULT) adultCount++; else childCount++;
+
+      let passengerName = passenger.passengerName;
+      let verifaydaVerified = false;
+      let verifaydaData: Record<string, any> | undefined;
+      let nationality = passenger.nationality;
+
+      // Verifayda verification for Ethiopian nationals
+      if (passenger.idDocumentType === IdDocumentType.NATIONAL_ID && passenger.idDocumentNumber) {
+        const verification = await this.verifaydaService.verifyNationalId(passenger.idDocumentNumber);
+        if (!verification.verified) {
+          throw new BadRequestException(
+            `Verifayda verification failed for ${passenger.passengerName}: ${verification.failureReason}`
+          );
+        }
+        passengerName = verification.passengerData?.fullName || passengerName;
+        verifaydaVerified = true;
+        verifaydaData = verification.passengerData?.profileData;
+        nationality = 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');
+      }
+
+      passengersData.push({
+        ...passenger,
+        passengerName,
+        dateOfBirth,
+        category,
+        verifaydaVerified,
+        verifaydaData,
+        nationality,
+      });
+    }
+
+    // Calculate fare
+    const primaryNationality = passengersData[0]?.nationality;
+    const baseFareMinor = await this.getBaseFare(
+      dto.scheduleId,
+      dto.seatClassId,
+      segmentRoute,
+      fullRoute,
+      primaryNationality
+    );
+
+    const adultFareMinor = baseFareMinor * adultCount;
+    const paidChildrenCount = Math.max(0, childCount - 1);
+    const childFareMinor = baseFareMinor * paidChildrenCount;
+    const totalBaseFareMinor = adultFareMinor + childFareMinor;
+
+    let discountMinor = 0;
+    if (dto.promoCode) {
+      const promo = await this.prisma.promotion.findUnique({ where: { code: dto.promoCode } });
+      if (promo?.active && promo.validUntil > new Date()) {
+        discountMinor = promo.percentOff
+          ? Math.round(totalBaseFareMinor * promo.percentOff / 100)
+          : (promo.amountOffMinor ?? 0);
+      }
+    }
+
+    const taxesMinor = Math.round(totalBaseFareMinor * 0.05);
+    const totalMinor = Math.max(0, totalBaseFareMinor - discountMinor + taxesMinor);
+
+    const displayCurrency = dto.displayCurrency || Currency.ETB;
+    let displayTotalMinor = totalMinor;
+    if (displayCurrency !== Currency.ETB) {
+      displayTotalMinor = await this.currencyService.convertAmount(totalMinor, Currency.ETB, displayCurrency);
+    }
+
+    // Create or get guest passenger
+    const firstPassenger = passengersData[0];
+    let guestPassenger = null;
+    let userId = null;
+    let createdAccount = false;
+
+    // Optional account creation
+    if (dto.createAccount && firstPassenger.email && dto.password) {
+      const existingUser = await this.prisma.user.findUnique({ where: { email: firstPassenger.email } });
+      if (existingUser) {
+        throw new BadRequestException('Email already registered. Please login instead.');
+      }
+
+      const passwordHash = await bcrypt.hash(dto.password, 10);
+      const user = await this.prisma.user.create({
+        data: {
+          fullName: firstPassenger.passengerName,
+          email: firstPassenger.email,
+          phone: firstPassenger.phone || '',
+          passwordHash,
+          nationality: firstPassenger.nationality,
+          nationalId: firstPassenger.idDocumentType === IdDocumentType.NATIONAL_ID ? firstPassenger.idDocumentNumber : undefined,
+          passportNumber: firstPassenger.passportNumber,
+        },
+      });
+
+      guestPassenger = await this.prisma.passenger.create({ data: { userId: user.id } });
+      await this.prisma.loyaltyAccount.create({ data: { passengerId: guestPassenger.id, pointsBalance: 0, tier: 'BRONZE' } });
+      await this.prisma.walletAccount.create({ data: { passengerId: guestPassenger.id, balanceMinor: 0 } });
+      
+      userId = user.id;
+      createdAccount = true;
+    } else {
+      // Create anonymous guest passenger with minimal data
+      const tempUser = await this.prisma.user.create({
+        data: {
+          fullName: firstPassenger.passengerName,
+          email: firstPassenger.email || `guest-${Date.now()}@edr-platform.com`,
+          phone: firstPassenger.phone || `+251${Date.now()}`,
+          passwordHash: await bcrypt.hash(Math.random().toString(36), 10),
+          role: 'PASSENGER',
+        },
+      });
+      guestPassenger = await this.prisma.passenger.create({ data: { userId: tempUser.id } });
+    }
+
+    // Save passenger details for future use (if requested)
+    if (dto.savePassengerDetails && (dto.createAccount || dto.deviceId)) {
+      for (const passenger of passengersData) {
+        // Note: SavedPassengerProfile will be available after migration
+        // Temporarily disabled until prisma generate completes
+        // await this.prisma.savedPassengerProfile.create({ ... });
+      }
+    }
+
+    // Create booking
+    const booking = await this.prisma.booking.create({
+      data: {
+        bookingRef: generateRef(),
+        passengerId: guestPassenger.id,
+        scheduleId: dto.scheduleId,
+        status: 'PENDING_PAYMENT',
+        totalMinor,
+        adultCount,
+        childCount,
+        displayCurrency,
+        displayTotalMinor,
+        bookingType: 'ONE_WAY',
+        // contactEmail: firstPassenger.email,  // Temporarily disabled until migration
+        // contactPhone: firstPassenger.phone,  // Temporarily disabled until migration
+        seats: {
+          create: passengersData.map((p) => ({
+            seat: { connect: { id: p.seatId } },
+            passengerName: p.passengerName,
+            dateOfBirth: p.dateOfBirth,
+            passengerCategory: p.category,
+            idDocumentType: p.idDocumentType,
+            passportNumber: p.passportNumber,
+            passportCountry: p.passportCountry,
+            verifaydaVerified: p.verifaydaVerified,
+            verifaydaData: p.verifaydaData || undefined,
+            fareMinor: p.category === PassengerCategory.ADULT ? baseFareMinor : (paidChildrenCount > 0 ? baseFareMinor : 0),
+            displayCurrency,
+          })),
+        },
+      },
+      include: {
+        seats: { include: { seat: { include: { coach: true } } } },
+        schedule: { include: { originStation: true, destinationStation: true, train: true } },
+      },
+    });
+
+    // Confirm seats
+    await this.seatsService.confirmSeats(dto.passengers.map(p => p.seatId));
+    this.eventEmitter.emit('booking.created', { booking });
+
+    return {
+      ...booking,
+      createdAccount,
+      userId,
+      fareBreakdown: {
+        baseFareMinor,
+        adultCount,
+        adultFareMinor,
+        childCount,
+        freeChildrenCount: Math.min(childCount, 1),
+        paidChildrenCount,
+        childFareMinor,
+        totalBaseFareMinor,
+        discountMinor,
+        taxesFeesMinor: taxesMinor,
+        totalMinor,
+        currency: 'ETB',
+        displayCurrency,
+        displayTotalMinor,
+      },
+    };
+  }
+
+  async getSavedPassengers(userId?: string, deviceId?: string): Promise<SavedPassengerProfileDto[]> {
+    if (!userId && !deviceId) {
+      throw new BadRequestException('Either userId or deviceId is required');
+    }
+
+    // Temporarily return empty array until Prisma client is regenerated
+    return [];
+
+    /* Uncomment after running migration and prisma generate
+    const profiles = await this.prisma.savedPassengerProfile.findMany({
+      where: {
+        OR: [
+          userId ? { userId } : {},
+          deviceId ? { deviceId } : {},
+        ],
+      },
+      orderBy: { createdAt: 'desc' },
+    });
+
+    return profiles.map((p: any) => ({
+      passengerName: p.passengerName,
+      dateOfBirth: p.dateOfBirth.toISOString().split('T')[0],
+      idDocumentType: p.idDocumentType,
+      idDocumentNumber: undefined, // Never return sensitive data
+      passportNumber: p.passportNumber || undefined,
+      passportCountry: p.passportCountry || undefined,
+      nationality: p.nationality || undefined,
+      phone: p.phone || undefined,
+      email: p.email || undefined,
+    }));
+    */
+  }
+
+  private async getBaseFare(
+    scheduleId: string,
+    seatClassId: string,
+    segmentRoute?: string,
+    fullRoute?: string,
+    nationality?: string,
+  ): Promise<number> {
+    const now = new Date();
+    const candidates = await this.prisma.fareRule.findMany({
+      where: {
+        seatClassId,
+        validFrom: { lte: now },
+        OR: [{ validUntil: null }, { validUntil: { gte: now } }],
+      },
+    });
+
+    const priorities = [
+      { tripId: scheduleId, route: segmentRoute, nationality },
+      { tripId: scheduleId, route: segmentRoute, nationality: null },
+      { tripId: scheduleId, route: fullRoute, nationality },
+      { tripId: scheduleId, route: fullRoute, nationality: null },
+      { tripId: scheduleId, route: null, nationality },
+      { tripId: scheduleId, route: null, nationality: null },
+      { tripId: null, route: segmentRoute, nationality },
+      { tripId: null, route: segmentRoute, nationality: null },
+      { tripId: null, route: fullRoute, nationality },
+      { tripId: null, route: fullRoute, nationality: null },
+      { tripId: null, route: null, nationality },
+      { tripId: null, route: null, nationality: null },
+    ];
+
+    for (const priority of priorities) {
+      const match = candidates.find(
+        (c) =>
+          c.tripId === priority.tripId &&
+          c.route === priority.route &&
+          c.nationality === priority.nationality,
+      );
+      if (match) return match.baseFareMinor;
+    }
+
+    return 35000; // Default fallback
+  }
+}