Package passenger numbers and pricing updates

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

@@ -341,8 +341,9 @@ export class BookingsService {
         totalMinor: b.totalMinor, currency: b.currency || 'ETB',
         displayCurrency: b.displayCurrency, displayTotalMinor: b.displayTotalMinor,
         contactEmail: b.contactEmail, contactPhone: b.contactPhone,
-        bookingType: 'PACKAGE', packageId: b.packageId, isPackageBooking: true,
-        packageName: b.package?.name, packageCode: b.package?.code,
+        bookingType: 'PACKAGE', packageId: b.packageId, priceTierId: b.priceTierId,
+        isPackageBooking: true, packageName: b.package?.name, packageCode: b.package?.code,
+        tierLabel: b.priceTier?.label ?? null,
         returnLegStatus: null, adultCount: b.passengerCount, childCount: 0,
         createdAt: b.createdAt, passenger: null,
         passengerNames: b.passengers?.map((p: any) => p.passengerName) ?? [],
@@ -372,6 +373,8 @@ export class BookingsService {
           schedule: { include: { originStation: true, destinationStation: true, train: true } },
           paymentIntent: true,
           seats: { include: { seat: true } },
+          package: { select: { id: true, name: true, code: true } },
+          priceTier: { select: { id: true, label: true } },
         },
       }),
       this.prisma.booking.count({ where }),
@@ -415,6 +418,10 @@ export class BookingsService {
         contactPhone: booking.contactPhone,
         bookingType: booking.bookingType,
         packageId: booking.packageId ?? null,
+        priceTierId: (booking as any).priceTierId ?? null,
+        packageName: (booking as any).package?.name ?? null,
+        packageCode: (booking as any).package?.code ?? null,
+        tierLabel: (booking as any).priceTier?.label ?? null,
         isPackageBooking: !!booking.packageId,
         returnLegStatus: (booking as any).returnLegStatus ?? null,
         adultCount: booking.adultCount,
@@ -446,9 +453,11 @@ export class BookingsService {
       contactPhone: b.contactPhone,
       bookingType: 'PACKAGE',
       packageId: b.packageId,
+      priceTierId: b.priceTierId,
       isPackageBooking: true,
       packageName: b.package?.name,
       packageCode: b.package?.code,
+      tierLabel: b.priceTier?.label ?? null,
       returnLegStatus: null,
       adultCount: b.passengerCount,
       childCount: 0,
@@ -518,20 +527,18 @@ export class BookingsService {
       displayTotalMinor = await this.currencyService.convertAmount(fareCalculation.totalMinor, Currency.ETB, displayCurrency);
     }
 
-    // Track which child gets free fare (first child encountered)
+    // Track per-seat fare. For package bookings children pay 10% of adult fare;
+    // for regular bookings the first child is free.
     let freeChildUsed = false;
     const passengersWithFares = passengersData.map(p => {
       let fareMinor: number;
       if (p.category === PassengerCategory.ADULT) {
         fareMinor = fareCalculation.baseFareMinor;
+      } else if (dto.packageId) {
+        fareMinor = Math.round(fareCalculation.baseFareMinor * 0.1);
       } else {
-        // Child: first child is free, subsequent children pay full fare
-        if (!freeChildUsed) {
-          fareMinor = 0;
-          freeChildUsed = true;
-        } else {
-          fareMinor = fareCalculation.baseFareMinor;
-        }
+        if (!freeChildUsed) { fareMinor = 0; freeChildUsed = true; }
+        else fareMinor = fareCalculation.baseFareMinor;
       }
       return { ...p, fareMinor };
     });
@@ -661,34 +668,27 @@ export class BookingsService {
       displayTotalMinor = await this.currencyService.convertAmount(totalMinor, Currency.ETB, displayCurrency);
     }
 
-    // Track which child gets free fare for outbound and return legs
+    // Track per-seat fare. For package bookings children pay 10% of adult fare;
+    // for regular bookings the first child is free per leg.
     let outboundFreeChildUsed = false;
     let returnFreeChildUsed = false;
     const passengersWithFares = passengersData.map(p => {
       let outboundFareMinor: number;
       let returnFareMinor: number;
-      
+
       if (p.category === PassengerCategory.ADULT) {
         outboundFareMinor = outboundFare.baseFareMinor;
         returnFareMinor = returnFare.baseFareMinor;
+      } else if (dto.packageId) {
+        outboundFareMinor = Math.round(outboundFare.baseFareMinor * 0.1);
+        returnFareMinor   = Math.round(returnFare.baseFareMinor   * 0.1);
       } else {
-        // Child fare for outbound
-        if (!outboundFreeChildUsed) {
-          outboundFareMinor = 0;
-          outboundFreeChildUsed = true;
-        } else {
-          outboundFareMinor = outboundFare.baseFareMinor;
-        }
-        
-        // Child fare for return
-        if (!returnFreeChildUsed) {
-          returnFareMinor = 0;
-          returnFreeChildUsed = true;
-        } else {
-          returnFareMinor = returnFare.baseFareMinor;
-        }
+        if (!outboundFreeChildUsed) { outboundFareMinor = 0; outboundFreeChildUsed = true; }
+        else outboundFareMinor = outboundFare.baseFareMinor;
+        if (!returnFreeChildUsed)   { returnFareMinor   = 0; returnFreeChildUsed   = true; }
+        else returnFareMinor   = returnFare.baseFareMinor;
       }
-      
+
       return { ...p, outboundFareMinor, returnFareMinor };
     });
 
@@ -1231,16 +1231,20 @@ export class BookingsService {
     childCount: number,
   ) {
     const tier = await this.prisma.packagePriceTier.findUniqueOrThrow({ where: { id: priceTierId } });
-    const passengerCount = adultCount + childCount;
-    const totalBaseFareMinor = tier.priceMinor * passengerCount;
+    // For round-trip packages the caller splits the tier price across legs, so
+    // priceMinor here is already the per-leg amount. Children pay 10% of adult fare.
+    const childFareMinor = Math.round(tier.priceMinor * 0.1);
+    const adultFareMinor = tier.priceMinor * adultCount;
+    const childTotalMinor = childFareMinor * childCount;
+    const totalBaseFareMinor = adultFareMinor + childTotalMinor;
     return {
       baseFareMinor: tier.priceMinor,
       adultCount,
-      adultFareMinor: tier.priceMinor * adultCount,
+      adultFareMinor,
       childCount,
       freeChildrenCount: 0,
       paidChildrenCount: childCount,
-      childFareMinor: tier.priceMinor * childCount,
+      childFareMinor: childTotalMinor,
       totalBaseFareMinor,
       discountMinor: 0,
       loyaltyRedemptionMinor: 0,

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

@@ -144,6 +144,12 @@ export class CreateGuestBookingDto {
 
   @ApiPropertyOptional({ example: 'device-uuid-12345', description: 'Device ID for local storage of passenger details' }) 
   @IsOptional() @IsString() deviceId?: string;
+
+  @ApiPropertyOptional({ description: 'Package ID — when set, fare is taken from the package price tier' })
+  @IsOptional() @IsString() packageId?: string;
+
+  @ApiPropertyOptional({ description: 'Package price tier ID — required when packageId is provided' })
+  @IsOptional() @IsString() priceTierId?: string;
 }
 
 export class SavedPassengerProfileDto {

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

@@ -157,8 +157,10 @@ export class GuestBookingService {
     );
 
     const adultFareMinor = baseFareMinor * adultCount;
-    const paidChildrenCount = Math.max(0, childCount - 1);
-    const childFareMinor = baseFareMinor * paidChildrenCount;
+    const isPackageOneway = !!dto.packageId;
+    const paidChildrenCount = isPackageOneway ? childCount : Math.max(0, childCount - 1);
+    const childUnitFare = isPackageOneway ? Math.round(baseFareMinor * 0.1) : baseFareMinor;
+    const childFareMinor = childUnitFare * paidChildrenCount;
     const totalBaseFareMinor = adultFareMinor + childFareMinor;
 
     let discountMinor = 0;
@@ -217,6 +219,7 @@ export class GuestBookingService {
         displayCurrency,
         displayTotalMinor,
         bookingType: 'ONE_WAY',
+        ...(dto.packageId ? { packageId: dto.packageId, priceTierId: dto.priceTierId } : {}),
         userAgent:    dto.deviceId,
         contactEmail: firstPassenger.email || null,
         contactPhone: firstPassenger.phone || null,
@@ -231,7 +234,7 @@ export class GuestBookingService {
             passportCountry: p.passportCountry,
             verifaydaVerified: p.verifaydaVerified,
             verifaydaData: p.verifaydaData || undefined,
-            fareMinor: p.category === PassengerCategory.ADULT ? baseFareMinor : (paidChildrenCount > 0 ? baseFareMinor : 0),
+            fareMinor: p.category === PassengerCategory.ADULT ? baseFareMinor : childUnitFare,
             displayCurrency,
           })),
         },
@@ -258,7 +261,7 @@ export class GuestBookingService {
         adultCount,
         adultFareMinor,
         childCount,
-        freeChildrenCount: Math.min(childCount, 1),
+        freeChildrenCount: isPackageOneway ? 0 : Math.min(childCount, 1),
         paidChildrenCount,
         childFareMinor,
         totalBaseFareMinor,
@@ -375,9 +378,12 @@ export class GuestBookingService {
       this.getBaseFare(dto.returnScheduleId, returnSeatClassId, returnSegmentRoute, returnFullRoute, primaryNationality, dto.returnOriginStationId, dto.returnDestinationStationId),
     ]);
 
-    const paidChildrenCount      = Math.max(0, childCount - 1);
-    const outboundTotalBase      = outboundBaseFare * adultCount + outboundBaseFare * paidChildrenCount;
-    const returnTotalBase        = returnBaseFare  * adultCount + returnBaseFare  * paidChildrenCount;
+    const isPackageRoundTrip = !!dto.packageId;
+    const paidChildrenCount = isPackageRoundTrip ? childCount : Math.max(0, childCount - 1);
+    const outboundChildUnitFare = isPackageRoundTrip ? Math.round(outboundBaseFare * 0.1) : outboundBaseFare;
+    const returnChildUnitFare   = isPackageRoundTrip ? Math.round(returnBaseFare   * 0.1) : returnBaseFare;
+    const outboundTotalBase      = outboundBaseFare * adultCount + outboundChildUnitFare * paidChildrenCount;
+    const returnTotalBase        = returnBaseFare  * adultCount + returnChildUnitFare  * paidChildrenCount;
     const combinedBaseFareMinor  = outboundTotalBase + returnTotalBase;
 
     let discountMinor = 0;
@@ -423,6 +429,7 @@ export class GuestBookingService {
         returnHoldId:                dto.returnHoldId,
         returnSeatClassId,
         returnLegStatus:             'NEITHER_USED',
+        ...(dto.packageId ? { packageId: dto.packageId, priceTierId: dto.priceTierId } : {}),
         userAgent:                   dto.deviceId,
         contactEmail:                passengersData[0]?.email || null,
         contactPhone:                passengersData[0]?.phone || null,
@@ -440,7 +447,7 @@ export class GuestBookingService {
               passportCountry:   p.passportCountry,
               verifaydaVerified: p.verifaydaVerified,
               verifaydaData:     p.verifaydaData || undefined,
-              fareMinor:         p.category === PassengerCategory.ADULT ? outboundBaseFare : (paidChildrenCount > 0 ? outboundBaseFare : 0),
+              fareMinor:         p.category === PassengerCategory.ADULT ? outboundBaseFare : outboundChildUnitFare,
               displayCurrency,
             })),
             ...passengersData.map((p) => ({
@@ -455,7 +462,7 @@ export class GuestBookingService {
               passportCountry:   p.passportCountry,
               verifaydaVerified: p.verifaydaVerified,
               verifaydaData:     p.verifaydaData || undefined,
-              fareMinor:         p.category === PassengerCategory.ADULT ? returnBaseFare : (paidChildrenCount > 0 ? returnBaseFare : 0),
+              fareMinor:         p.category === PassengerCategory.ADULT ? returnBaseFare : returnChildUnitFare,
               displayCurrency,
             })),
           ],
@@ -484,7 +491,7 @@ export class GuestBookingService {
         returnBaseFareMinor:   returnBaseFare,
         adultCount,
         childCount,
-        freeChildrenCount:     Math.min(childCount, 1),
+        freeChildrenCount:     isPackageRoundTrip ? 0 : Math.min(childCount, 1),
         paidChildrenCount,
         combinedBaseFareMinor,
         discountMinor,