Merge freight/develop into Warehouses

apps/edr-freight-api/src/modules/wagons/dto/create-wagon.dto.ts

@@ -1,4 +1,5 @@
-import { IsString, IsUUID, IsOptional, IsInt, Min, IsNumber, IsIn } from 'class-validator';
+import { WagonReadiness, WagonStatus } from '@edr/types';
+import { IsString, IsUUID, IsOptional, IsInt, Min, IsNumber, IsEnum } from 'class-validator';
 
 export class CreateWagonDto {
   @IsString()
@@ -29,8 +30,17 @@ export class CreateWagonDto {
   maxPayloadWeight!: number;
 
   @IsOptional()
+<<<<<<< HEAD
   @IsIn(['AVAILABLE', 'IMPORT_READY', 'EXPORT_READY', 'ASSIGNED', 'MAINTENANCE', 'RETIRED'])
   status?: string;
+=======
+  @IsEnum(WagonStatus)
+  status?: WagonStatus;
+
+  @IsOptional()
+  @IsEnum(WagonReadiness)
+  readiness?: WagonReadiness;
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
 
   @IsOptional()
   @IsString()

apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts

@@ -1,12 +1,31 @@
 // apps/edr-freight-api/src/modules/wagons/entities/wagon.entity.ts
-import { Entity, Column, ManyToOne, OneToMany, JoinColumn } from 'typeorm';
+import { WagonReadiness, WagonStatus } from '@edr/types';
+import { Entity, Column, ManyToOne, OneToMany, JoinColumn, Index } from 'typeorm';
 import { BaseEntity } from '@edr/api-common';
 import { Train } from '../../trains/entities/train.entity';
+import { TrainSchedule } from '../../train-schedules/entities/train-schedule.entity';
+import { TrainSetWagon } from '../../train-sets/entities/train-set-wagon.entity';
 import { Container } from '../../container-management/entities/container.entity';
 import { Yard } from '../../rule-engine/entities/yard.entity';
 import { WagonType } from '../../wagon-types/entities/wagon-type.entity';
 
+export const WAGON_STATUSES = [
+  WagonStatus.Available,
+  WagonStatus.Assigned,
+  WagonStatus.Maintenance,
+  WagonStatus.Retired,
+] as const;
+
+export const WAGON_READINESS_VALUES = [
+  WagonReadiness.ImportReady,
+  WagonReadiness.ExportReady,
+] as const;
+
+export type WagonStatusType = (typeof WAGON_STATUSES)[number];
+export type WagonReadinessType = (typeof WAGON_READINESS_VALUES)[number];
+
 @Entity({ name: 'wagons', schema: 'freight' })
+@Index(['readiness'])
 export class Wagon extends BaseEntity {
   @Column({ unique: true, name: 'wagon_number' })
   wagonNumber!: string;
@@ -37,13 +56,35 @@ export class Wagon extends BaseEntity {
   @Column({ name: 'max_payload_weight', type: 'decimal', precision: 10, scale: 2 })
   maxPayloadWeight!: number;
 
+<<<<<<< HEAD
   @Column({ type: 'varchar', default: 'AVAILABLE' })
   status!: string; // AVAILABLE, IMPORT_READY, EXPORT_READY, ASSIGNED, MAINTENANCE, RETIRED
+=======
+  @Column({ type: 'varchar', length: 20, default: WagonStatus.Available })
+  status!: WagonStatusType;
+
+  @Column({ type: 'varchar', length: 20, default: WagonReadiness.ImportReady })
+  readiness!: WagonReadinessType;
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
 
   @Column({ type: 'text', nullable: true })
   notes!: string | null;
 
-  // Relationship to Train
+  @Column({ name: 'train_set_wagon_id', type: 'uuid', nullable: true })
+  trainSetWagonId!: string | null;
+
+  @ManyToOne(() => TrainSetWagon, { nullable: true, onDelete: 'SET NULL' })
+  @JoinColumn({ name: 'train_set_wagon_id' })
+  trainSetWagon?: TrainSetWagon | null;
+
+  @Column({ name: 'current_train_schedule_id', type: 'uuid', nullable: true })
+  currentTrainScheduleId!: string | null;
+
+  @ManyToOne(() => TrainSchedule, { nullable: true, onDelete: 'SET NULL' })
+  @JoinColumn({ name: 'current_train_schedule_id' })
+  currentTrainSchedule?: TrainSchedule | null;
+
+  /** Fleet master consist grouping — separate from operational train_schedules. */
   @ManyToOne(() => Train, (train) => train.wagons, { onDelete: 'SET NULL' })
   @JoinColumn({ name: 'train_id' })
   train!: Train | null;

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

@@ -1,3 +1,4 @@
+import { WagonReadiness, WagonStatus } from '@edr/types';
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository, DataSource, FindOptionsOrder, FindOptionsWhere, ILike } from 'typeorm';
@@ -22,7 +23,11 @@ export class WagonsService {
   ) {}
 
   async create(dto: CreateWagonDto): Promise<Wagon> {
-    const wagon = this.wagonRepo.create(dto);
+    const wagon = this.wagonRepo.create({
+      ...dto,
+      status: dto.status ?? WagonStatus.Available,
+      readiness: dto.readiness ?? WagonReadiness.ImportReady,
+    });
     // Convert undefined to null for nullable fields
     if (dto.trainId === undefined) wagon.trainId = null;
     if (dto.sequenceNumber === undefined) wagon.sequenceNumber = null;
@@ -34,26 +39,43 @@ export class WagonsService {
     const where: FindOptionsWhere<Wagon>[] | FindOptionsWhere<Wagon> = [];
     const search = query.search?.trim();
     const status = query.status?.trim();
+    const readiness = query.readiness?.trim();
     const trainId = query.trainId?.trim();
+<<<<<<< HEAD
     const currentLocationYardId = query.currentLocationYardId?.trim();
+=======
+    const filters = {
+      ...(status ? { status: status as Wagon['status'] } : {}),
+      ...(readiness ? { readiness: readiness as Wagon['readiness'] } : {}),
+      ...(trainId ? { trainId } : {}),
+    };
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
 
     if (search) {
       where.push({
         wagonNumber: ILike(`%${search}%`),
+<<<<<<< HEAD
         ...(status ? { status } : {}),
         ...(trainId ? { trainId } : {}),
         ...(currentLocationYardId ? { currentLocationYardId } : {}),
+=======
+        ...filters,
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
       });
     }
 
-    const sortBy = ['wagonNumber', 'tareWeight', 'maxPayloadWeight', 'status', 'sequenceNumber'].includes(query.sortBy ?? '')
+    const sortBy = ['wagonNumber', 'tareWeight', 'maxPayloadWeight', 'status', 'readiness', 'sequenceNumber'].includes(query.sortBy ?? '')
       ? (query.sortBy as keyof Wagon)
       : 'wagonNumber';
     const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
 
     return this.wagonRepo.find({
+<<<<<<< HEAD
       where: search ? where : { ...(status ? { status } : {}), ...(trainId ? { trainId } : {}), ...(currentLocationYardId ? { currentLocationYardId } : {}) },
       relations: { currentLocationYard: true, wagonType: true },
+=======
+      where: search ? where : filters,
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
       order: { [sortBy]: sortOrder } as FindOptionsOrder<Wagon>,
       skip: query.page && query.limit ? (Number(query.page) - 1) * Number(query.limit) : undefined,
       take: query.limit ? Number(query.limit) : undefined,
@@ -82,7 +104,7 @@ export class WagonsService {
 
   async assignToTrain(wagonId: string, dto: AssignWagonToTrainDto): Promise<Wagon> {
     const wagon = await this.findById(wagonId);
-    if (wagon.status === 'ASSIGNED') {
+    if (wagon.status === WagonStatus.Assigned) {
       throw new ConflictException('Wagon already assigned to a train');
     }
 
@@ -101,7 +123,7 @@ export class WagonsService {
 
     wagon.trainId = train.id;
     wagon.sequenceNumber = sequence;
-    wagon.status = 'ASSIGNED';
+    wagon.status = WagonStatus.Assigned;
     return this.wagonRepo.save(wagon);
   }
 
@@ -109,7 +131,11 @@ export class WagonsService {
     const wagon = await this.findById(wagonId);
     wagon.trainId = null;
     wagon.sequenceNumber = null;
+<<<<<<< HEAD
     wagon.status = await this.statusForLocation(wagon.currentLocationYardId, 'AVAILABLE');
+=======
+    wagon.status = WagonStatus.Available;
+>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
     return this.wagonRepo.save(wagon);
   }