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)'