contrat,booking,global logestic

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

@@ -24,12 +24,6 @@ import { ContractViewDto } from './dto/contract-view.dto';
 import { SignContractDto } from './dto/sign-contract.dto';
 import { ContractSignerRole } from './entities/booking-contract-signature.entity';
 
-/**
- * Default ordering window (months) for a general contract activated on
- * counter-sign. Mirrors GeneralContractService.DEFAULT_CONTRACT_PERIOD_MONTHS;
- * defined locally to avoid a circular module dependency on booking-orders.
- */
-const DEFAULT_CONTRACT_PERIOD_MONTHS = 3;
 import { BookingBatchService } from '../train-scheduling/booking-batch.service';
 import { SignaturesService } from '../signatures/signatures.service';
 
@@ -240,23 +234,9 @@ export class BookingContractService {
       includesCustoms,
     );
 
-    const isGeneralContract = booking.bookingType === 'GENERAL_CONTRACT';
-
     if (role === 'CUSTOMER') {
       updates.status = 'SIGNED_CUSTOMER';
       updates.customerSignedAt = now;
-    } else if (isGeneralContract) {
-      // A general contract is NOT paid up front — each drawdown order is priced
-      // and paid on its own. So on counter-sign it becomes ACTIVE directly and
-      // opens its ordering window; orders spawn their own priced child bookings.
-      const expiresAt = new Date(now);
-      expiresAt.setMonth(expiresAt.getMonth() + DEFAULT_CONTRACT_PERIOD_MONTHS);
-      updates.fullyExecutedAt = now;
-      updates.marketingApprovedAt = now;
-      updates.marketingApprovedById = options.signerUserId ?? null;
-      updates.lockedAt = now;
-      updates.status = 'CONTRACT_ACTIVE';
-      updates.expiresAt = expiresAt;
     } else {
       updates.fullyExecutedAt = now;
       updates.marketingApprovedAt = now;

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

@@ -9,7 +9,7 @@ import type { TCurrentUser } from '@tria-plc/api-common/modules/auth/types/curre
 import { assertCanApproveBookingStep } from '../../common/freight-permission.util';
 import { BookingBatchService } from '../train-scheduling/booking-batch.service';
 import { eatDay } from '../train-scheduling/batch-window.util';
-import { isRoadService } from '../booking-orders/road.util';
+import { isRoadService } from './road.util';
 import { RuleEngineService } from '../rule-engine/rule-engine.service';
 import { FilesService } from '../files/files.service';
 import { FileUploadSettingsService } from '../file-upload-settings/file-upload-settings.service';

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

@@ -34,7 +34,6 @@ export interface BookingListFilterOptions {
   serviceTypeId?: string;
   cargoTypeId?: string;
   freightType?: string;
-  bookingType?: string;
   tradeDirection?: string;
   paymentCurrency?: string;
   paymentStatus?: string;
@@ -693,11 +692,6 @@ export class BookingsRepository extends BaseRepository<Booking> {
         freightType: options.freightType,
       });
     }
-    if (options.bookingType) {
-      qb.andWhere('booking.booking_type = :bookingType', {
-        bookingType: options.bookingType,
-      });
-    }
     if (options.createdFrom) {
       qb.andWhere('booking.created_at >= :createdFrom', {
         createdFrom: options.createdFrom,

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

@@ -3,6 +3,7 @@ import {
   ConflictException,
   ForbiddenException,
   forwardRef,
+  GoneException,
   Inject,
   Injectable,
   NotFoundException,
@@ -27,7 +28,6 @@ import { DataSource, In } from 'typeorm';
 import { deriveTradeDirection } from '../../common/derive-trade-direction.util';
 import { Yard } from '../rule-engine/entities/yard.entity';
 import { ServiceType } from '../rule-engine/entities/service-type.entity';
-import { ContractRouteLine } from '../booking-orders/entities/contract-route-line.entity';
 import { TrainSchedule } from '../train-schedules/entities/train-schedule.entity';
 import { BookingsRepository } from './bookings.repository';
 import { ConsolidationService } from './consolidation.service';
@@ -283,6 +283,15 @@ export class BookingsService {
   ): Promise<{ booking: Booking; warnings: string[] }> {
     const warnings: string[] = [];
 
+    // Contract–booking separation: contracts are no longer created through the
+    // booking endpoint. Legacy GENERAL_CONTRACT creation is deprecated — clients
+    // must use POST /contracts (and create shipments via POST /contracts/:id/bookings).
+    if (dto.bookingType === 'GENERAL_CONTRACT') {
+      throw new GoneException(
+        'General contracts are no longer created here. Use POST /contracts instead.',
+      );
+    }
+
     // let customerId = dto.customerId;
     // if (!customerId) {
     //   if (!userId) {
@@ -295,7 +304,6 @@ export class BookingsService {
     // }
 
     const isGovernment = dto.isGovernment === true;
-    const isGeneralContract = dto.bookingType === 'GENERAL_CONTRACT';
 
     let companyId: string | null | undefined = dto.companyId;
     if (isGovernment) {
@@ -442,7 +450,6 @@ export class BookingsService {
       trainId: dto.trainId,
       trainScheduleId: dto.trainScheduleId ?? null,
       contractType: dto.contractType,
-      previousContractId: dto.previousContractId,
       serviceTypeId: dto.serviceTypeId,
       firstMilePickupAddress: dto.firstMilePickupAddress,
       firstMilePickupLat: dto.firstMilePickupLat ?? null,
@@ -469,7 +476,6 @@ export class BookingsService {
       paymentCurrency: dto.paymentCurrency,
       pnrCode: dto.pnrCode,
       financialTerms: dto.financialTerms,
-      bookingType: isGeneralContract ? 'GENERAL_CONTRACT' : 'ONE_TIME',
       scheduledDate: dto.scheduledDate ? new Date(dto.scheduledDate) : null,
       estimatedShipmentDate: dto.estimatedShipmentDate
         ? new Date(dto.estimatedShipmentDate)
@@ -496,27 +502,6 @@ export class BookingsService {
       warnings.push(`Estimated wagons required: ${wagonCount}`);
     }
 
-    // Multi-route general contracts: persist the contracted routes (lanes). Routes
-    // carry NO quantity — the contract has a single shared pool (the cargo-step
-    // total / container quantities). Each drawdown order picks one lane for
-    // scheduling + road billing and draws from that shared pool. `quantity` on the
-    // route line is retained for legacy rows but is no longer meaningful (0).
-    if (isGeneralContract && dto.routes?.length) {
-      const routeRepo = this.dataSource.getRepository(ContractRouteLine);
-      await routeRepo.save(
-        dto.routes.map((r) =>
-          routeRepo.create({
-            contractBookingId: booking.id,
-            originYardId: r.originYardId,
-            destinationYardId: r.destinationYardId,
-            containerTypeId: null,
-            quantity: 0,
-            km: r.km ?? null,
-          }),
-        ),
-      );
-    }
-
     if (files.length > 0) {
       try {
         await this.filesService.uploadMany(booking.id, 'bookings', files);
@@ -808,7 +793,6 @@ export class BookingsService {
       serviceTypeId: filter.serviceTypeId,
       cargoTypeId: filter.cargoTypeId,
       freightType: filter.freightType,
-      bookingType: filter.bookingType,
       tradeDirection: filter.tradeDirection,
       paymentCurrency: filter.paymentCurrency,
       paymentStatus: filter.paymentStatus,
@@ -1017,7 +1001,6 @@ export class BookingsService {
       serviceTypeId: filter.serviceTypeId,
       cargoTypeId: filter.cargoTypeId,
       freightType: filter.freightType,
-      bookingType: filter.bookingType,
       tradeDirection: filter.tradeDirection,
       paymentCurrency: filter.paymentCurrency,
       paymentStatus: filter.paymentStatus,

apps/edr-freight-api/src/modules/bookings/entities/booking-container-unit.entity.ts

@@ -0,0 +1,37 @@
+import { BaseEntity } from '@edr/api-common';
+import { Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
+import { BookingContainer } from './booking-container.entity';
+
+/**
+ * One physical container under a booking_container line — its number, seal, and
+ * per-unit VGM. Entered at booking time (by the customer in Path A or by GL ET
+ * in Path B). See §5.10.
+ */
+@Entity({ schema: 'freight', name: 'booking_container_units' })
+@Index(['bookingContainerId'])
+export class BookingContainerUnit extends BaseEntity {
+  @Column({ name: 'booking_container_id', type: 'uuid' })
+  bookingContainerId!: string;
+
+  @ManyToOne(() => BookingContainer, { onDelete: 'CASCADE' })
+  @JoinColumn({ name: 'booking_container_id' })
+  bookingContainer?: BookingContainer;
+
+  @Column({ name: 'container_number', type: 'varchar', length: 64 })
+  containerNumber!: string;
+
+  @Column({ name: 'seal_number', type: 'varchar', length: 64, nullable: true })
+  sealNumber?: string | null;
+
+  @Column({ name: 'vgm_tons', type: 'numeric', precision: 10, scale: 3 })
+  vgmTons!: number;
+
+  @Column({ name: 'is_hazardous', type: 'boolean', default: false })
+  isHazardous!: boolean;
+
+  @Column({ name: 'is_reefer', type: 'boolean', default: false })
+  isReefer!: boolean;
+
+  @Column({ name: 'sort_order', type: 'smallint', default: 0 })
+  sortOrder!: number;
+}

apps/edr-freight-api/src/modules/bookings/entities/booking-container.entity.ts

@@ -25,9 +25,21 @@ export class BookingContainer extends BaseEntity {
   @Column({ name: 'container_number', type: 'varchar', length: 64, nullable: true })
   containerNumber?: string | null;
 
+  /** Contract container size this line covers (20ft | 40ft). Null for legacy rows. */
+  @Column({ name: 'container_size', type: 'varchar', length: 10, nullable: true })
+  containerSize?: string | null;
+
   @Column({ name: 'quantity', type: 'smallint' })
   quantity!: number;
 
+  /** How many units of this line are hazardous (≤ quantity). */
+  @Column({ name: 'hazardous_quantity', type: 'smallint', default: 0 })
+  hazardousQuantity!: number;
+
+  /** How many units of this line are refrigerated (≤ quantity). */
+  @Column({ name: 'reefer_quantity', type: 'smallint', default: 0 })
+  reeferQuantity!: number;
+
   @Column({ name: 'vgm_per_unit_tons', type: 'numeric', precision: 10, scale: 3 })
   vgmPerUnitTons!: number;
 

apps/edr-freight-api/src/modules/bookings/entities/booking.entity.ts

@@ -144,13 +144,24 @@ export class Booking extends BaseEntity {
   @Column({ name: 'status', type: 'varchar', length: 40, default: 'DRAFT' })
   status!: string;
 
-  /**
-   * ONE_TIME for a normal single-shipment booking; GENERAL_CONTRACT for an
-   * umbrella contract that is signed/paid once and then drawn down by many
-   * orders (each order spawns its own ONE_TIME child booking).
-   */
-  @Column({ name: 'booking_type', type: 'varchar', length: 20, default: 'ONE_TIME' })
-  bookingType!: string;
+  /** The contract this shipment booking was created under (contract–booking split). */
+  @Column({ name: 'contract_id', type: 'uuid', nullable: true })
+  contractId?: string | null;
+
+  /** The contract route (lane) this shipment uses. */
+  @Column({ name: 'contract_route_id', type: 'uuid', nullable: true })
+  contractRouteId?: string | null;
+
+  /** Denormalized contract kind (ONE_TIME | GENERAL) for the single-active-booking index. */
+  @Column({ name: 'contract_kind', type: 'varchar', length: 20, nullable: true })
+  contractKind?: string | null;
+
+  /** Who created this booking: CUSTOMER (Path A), GL_ET (Path B), or STAFF. */
+  @Column({ name: 'created_by_role', type: 'varchar', length: 20, default: 'CUSTOMER', nullable: true })
+  createdByRole?: string | null;
+
+  @Column({ name: 'created_by_user_id', type: 'uuid', nullable: true })
+  createdByUserId?: string | null;
 
   /**
    * Nullable: general contracts have no shipment date at creation — the date is
@@ -220,13 +231,6 @@ export class Booking extends BaseEntity {
   @Column({ name: 'contract_type', type: 'varchar', length: 20 })
   contractType!: string;
 
-  @Column({ name: 'previous_contract_id', type: 'uuid', nullable: true })
-  previousContractId?: string | null;
-
-  @ManyToOne(() => Booking, { nullable: true })
-  @JoinColumn({ name: 'previous_contract_id' })
-  previousContract?: Booking | null;
-
   @Column({ name: 'service_type_id', type: 'uuid' })
   serviceTypeId!: string;