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

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

@@ -2,22 +2,24 @@ import { BookingPricingService } from './booking-pricing.service';
 import type { Booking } from './entities/booking.entity';
 import type { Rate } from '../rule-engine/entities/rate.entity';
 
+const MOCK_CBE_RATE = 130;
+
 describe('BookingPricingService — domestic corridor', () => {
-  const intercityBulkEtb: Rate = {
-    id: 'rate-intercity-bulk-etb',
+  const intercityBulkUsd: Rate = {
+    id: 'rate-intercity-bulk-usd',
     rateType: 'INTERCITY_BULK',
-    currency: 'ETB',
-    rateValue: 1900,
+    currency: 'USD',
+    rateValue: 35,
     rateUnit: 'PER_TON',
     status: 'LIVE',
     containerTypeId: null,
   } as Rate;
 
-  const intercityContainerEtb: Rate = {
-    id: 'rate-intercity-container-etb',
+  const intercityContainerUsd: Rate = {
+    id: 'rate-intercity-container-usd',
     rateType: 'INTERCITY_CONTAINER',
-    currency: 'ETB',
-    rateValue: 25000,
+    currency: 'USD',
+    rateValue: 400,
     rateUnit: 'PER_CONTAINER',
     status: 'LIVE',
     containerTypeId: null,
@@ -26,11 +28,15 @@ describe('BookingPricingService — domestic corridor', () => {
   let service: BookingPricingService;
   let bookingsRepository: { calculateWagonCount: jest.Mock };
   let ratesService: { findLiveRates: jest.Mock };
+  let cbeExchangeService: { getUsdToEtbRate: jest.Mock };
 
   beforeEach(() => {
     bookingsRepository = { calculateWagonCount: jest.fn().mockResolvedValue(2) };
     ratesService = {
-      findLiveRates: jest.fn().mockResolvedValue([intercityBulkEtb, intercityContainerEtb]),
+      findLiveRates: jest.fn().mockResolvedValue([intercityBulkUsd, intercityContainerUsd]),
+    };
+    cbeExchangeService = {
+      getUsdToEtbRate: jest.fn().mockResolvedValue(MOCK_CBE_RATE),
     };
 
     service = new BookingPricingService(
@@ -39,10 +45,11 @@ describe('BookingPricingService — domestic corridor', () => {
       {} as never,
       ratesService as never,
       {} as never,
+      cbeExchangeService as never,
     );
   });
 
-  it('prices domestic bulk using INTERCITY_BULK and cargo tons', async () => {
+  it('prices domestic bulk in ETB using INTERCITY_BULK USD rate × CBE exchange rate', async () => {
     const booking = {
       id: 'b-1',
       freightType: 'BULK',
@@ -57,16 +64,42 @@ describe('BookingPricingService — domestic corridor', () => {
         computeBaseRailLinesWithRates: (
           b: Booking,
           input: { containers: [] },
-        ) => Promise<{ lineItems: Array<{ amount: number; code: string }> }>;
+        ) => Promise<{ lineItems: Array<{ amount: number; code: string; currency: string }> }>;
       }
     ).computeBaseRailLinesWithRates(booking, { containers: [] });
 
     expect(result.lineItems).toHaveLength(1);
     expect(result.lineItems[0].code).toBe('INTERCITY_BULK');
-    expect(result.lineItems[0].amount).toBe(1900 * 120);
+    expect(result.lineItems[0].currency).toBe('ETB');
+    expect(result.lineItems[0].amount).toBe(Math.round(35 * 120 * MOCK_CBE_RATE));
   });
 
-  it('prices domestic container using INTERCITY_CONTAINER fallback', async () => {
+  it('prices domestic bulk in USD using INTERCITY_BULK USD rate directly', async () => {
+    const booking = {
+      id: 'b-1-usd',
+      freightType: 'BULK',
+      tradeDirection: 'DOMESTIC',
+      paymentCurrency: 'USD',
+      cargoTotalWeightVgm: 120,
+      bookingContainers: [],
+    } as unknown as Booking;
+
+    const result = await (
+      service as unknown as {
+        computeBaseRailLinesWithRates: (
+          b: Booking,
+          input: { containers: [] },
+        ) => Promise<{ lineItems: Array<{ amount: number; code: string; currency: string }> }>;
+      }
+    ).computeBaseRailLinesWithRates(booking, { containers: [] });
+
+    expect(result.lineItems).toHaveLength(1);
+    expect(result.lineItems[0].code).toBe('INTERCITY_BULK');
+    expect(result.lineItems[0].currency).toBe('USD');
+    expect(result.lineItems[0].amount).toBe(35 * 120);
+  });
+
+  it('prices domestic container in ETB using INTERCITY_CONTAINER USD fallback × CBE rate', async () => {
     const booking = {
       id: 'b-2',
       freightType: 'CONTAINER',
@@ -83,12 +116,14 @@ describe('BookingPricingService — domestic corridor', () => {
           input: {
             containers: Array<{ containerTypeId: string; quantity: number }>;
           },
-        ) => Promise<{ lineItems: Array<{ amount: number; code: string }> }>;
+        ) => Promise<{ lineItems: Array<{ amount: number; code: string; currency: string }> }>;
       }
     ).computeBaseRailLinesWithRates(booking, {
       containers: [{ containerTypeId: 'ct-20', quantity: 3 }],
     });
 
     expect(result.lineItems.some((l) => l.code === 'INTERCITY_CONTAINER')).toBe(true);
+    const line = result.lineItems.find((l) => l.code === 'INTERCITY_CONTAINER')!;
+    expect(line.currency).toBe('ETB');
   });
 });

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

@@ -4,6 +4,7 @@ import { ContainerTypesService } from '../rule-engine/services/container-types.s
 import { RatesService } from '../rule-engine/services/rates.service';
 import { ServiceTypesService } from '../rule-engine/services/service-types.service';
 import { Rate } from '../rule-engine/entities/rate.entity';
+import { CbeExchangeService } from '../cbe-exchange/cbe-exchange.service';
 import {
   AppliedCargoModifier,
   BookingEvaluationInput,
@@ -40,6 +41,7 @@ export class BookingPricingService {
     private readonly containerTypesService: ContainerTypesService,
     private readonly ratesService: RatesService,
     private readonly serviceTypesService: ServiceTypesService,
+    private readonly cbeExchangeService: CbeExchangeService,
   ) {}
 
   async generatePrice(bookingId: string): Promise<GeneratePriceResponseDto> {
@@ -80,6 +82,10 @@ export class BookingPricingService {
     const evalInput = await this.buildEvalInputForBooking(booking);
     const ruleResult = await this.ruleEngineService.evaluate(evalInput);
 
+    const paymentCurrency = booking.paymentCurrency;
+    const isEtbBooking = paymentCurrency === 'ETB';
+    const usdToEtb = isEtbBooking ? await this.cbeExchangeService.getUsdToEtbRate() : 1;
+
     const lineItems: PriceLineItemDto[] = [];
     let total = 0;
 
@@ -95,14 +101,16 @@ export class BookingPricingService {
     const usedRatesMap = new Map(baseRates.map((r) => [r.id, r]));
 
     for (const mod of ruleResult.appliedModifiers) {
+      const usdAmount = mod.calculatedAmount;
+      const convertedAmount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
       const item: PriceLineItemDto = {
         code: mod.surchargeTypeCode,
         description: `Surcharge: ${mod.surchargeTypeCode}`,
-        amount: mod.calculatedAmount,
-        currency: mod.currency,
+        amount: convertedAmount,
+        currency: paymentCurrency,
       };
       lineItems.push(item);
-      total += mod.calculatedAmount;
+      total += convertedAmount;
 
       const rate = rateById.get(mod.rateId);
       if (rate) usedRatesMap.set(rate.id, rate);
@@ -263,7 +271,9 @@ export class BookingPricingService {
     evalInput: BookingEvaluationInput,
   ): Promise<{ lineItems: PriceLineItemDto[]; usedRates: Rate[] }> {
     const liveRates = await this.ratesService.findLiveRates();
-    const currency = booking.paymentCurrency;
+    const paymentCurrency = booking.paymentCurrency;
+    const isEtbBooking = paymentCurrency === 'ETB';
+    const usdToEtb = isEtbBooking ? await this.cbeExchangeService.getUsdToEtbRate() : 1;
     const isBulk = booking.freightType === 'BULK';
 
     const rateType =
@@ -284,34 +294,36 @@ export class BookingPricingService {
     const wagonCount = await this.bookingsRepository.calculateWagonCount(booking.id);
 
     for (const container of evalInput.containers) {
-      const rate = this.pickRate(liveRates, rateType, container.containerTypeId, currency);
+      const rate = this.pickRate(liveRates, rateType, container.containerTypeId, 'USD');
       if (!rate) continue;
 
       usedRatesMap.set(rate.id, rate);
-      const amount = this.amountForRate(rate, container.quantity, wagonCount);
+      const usdAmount = this.amountForRate(rate, container.quantity, wagonCount);
+      const amount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
       lines.push({
         code: rateType,
         description: `Base rail (${rateType})`,
         amount,
-        currency: rate.currency,
+        currency: paymentCurrency,
       });
     }
 
     if (lines.length === 0) {
       const fallback = liveRates.find(
-        (r) => r.rateType === rateType && r.currency === currency && r.status === 'LIVE',
+        (r) => r.rateType === rateType && r.currency === 'USD' && r.status === 'LIVE',
       );
       if (fallback) {
         usedRatesMap.set(fallback.id, fallback);
         const bulkTons = Number(booking.cargoTotalWeightVgm ?? 0);
         const quantity =
           isBulk && fallback.rateUnit === 'PER_TON' ? Math.max(bulkTons, 0) : 1;
-        const amount = this.amountForRate(fallback, quantity, wagonCount);
+        const usdAmount = this.amountForRate(fallback, quantity, wagonCount);
+        const amount = isEtbBooking ? Math.round(usdAmount * usdToEtb) : usdAmount;
         lines.push({
           code: rateType,
           description: `Base rail (${rateType})`,
           amount,
-          currency: fallback.currency,
+          currency: paymentCurrency,
         });
       }
     }

apps/edr-freight-api/src/modules/bookings/bookings.module.ts

@@ -30,6 +30,7 @@ import { ContractTemplateResolver } from '../../contracts/contract-template.reso
 import { ContractViewModelBuilder } from '../../contracts/contract-view-model.builder';
 import { PaymentModule } from '../payment/payment.module';
 import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.module';
+import { CbeExchangeService } from '../cbe-exchange/cbe-exchange.service';
 
 @Module({
   imports: [
@@ -65,6 +66,7 @@ import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.modu
     ContractPricingScheduleBuilder,
     ContractRendererService,
     ContractPdfService,
+    CbeExchangeService,
   ],
   exports: [BookingsService, BookingsRepository],
 })