Merge pull request #422 from Tria-plc/freight_feature/usermanagement

fix issues

apps/edr-freight-api/src/modules/contracts/contract-booking.service.ts

@@ -1,11 +1,14 @@
 import {
   BadRequestException,
   ForbiddenException,
+  Inject,
   Injectable,
   Logger,
   NotFoundException,
+  forwardRef,
 } from '@nestjs/common';
 import { DataSource } from 'typeorm';
+import { ExchangeService } from '@edr/api-common';
 
 import { Booking } from '../bookings/entities/booking.entity';
 import { BookingContainer } from '../bookings/entities/booking-container.entity';
@@ -15,6 +18,7 @@ import { BookingPricingService } from '../bookings/booking-pricing.service';
 import { BookingInvoiceService } from '../bookings/booking-invoice.service';
 import { validate20ftWeightPairing } from '../bookings/container-pairing.util';
 import { TrainSchedulingGlobalRules } from '../train-scheduling/entities/train-scheduling-global-rules.entity';
+import { TrainSchedulingService } from '../train-scheduling/train-scheduling.service';
 import { ContainerTypesService } from '../rule-engine/services/container-types.service';
 import { RuleEngineService } from '../rule-engine/rule-engine.service';
 import { ContainerType } from '../rule-engine/entities/container-type.entity';
@@ -62,6 +66,9 @@ export class ContractBookingService {
     private readonly workflowService: ClearanceWorkflowService,
     private readonly invoiceService: BookingInvoiceService,
     private readonly dataSource: DataSource,
+    private readonly exchangeService: ExchangeService,
+    @Inject(forwardRef(() => TrainSchedulingService))
+    private readonly trainSchedulingService: TrainSchedulingService,
   ) {}
 
   async createUnderContract(
@@ -113,6 +120,20 @@ export class ContractBookingService {
     const generalCustoms =
       contract.contractKind === 'GENERAL' && Boolean(contract.customsClearingEnabled);
 
+    // Booking-window gate (config-driven): an operations booking may only be
+    // created while the route's booking window is open — import: the day's window
+    // (windowOpenHour EAT, importWindowLeadDays before departure, windowDurationHours);
+    // export: within exportBookingLeadHours of departure. Customs Path B bookings
+    // enter clearance first and are scheduled later, so they are not gated here.
+    if (!generalCustoms) {
+      await this.trainSchedulingService.assertBookingWindowOpen({
+        originYardId: route?.originYardId ?? null,
+        destinationYardId: route?.destinationYardId ?? null,
+        scheduledDate: dto.scheduledDate ?? null,
+        direction: contract.tradeDirection ?? null,
+      });
+    }
+
     // Denormalize route/direction/freight onto the booking for the scheduling engine.
     const booking = await this.bookingsRepository.create({
       reference,
@@ -582,13 +603,22 @@ export class ContractBookingService {
       maxAllowedTons: number;
       excessTons: number;
     }>;
+    overweightSurchargeAmount: number;
+    currency: string | null;
     pairingErrors: string[];
   }> {
     const contract = await this.contractsRepository.findByIdWithRelations(contractId);
     if (!contract) throw new NotFoundException(`Contract ${contractId} not found`);
 
     const lines = dto.containers ?? [];
-    if (!lines.length) return { overweightLines: [], pairingErrors: [] };
+    if (!lines.length) {
+      return {
+        overweightLines: [],
+        overweightSurchargeAmount: 0,
+        currency: null,
+        pairingErrors: [],
+      };
+    }
 
     // Resolve each line's container type + total VGM (sum of unit weights) so the
     // rule engine can flag overweight per line (maxVgmTons × quantity vs total).
@@ -661,7 +691,28 @@ export class ContractBookingService {
       (v) => v.message,
     );
 
-    return { overweightLines, pairingErrors };
+    // Real overweight surcharge (same rate the rule engine bills at booking-create
+    // time) so the confirm-modal total isn't missing the charge the warning refers to.
+    // Rates are stored in USD; convert to the contract's payment currency the same
+    // way BookingPricingService does so this preview matches the eventual booking total.
+    const overweightModifier = ruleResult.appliedModifiers.find(
+      (m) => m.surchargeCode === 'OVERWEIGHT_PER_TON',
+    );
+    let overweightSurchargeAmount = 0;
+    if (overweightModifier) {
+      const isEtb = contract.paymentCurrency === 'ETB';
+      const usdToEtb = isEtb ? await this.exchangeService.getRate('USD', 'ETB') : 1;
+      overweightSurchargeAmount = isEtb
+        ? Math.round(overweightModifier.calculatedAmount * usdToEtb)
+        : overweightModifier.calculatedAmount;
+    }
+
+    return {
+      overweightLines,
+      overweightSurchargeAmount,
+      currency: overweightLines.length ? contract.paymentCurrency : null,
+      pairingErrors,
+    };
   }
 
   private async max20ftPairDiffTons(): Promise<number> {

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

@@ -13,6 +13,7 @@ import { DropdownSettingsModule } from '../dropdown-settings/dropdown-settings.m
 import { SignaturesModule } from '../signatures/signatures.module';
 import { OtpModule } from '../otp/otp.module';
 import { BookingsModule } from '../bookings/bookings.module';
+import { TrainSchedulingModule } from '../train-scheduling/train-scheduling.module';
 
 import { ContractsController } from './contracts.controller';
 import { ContractsService } from './contracts.service';
@@ -78,6 +79,10 @@ import { ContractDocumentViewModelBuilder } from '../../contracts/contract-docum
     // BookingsModule provides BookingsRepository/BookingPricingService used by the
     // contract PDF builders (they read a Booking today — see docs/new-doc.md §3.3).
     forwardRef(() => BookingsModule),
+    // TrainSchedulingModule provides the config-driven booking-window gate used
+    // by ContractBookingService.createUnderContract. forwardRef because
+    // TrainSchedulingModule already imports ContractsModule.
+    forwardRef(() => TrainSchedulingModule),
     ExchangeModule.forRootAsync({
       inject: [ConfigService],
       useFactory: (config: ConfigService): ExchangeOptions =>