Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI

2026-08-30 11:08:12 +00:00 · 2026-06-14 01:32:39 +03:00
parent b73bf2154e
commit 87b0ce6339
45 changed files with 1249 additions and 520 deletions
--- a/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts
+++ b/apps/edr-freight-api/src/seed/demo-bookings.seeder.ts
@@ -19,7 +19,7 @@ import { Container } from "../modules/container-management/entities/container.en
 import { Route } from "../modules/routes/entities/route.entity";
 import { RouteMilestone } from "../modules/routes/entities/route-milestone.entity";
 import { Wagon } from "../modules/wagons/entities/wagon.entity";
-import { WagonReadiness, WagonStatus } from "@edr/types";
+import { WagonStatus } from "@edr/types";

 const SEED_FLAG = "SEED_DEMO_BOOKINGS";

@@ -499,7 +499,7 @@ export class DemoBookingsSeeder {
      }

      const nw5 = await manager.getRepository(WagonType).findOneBy({ code: "NW5" });
-      if (nw5) {
+      if (nw5 && djibouti && addis) {
        await manager.getRepository(Wagon).upsert(
          Array.from({ length: 20 }, (_, index) => ({
            wagonNumber: `WGN-DEMO-${String(index + 1).padStart(3, "0")}`,
@@ -509,10 +509,7 @@ export class DemoBookingsSeeder {
            tareWeight: 20,
            maxPayloadWeight: 70,
            status: WagonStatus.Available,
-            readiness:
-              index % 2 === 0
-                ? WagonReadiness.ImportReady
-                : WagonReadiness.ExportReady,
+            currentYardId: index % 2 === 0 ? djibouti.id : addis.id,
            notes: "Demo wagon for train scheduling",
            trainSetWagonId: null,
            currentTrainScheduleId: null,
@@ -521,6 +518,19 @@ export class DemoBookingsSeeder {
        );
      }

+      if (djibouti) {
+        await manager.getRepository(Locomotive).update(
+          { code: "LOC-001" },
+          { currentYardId: djibouti.id },
+        );
+      }
+      if (addis) {
+        await manager.getRepository(Locomotive).update(
+          { code: "LOC-002" },
+          { currentYardId: addis.id },
+        );
+      }
+
      const ft20 = containerTypeByCode.get("20FT");
      const ft40 = containerTypeByCode.get("40FT");
      if (ft20 && ft40) {
--- a/apps/edr-freight-api/src/seed/pricing-data.seeder.ts
+++ b/apps/edr-freight-api/src/seed/pricing-data.seeder.ts
@@ -430,20 +430,6 @@ export class PricingDataSeeder {
        rateValue: 1200,
        rateUnit: "PER_CONTAINER",
      },
-      {
-        rateType: "CONTAINER_IMPORT",
-        containerTypeId: ctByCode.get("20FT")!.id,
-        currency: "ETB",
-        rateValue: 45000,
-        rateUnit: "PER_CONTAINER",
-      },
-      {
-        rateType: "CONTAINER_IMPORT",
-        containerTypeId: ctByCode.get("40FT")!.id,
-        currency: "ETB",
-        rateValue: 67000,
-        rateUnit: "PER_CONTAINER",
-      },
      {
        rateType: "CONTAINER_EXPORT",
        containerTypeId: ctByCode.get("20FT")!.id,
@@ -458,34 +444,6 @@ export class PricingDataSeeder {
        rateValue: 900,
        rateUnit: "PER_CONTAINER",
      },
-      {
-        rateType: "CONTAINER_EXPORT",
-        containerTypeId: ctByCode.get("20FT")!.id,
-        currency: "ETB",
-        rateValue: 34000,
-        rateUnit: "PER_CONTAINER",
-      },
-      {
-        rateType: "CONTAINER_EXPORT",
-        containerTypeId: ctByCode.get("40FT")!.id,
-        currency: "ETB",
-        rateValue: 50000,
-        rateUnit: "PER_CONTAINER",
-      },
-      {
-        rateType: "INTERCITY_CONTAINER",
-        containerTypeId: ctByCode.get("20FT")!.id,
-        currency: "ETB",
-        rateValue: 20000,
-        rateUnit: "PER_CONTAINER",
-      },
-      {
-        rateType: "INTERCITY_CONTAINER",
-        containerTypeId: ctByCode.get("40FT")!.id,
-        currency: "ETB",
-        rateValue: 30000,
-        rateUnit: "PER_CONTAINER",
-      },
      {
        rateType: "CONTAINER_IMPORT",
        containerTypeId: null,
@@ -493,13 +451,6 @@ export class PricingDataSeeder {
        rateValue: 1000,
        rateUnit: "PER_CONTAINER",
      },
-      {
-        rateType: "CONTAINER_IMPORT",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 56000,
-        rateUnit: "PER_CONTAINER",
-      },
      {
        rateType: "CONTAINER_EXPORT",
        containerTypeId: null,
@@ -508,17 +459,24 @@ export class PricingDataSeeder {
        rateUnit: "PER_CONTAINER",
      },
      {
-        rateType: "CONTAINER_EXPORT",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 42000,
+        rateType: "INTERCITY_CONTAINER",
+        containerTypeId: ctByCode.get("20FT")!.id,
+        currency: "USD",
+        rateValue: 350,
+        rateUnit: "PER_CONTAINER",
+      },
+      {
+        rateType: "INTERCITY_CONTAINER",
+        containerTypeId: ctByCode.get("40FT")!.id,
+        currency: "USD",
+        rateValue: 550,
        rateUnit: "PER_CONTAINER",
      },
      {
        rateType: "INTERCITY_CONTAINER",
        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 25000,
+        currency: "USD",
+        rateValue: 400,
        rateUnit: "PER_CONTAINER",
      },
      {
@@ -528,13 +486,6 @@ export class PricingDataSeeder {
        rateValue: 35,
        rateUnit: "PER_TON",
      },
-      {
-        rateType: "INTERCITY_BULK",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 1900,
-        rateUnit: "PER_TON",
-      },
      {
        rateType: "BULK_IMPORT",
        containerTypeId: null,
@@ -542,13 +493,6 @@ export class PricingDataSeeder {
        rateValue: 50,
        rateUnit: "PER_TON",
      },
-      {
-        rateType: "BULK_IMPORT",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 2800,
-        rateUnit: "PER_TON",
-      },
      {
        rateType: "BULK_EXPORT",
        containerTypeId: null,
@@ -556,13 +500,6 @@ export class PricingDataSeeder {
        rateValue: 40,
        rateUnit: "PER_TON",
      },
-      {
-        rateType: "BULK_EXPORT",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 2200,
-        rateUnit: "PER_TON",
-      },
      {
        rateType: "OVERWEIGHT_PER_TON",
        containerTypeId: null,
@@ -570,13 +507,6 @@ export class PricingDataSeeder {
        rateValue: 25,
        rateUnit: "PER_TON",
      },
-      {
-        rateType: "OVERWEIGHT_PER_TON",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 1400,
-        rateUnit: "PER_TON",
-      },
      {
        rateType: "HAZARD_SURCHARGE",
        containerTypeId: null,
@@ -584,13 +514,6 @@ export class PricingDataSeeder {
        rateValue: 150,
        rateUnit: "FLAT",
      },
-      {
-        rateType: "HAZARD_SURCHARGE",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 8500,
-        rateUnit: "FLAT",
-      },
      {
        rateType: "REEFER_SURCHARGE",
        containerTypeId: null,
@@ -598,13 +521,6 @@ export class PricingDataSeeder {
        rateValue: 200,
        rateUnit: "FLAT",
      },
-      {
-        rateType: "REEFER_SURCHARGE",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 11000,
-        rateUnit: "FLAT",
-      },
      {
        rateType: "DOUBLE_HANDLING",
        containerTypeId: null,
@@ -612,13 +528,6 @@ export class PricingDataSeeder {
        rateValue: 100,
        rateUnit: "PER_CONTAINER",
      },
-      {
-        rateType: "DOUBLE_HANDLING",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 5500,
-        rateUnit: "PER_CONTAINER",
-      },
      {
        rateType: "LASHING",
        containerTypeId: null,
@@ -626,13 +535,6 @@ export class PricingDataSeeder {
        rateValue: 50,
        rateUnit: "PER_CONTAINER",
      },
-      {
-        rateType: "LASHING",
-        containerTypeId: null,
-        currency: "ETB",
-        rateValue: 2800,
-        rateUnit: "PER_CONTAINER",
-      },
    ];

    const entities = rateData.map((d) =>
@@ -662,15 +564,10 @@ export class PricingDataSeeder {
    };

    const hazardRateUsd = findRate("HAZARD_SURCHARGE", "USD");
-    const hazardRateEtb = findRate("HAZARD_SURCHARGE", "ETB");
    const reeferRateUsd = findRate("REEFER_SURCHARGE", "USD");
-    const reeferRateEtb = findRate("REEFER_SURCHARGE", "ETB");
    const overweightRateUsd = findRate("OVERWEIGHT_PER_TON", "USD");
-    const overweightRateEtb = findRate("OVERWEIGHT_PER_TON", "ETB");
    const shipLineRateUsd = findRate("DOUBLE_HANDLING", "USD");
-    const shipLineRateEtb = findRate("DOUBLE_HANDLING", "ETB");
    const consolidRateUsd = findRate("LASHING", "USD");
-    const consolidRateEtb = findRate("LASHING", "ETB");

    await surRepo.createQueryBuilder().delete().execute();
    await surRepo.save([
@@ -678,35 +575,35 @@ export class PricingDataSeeder {
        code: "HAZARDOUS_CARGO",
        label: "Hazardous Cargo",
        triggerCondition: "CARGO_FLAG_HAZARDOUS",
-        rateId: hazardRateUsd?.id ?? hazardRateEtb?.id,
+        rateId: hazardRateUsd?.id,
        isActive: true,
      }),
      surRepo.create({
        code: "REEFER_CARGO",
        label: "Reefer Cargo",
        triggerCondition: "CARGO_FLAG_REEFER",
-        rateId: reeferRateUsd?.id ?? reeferRateEtb?.id,
+        rateId: reeferRateUsd?.id,
        isActive: true,
      }),
      surRepo.create({
        code: "OVERWEIGHT_CARGO",
        label: "Overweight Cargo",
        triggerCondition: "VGM_EXCEEDS_LIMIT",
-        rateId: overweightRateUsd?.id ?? overweightRateEtb?.id,
+        rateId: overweightRateUsd?.id,
        isActive: true,
      }),
      surRepo.create({
        code: "SHIPPING_LINE_FEE",
        label: "Shipping Line Fee",
        triggerCondition: "SHIPPING_LINE_MAPPED",
-        rateId: shipLineRateUsd?.id ?? shipLineRateEtb?.id,
+        rateId: shipLineRateUsd?.id,
        isActive: true,
      }),
      surRepo.create({
        code: "CONSOLIDATION_FEE",
        label: "Consolidation Fee",
        triggerCondition: "CONSOLIDATION_ENABLED",
-        rateId: consolidRateUsd?.id ?? consolidRateEtb?.id,
+        rateId: consolidRateUsd?.id,
        isActive: true,
      }),
    ]);
@@ -773,10 +670,10 @@ export class PricingDataSeeder {
      },
      {
        reference: "BKG-PRICE-003",
-        description: "20FT container import + shipping line (ETB)",
+        description: "20FT container import + shipping line (USD)",
        freightType: "CONTAINER" as const,
        tradeDirection: "IMPORT",
-        paymentCurrency: "ETB",
+        paymentCurrency: "USD",
        serviceTypeId: railContainer.id,
        originYardId: djibouti.id,
        destinationYardId: addis.id,
@@ -788,7 +685,7 @@ export class PricingDataSeeder {
        containers: [
          { containerTypeId: twenty.id, quantity: 20, vgmPerUnitTons: 24 },
        ],
-        expectedBaseRate: 45000,
+        expectedBaseRate: 800,
        expectedSurcharges: ["SHIPPING_LINE_FEE"],
      },
      {