complete rule engine and booking flow

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

@@ -56,6 +56,8 @@ export class BookingsRepository extends BaseRepository<Booking> {
       .createQueryBuilder('booking')
       .leftJoinAndSelect('booking.bookingContainers', 'bc')
       .leftJoinAndSelect('bc.containerType', 'ct')
+      .leftJoinAndSelect('booking.customer', 'customer')
+      .leftJoinAndSelect('booking.train', 'train')
       .leftJoinAndSelect('booking.serviceType', 'st')
       .leftJoinAndSelect('booking.cargoType', 'cargo')
       .leftJoinAndSelect('booking.originYard', 'oy')

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

@@ -1,9 +1,11 @@
 import { BaseEntity } from '@edr/api-common';
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany } from 'typeorm';
+import { Customer } from '../../customers/entities/customer.entity';
 import { CargoType } from '../../rule-engine/entities/cargo-type.entity';
 import { ServiceType } from '../../rule-engine/entities/service-type.entity';
 import { ShippingLine } from '../../rule-engine/entities/shipping-line.entity';
 import { Yard } from '../../rule-engine/entities/yard.entity';
+import { Train } from '../../trains/entities/train.entity';
 import { FileRecord } from '../../files/entities/file.entity';
 import { BookingApprovalStep } from './booking-approval-step.entity';
 import { BookingCargoModifier } from './booking-cargo-modifier.entity';
@@ -36,9 +38,17 @@ export class Booking extends BaseEntity {
   @Column({ name: 'customer_id', type: 'uuid' })
   customerId!: string;
 
+  @ManyToOne(() => Customer)
+  @JoinColumn({ name: 'customer_id' })
+  customer?: Customer;
+
   @Column({ name: 'train_id', type: 'uuid', nullable: true })
   trainId?: string | null;
 
+  @ManyToOne(() => Train, { nullable: true })
+  @JoinColumn({ name: 'train_id' })
+  train?: Train | null;
+
   @Column({ name: 'status', type: 'varchar', length: 40, default: 'DRAFT' })
   status!: string;
 
@@ -57,6 +67,10 @@ export class Booking extends BaseEntity {
   @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;
 
@@ -164,6 +178,10 @@ export class Booking extends BaseEntity {
   @Column({ name: 'consolidation_partner_id', type: 'uuid', nullable: true })
   consolidationPartnerId?: string | null;
 
+  @ManyToOne(() => Booking, { nullable: true })
+  @JoinColumn({ name: 'consolidation_partner_id' })
+  consolidationPartner?: Booking | null;
+
   @OneToMany(() => BookingContainer, (bc) => bc.booking)
   bookingContainers?: BookingContainer[];