Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2

apps/edr-freight-api/src/modules/bookings/booking-transition.service.ts

@@ -991,6 +991,15 @@ export class BookingTransitionService {
   private async acceptOperationRequest(booking: Booking): Promise<Booking> {
     const now = new Date();
 
+    // Export is FCFS: fail the accept up-front (409) when no export train on the
+    // booking's day still has capacity — nothing below runs and the request stays
+    // pending for staff to move/decline.
+    const isExportTrain =
+      booking.tradeDirection === "EXPORT" && !isRoadService(booking.serviceType);
+    const exportScheduleId = isExportTrain
+      ? await this.bookingBatchService.pickExportSchedule(booking)
+      : null;
+
     const invoice = await this.invoiceService.ensureInvoiceForBooking(booking);
     this.logger.log(
       `Generated invoice ${invoice.invoiceNumber} (${invoice.id}) for ${booking.reference}:${booking.id}`,
@@ -1014,7 +1023,15 @@ export class BookingTransitionService {
       lockedAt: booking.lockedAt ?? now,
     } as never);
 
-    if (booking.scheduledDate) {
+    if (exportScheduleId) {
+      // FCFS: reserve the slot and send the payment notification immediately;
+      // paid → auto-allocated by the settle/paid pipeline.
+      const fresh = await this.bookingsService.findById(booking.id);
+      await this.bookingBatchService.reserveExportBooking(fresh, exportScheduleId);
+    } else if (booking.tradeDirection === "IMPORT") {
+      // Import bookings wait for their booking-day window cycle — the batch runs
+      // after staff document review, never at accept time.
+    } else if (booking.scheduledDate) {
       this.bookingBatchService.enqueueRouteDayProcessing(
         booking.originYardId,
         booking.destinationYardId,
@@ -1029,6 +1046,12 @@ export class BookingTransitionService {
       latestChangeRequestNote?: string | null;
       contractSummary?: string | null;
       nextStep: BookingNextStep | null;
+      activeBatchOffer?: {
+        offeredWagons: number;
+        totalWagons: number;
+        offeredAmount: number;
+        paymentDeadline: Date;
+      } | null;
     }
   > {
     const note = await this.bookingsRepository.findLatestReviewNote(
@@ -1044,11 +1067,16 @@ export class BookingTransitionService {
         ? await this.bookingsRepository.findNextPendingApprovalStep(booking.id)
         : null;
     const nextStep = computeNextStep(booking, nextPending);
+    const activeBatchOffer =
+      booking.status === "SELECTED_FOR_BATCH"
+        ? await this.bookingBatchService.getOpenOfferSummary(booking.id)
+        : null;
     return {
       ...booking,
       latestChangeRequestNote: note?.note ?? null,
       contractSummary: summary,
       nextStep,
+      activeBatchOffer,
     };
   }
 }