chnages

apps/edr-freight-api/src/modules/train-scheduling/services/train-scheduling.service.ts

@@ -21,7 +21,6 @@ import {
 } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { InjectDataSource } from '@nestjs/typeorm';
-import { SCHEDULE_BOOKINGS_CTE } from '../../common/schedule-bookings.sql';
 import {
   DataSource,
   EntityManager,
@@ -2522,63 +2521,6 @@ export class TrainSchedulingService {
     return this.getTrainScheduleById(scheduleId);
   }
 
-  /**
-   * EXPORT ONLY. An export train must not leave carrying nothing while its cargo
-   * sits in the shed: the goods are received into the origin warehouse, GRN'd and
-   * loaded onto the wagons allocated to the booking, so anything still in the
-   * warehouse at dispatch is being left behind. Blocks dispatch when an allocated
-   * booking has warehouse inventory that never made it onto a wagon (received /
-   * stored / ready but not LOADED) — either load it from the Load-to-Train queue,
-   * or drop the booking's wagon allocation so it rides a later train.
-   *
-   * Import/domestic are untouched: their cargo isn't loaded out of an origin
-   * warehouse, so warehouse inventory says nothing about what's aboard.
-   *
-   * Bookings with no warehouse inventory at all are NOT blocked — allocating a
-   * wagon before the goods arrive is normal planning; they simply aren't aboard.
-   */
-  private async assertAllocatedCargoLoaded(scheduleId: string): Promise<void> {
-    const [route]: Array<{ originCountry: string | null; destinationCountry: string | null }> =
-      await this.dataSource.query(
-        `SELECT oy.country AS "originCountry", dy.country AS "destinationCountry"
-           FROM freight.train_schedules ts
-           LEFT JOIN freight.yards oy ON oy.id = ts.origin_station_id
-           LEFT JOIN freight.yards dy ON dy.id = ts.destination_station_id
-          WHERE ts.id = $1 AND ts.deleted_at IS NULL`,
-        [scheduleId],
-      );
-    if (!route) return;
-    const direction = deriveTradeDirection(
-      { country: route.originCountry },
-      { country: route.destinationCountry },
-    );
-    if (direction !== 'EXPORT') return;
-
-    // Only bookings boarding at the schedule's ORIGIN station gate dispatch —
-    // a mid-corridor boarder (origin B on an A→B→C→D run) is loaded when the
-    // train reaches its yard, so its warehouse state says nothing at departure.
-    const rows: Array<{ reference: string | null; status: string }> = await this.dataSource.query(
-      `WITH ${SCHEDULE_BOOKINGS_CTE}
-       SELECT DISTINCT b.reference AS "reference", inv.status AS "status"
-         FROM sched_bookings sb
-         JOIN freight.bookings b ON b.id = sb.booking_id AND b.deleted_at IS NULL
-         JOIN freight.train_schedules ts ON ts.id = sb.schedule_id
-         JOIN freight.warehouse_inventory inv
-           ON inv.booking_id = b.id AND inv.deleted_at IS NULL
-        WHERE sb.schedule_id = $1
-          AND b.origin_yard_id = ts.origin_station_id
-          AND inv.status IN ('RECEIVED', 'STORED', 'READY_FOR_LOADING')`,
-      [scheduleId],
-    );
-    if (rows.length) {
-      const refs = [...new Set(rows.map((r) => r.reference ?? '?'))].join(', ');
-      throw new BadRequestException(
-        `Cannot dispatch: cargo for booking(s) ${refs} is in the warehouse but not loaded onto a wagon. ` +
-          `Load it from the warehouse Load-to-Train queue, or remove the booking's wagon allocation so it travels on a later train.`,
-      );
-    }
-  }
-
   async dispatchSchedule(scheduleId: string) {
     const schedule = await this.trainSchedulesRepository.findByIdWithFullGraph(scheduleId);
     if (!schedule) {
@@ -2588,8 +2530,8 @@ export class TrainSchedulingService {
       throw new BadRequestException('Only SCHEDULED trains can be dispatched');
     }
     await this.assertImportDjiboutiMayDepart(schedule);
-    // Export only: don't leave received cargo behind in the warehouse.
-    await this.assertAllocatedCargoLoaded(scheduleId);
+    // Cargo readiness (in the warehouse, not inspected, not loaded onto a wagon)
+    // never blocks departure — the dispatch confirm dialog warns and staff decide.
     // A locomotive may sit on many future schedules, but it can only pull one train
     // at a time — block dispatch while any set locomotive is out on a dispatched train.
     const setLocomotiveIds = this.locomotivesOfTrainSet(schedule.trainSet).map((l) => l.id);