Trains management CRUD issues solved

apps/edr-freight-api/package.json

@@ -53,6 +53,7 @@
     "@types/multer": "^2.1.0",
     "@types/node": "^20.14.0",
     "@types/supertest": "^6.0.2",
+    "@types/pg": "^8.6.7",
     "jest": "^29.7.0",
     "supertest": "^7.0.0",
     "ts-jest": "^29.2.5",

apps/edr-freight-api/src/app.module.ts

@@ -75,7 +75,6 @@ import { CargoesModule } from './modules/cargoes/cargoes.module';
     BookingsModule,
     FilesModule,
     ConsignmentsModule,
-    TrainsModule,
     LocomotivesModule,
     WagonTypesModule,
     TrainSetsModule,

apps/edr-freight-api/src/migrations/1750000000000-AddCompanyContactColumns.ts

@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddCompanyContactColumns1750000000000 implements MigrationInterface {
+  name = 'AddCompanyContactColumns1750000000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE freight.companies ADD COLUMN IF NOT EXISTS contact_person_name VARCHAR(100);`);
+    await queryRunner.query(`ALTER TABLE freight.companies ADD COLUMN IF NOT EXISTS contact_person_phone VARCHAR(20);`);
+    await queryRunner.query(`ALTER TABLE freight.companies ADD COLUMN IF NOT EXISTS general_manager_name VARCHAR(100);`);
+    await queryRunner.query(`ALTER TABLE freight.companies ADD COLUMN IF NOT EXISTS general_manager_email VARCHAR(150);`);
+    await queryRunner.query(`ALTER TABLE freight.companies ADD COLUMN IF NOT EXISTS general_manager_phone VARCHAR(20);`);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`ALTER TABLE freight.companies DROP COLUMN IF EXISTS general_manager_phone;`);
+    await queryRunner.query(`ALTER TABLE freight.companies DROP COLUMN IF EXISTS general_manager_email;`);
+    await queryRunner.query(`ALTER TABLE freight.companies DROP COLUMN IF EXISTS general_manager_name;`);
+    await queryRunner.query(`ALTER TABLE freight.companies DROP COLUMN IF EXISTS contact_person_phone;`);
+    await queryRunner.query(`ALTER TABLE freight.companies DROP COLUMN IF EXISTS contact_person_name;`);
+  }
+}

apps/edr-freight-api/src/migrations/1750100000000-CreateFleetCrudTables.ts

@@ -0,0 +1,127 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class CreateFleetCrudTables1750100000000 implements MigrationInterface {
+  name = 'CreateFleetCrudTables1750100000000';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`CREATE SCHEMA IF NOT EXISTS freight`);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.wagons (
+        id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+        wagon_number VARCHAR NOT NULL UNIQUE,
+        wagon_type_id UUID NOT NULL,
+        train_id UUID,
+        sequence_number INT,
+        tare_weight NUMERIC(10, 2) NOT NULL,
+        max_payload_weight NUMERIC(10, 2) NOT NULL,
+        status VARCHAR NOT NULL DEFAULT 'AVAILABLE',
+        notes TEXT,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        deleted_at TIMESTAMPTZ
+      );
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.containers (
+        id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+        container_number VARCHAR NOT NULL UNIQUE,
+        container_type_id UUID NOT NULL,
+        wagon_id UUID,
+        position INT,
+        tare_weight NUMERIC(10, 2) NOT NULL,
+        max_gross_weight NUMERIC(10, 2) NOT NULL,
+        seal_number VARCHAR,
+        status VARCHAR NOT NULL DEFAULT 'AVAILABLE',
+        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        deleted_at TIMESTAMPTZ
+      );
+    `);
+
+    await queryRunner.query(`
+      CREATE TABLE IF NOT EXISTS freight.cargoes (
+        id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+        cargo_reference VARCHAR NOT NULL UNIQUE,
+        shipment_id UUID NOT NULL,
+        container_id UUID NOT NULL,
+        cargo_type_id UUID,
+        description TEXT,
+        quantity NUMERIC(12, 3) NOT NULL,
+        weight NUMERIC(10, 2) NOT NULL,
+        volume NUMERIC(10, 2),
+        status VARCHAR NOT NULL DEFAULT 'PENDING',
+        loaded_at TIMESTAMP,
+        unloaded_at TIMESTAMP,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        deleted_at TIMESTAMPTZ
+      );
+    `);
+
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_wagons_train_id" ON freight.wagons (train_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_containers_wagon_id" ON freight.containers (wagon_id)`);
+    await queryRunner.query(`CREATE INDEX IF NOT EXISTS "IDX_cargoes_container_id" ON freight.cargoes (container_id)`);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.wagons
+          ADD CONSTRAINT "FK_wagons_train_id"
+          FOREIGN KEY (train_id) REFERENCES freight.trains(id) ON DELETE SET NULL;
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.wagons
+          ADD CONSTRAINT "FK_wagons_wagon_type_id"
+          FOREIGN KEY (wagon_type_id) REFERENCES freight.wagon_types(id);
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.containers
+          ADD CONSTRAINT "FK_containers_wagon_id"
+          FOREIGN KEY (wagon_id) REFERENCES freight.wagons(id) ON DELETE SET NULL;
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.containers
+          ADD CONSTRAINT "FK_containers_container_type_id"
+          FOREIGN KEY (container_type_id) REFERENCES freight.container_types(id);
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.cargoes
+          ADD CONSTRAINT "FK_cargoes_container_id"
+          FOREIGN KEY (container_id) REFERENCES freight.containers(id) ON DELETE RESTRICT;
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+
+    await queryRunner.query(`
+      DO $$ BEGIN
+        ALTER TABLE freight.cargoes
+          ADD CONSTRAINT "FK_cargoes_cargo_type_id"
+          FOREIGN KEY (cargo_type_id) REFERENCES freight.cargo_types(id);
+      EXCEPTION WHEN duplicate_object THEN NULL;
+      END $$;
+    `);
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.cargoes CASCADE`);
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.containers CASCADE`);
+    await queryRunner.query(`DROP TABLE IF EXISTS freight.wagons CASCADE`);
+  }
+}

apps/edr-freight-api/src/modules/cargoes/cargoes.controller.ts

@@ -7,6 +7,7 @@ import {
   ParseUUIDPipe,
   Patch,
   Post,
+  Query,
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateCargoDto } from './dto/create-cargo.dto';
@@ -28,8 +29,8 @@ export class CargoesController {
 
   @Get()
   @ApiOperation({ summary: 'List all cargoes' })
-  findAll() {
-    return this.cargoesService.findAll();
+  findAll(@Query() query: Record<string, string | undefined>) {
+    return this.cargoesService.findAll(query);
   }
 
   @Get(':id')
@@ -67,4 +68,4 @@ export class CargoesController {
   deliver(@Param('id', ParseUUIDPipe) id: string, @Body() dto?: DeliverCargoDto) {
     return this.cargoesService.deliverCargo(id, dto);
   }
-}
+}

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

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { FindOptionsOrder, FindOptionsWhere, ILike, Repository } from 'typeorm';
 import { CreateCargoDto } from './dto/create-cargo.dto';
 import { UpdateCargoDto } from './dto/update-cargo.dto';
 import { LoadCargoDto } from './dto/load-cargo.dto';
@@ -22,8 +22,36 @@ export class CargoesService {
     return this.cargoRepo.save(cargo);
   }
 
-  async findAll(): Promise<Cargo[]> {
-    return this.cargoRepo.find({ order: { cargoReference: 'ASC' } });
+  async findAll(query: Record<string, string | undefined> = {}): Promise<Cargo[]> {
+    const where: FindOptionsWhere<Cargo>[] | FindOptionsWhere<Cargo> = [];
+    const search = query.search?.trim();
+    const status = query.status?.trim();
+    const containerId = query.containerId?.trim();
+
+    if (search) {
+      where.push({
+        cargoReference: ILike(`%${search}%`),
+        ...(status ? { status } : {}),
+        ...(containerId ? { containerId } : {}),
+      });
+      where.push({
+        description: ILike(`%${search}%`),
+        ...(status ? { status } : {}),
+        ...(containerId ? { containerId } : {}),
+      });
+    }
+
+    const sortBy = ['cargoReference', 'quantity', 'weight', 'volume', 'status'].includes(query.sortBy ?? '')
+      ? (query.sortBy as keyof Cargo)
+      : 'cargoReference';
+    const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
+
+    return this.cargoRepo.find({
+      where: search ? where : { ...(status ? { status } : {}), ...(containerId ? { containerId } : {}) },
+      order: { [sortBy]: sortOrder } as FindOptionsOrder<Cargo>,
+      skip: query.page && query.limit ? (Number(query.page) - 1) * Number(query.limit) : undefined,
+      take: query.limit ? Number(query.limit) : undefined,
+    });
   }
 
   async findById(id: string): Promise<Cargo> {
@@ -101,4 +129,4 @@ export class CargoesService {
 
     return this.cargoRepo.save(cargo);
   }
-}
+}

apps/edr-freight-api/src/modules/companies/entities/company.entity.ts

@@ -53,6 +53,21 @@ export class Company extends BaseEntity {
   @Column({ name: 'email', type: 'varchar', length: 150, nullable: true })
   email?: string | null;
 
+  @Column({ name: 'contact_person_name', type: 'varchar', length: 100, nullable: true })
+  contactPersonName?: string | null;
+
+  @Column({ name: 'contact_person_phone', type: 'varchar', length: 20, nullable: true })
+  contactPersonPhone?: string | null;
+
+  @Column({ name: 'general_manager_name', type: 'varchar', length: 100, nullable: true })
+  generalManagerName?: string | null;
+
+  @Column({ name: 'general_manager_email', type: 'varchar', length: 150, nullable: true })
+  generalManagerEmail?: string | null;
+
+  @Column({ name: 'general_manager_phone', type: 'varchar', length: 20, nullable: true })
+  generalManagerPhone?: string | null;
+
   @Column({ name: 'website', type: 'varchar', length: 200, nullable: true })
   website?: string | null;
 

apps/edr-freight-api/src/modules/container-management/containers.controller.ts

@@ -7,6 +7,7 @@ import {
   ParseUUIDPipe,
   Patch,
   Post,
+  Query,
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateContainerDto } from './dto/create-container.dto';
@@ -27,8 +28,8 @@ export class ContainersController {
 
   @Get()
   @ApiOperation({ summary: 'List all containers' })
-  findAll() {
-    return this.containersService.findAll();
+  findAll(@Query() query: Record<string, string | undefined>) {
+    return this.containersService.findAll(query);
   }
 
   @Get(':id')
@@ -60,4 +61,4 @@ export class ContainersController {
   unassignFromWagon(@Param('id', ParseUUIDPipe) id: string) {
     return this.containersService.unassignFromWagon(id);
   }
-}
+}

apps/edr-freight-api/src/modules/container-management/containers.service.ts

@@ -1,7 +1,7 @@
 // apps/edr-freight-api/src/modules/container-management/containers.service.ts
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { FindOptionsOrder, FindOptionsWhere, ILike, Repository } from 'typeorm';
 import { CreateContainerDto } from './dto/create-container.dto';
 import { UpdateContainerDto } from './dto/update-container.dto';
 import { AssignContainerToWagonDto } from './dto/assign-container-to-wagon.dto';
@@ -24,8 +24,31 @@ export class ContainersService {
     return this.containerRepo.save(container);
   }
 
-  async findAll(): Promise<Container[]> {
-    return this.containerRepo.find({ order: { containerNumber: 'ASC' } });
+  async findAll(query: Record<string, string | undefined> = {}): Promise<Container[]> {
+    const where: FindOptionsWhere<Container>[] | FindOptionsWhere<Container> = [];
+    const search = query.search?.trim();
+    const status = query.status?.trim();
+    const wagonId = query.wagonId?.trim();
+
+    if (search) {
+      where.push({
+        containerNumber: ILike(`%${search}%`),
+        ...(status ? { status } : {}),
+        ...(wagonId ? { wagonId } : {}),
+      });
+    }
+
+    const sortBy = ['containerNumber', 'tareWeight', 'maxGrossWeight', 'status', 'position'].includes(query.sortBy ?? '')
+      ? (query.sortBy as keyof Container)
+      : 'containerNumber';
+    const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
+
+    return this.containerRepo.find({
+      where: search ? where : { ...(status ? { status } : {}), ...(wagonId ? { wagonId } : {}) },
+      order: { [sortBy]: sortOrder } as FindOptionsOrder<Container>,
+      skip: query.page && query.limit ? (Number(query.page) - 1) * Number(query.limit) : undefined,
+      take: query.limit ? Number(query.limit) : undefined,
+    });
   }
 
   async findById(id: string): Promise<Container> {
@@ -37,8 +60,6 @@ export class ContainersService {
   async update(id: string, dto: UpdateContainerDto): Promise<Container> {
     const container = await this.findById(id);
     Object.assign(container, dto);
-    if (dto.wagonId === undefined) container.wagonId = null;
-    if (dto.position === undefined) container.position = null;
     return this.containerRepo.save(container);
   }
 
@@ -82,4 +103,4 @@ export class ContainersService {
     container.status = 'AVAILABLE';
     return this.containerRepo.save(container);
   }
-}
+}

apps/edr-freight-api/src/modules/customers/customers.controller.ts

@@ -61,10 +61,10 @@ export class CustomersController {
     return this.customersService.findById(id);
   }
 
-  @Get("user/:userId")
-  findByUserId(@Param("userId", ParseUUIDPipe) userId: string): Promise<any> {
-    return this.customersService.findByUserId(userId);
-  }
+  // @Get("user/:userId")
+  // findByUserId(@Param("userId", ParseUUIDPipe) userId: string): Promise<any> {
+  //   return this.customersService.findByUserId(userId);
+  // }
 
   @Patch(":id")
   @ApiOperation({ summary: "Update a customer" })

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

@@ -52,15 +52,15 @@ export class CustomersService {
     return customer;
   }
 
-  async findByUserId(userId: string): Promise<Customer> {
-    const customer = await this.customersRepository.findByUserId(userId);
+  // async findByUserId(userId: string): Promise<Customer> {
+  //   const customer = await this.customersRepository.findByUserId(userId);
      
-    if (!customer) {
-      throw new NotFoundException(`Customer with ID ${userId} not found`);
-    }
+  //   if (!customer) {
+  //     throw new NotFoundException(`Customer with ID ${userId} not found`);
+  //   }
 
-    return customer;
-  }
+   // return customer;
+  //}
 
   /** Get customer by email */
   async findByEmail(email: string): Promise<Customer> {
@@ -100,16 +100,16 @@ export class CustomersService {
       throw new BadRequestException("VAT number must be exactly 10 digits");
     }
 
-    // Check email conflict
-    if (dto.email) {
-      const existing = await this.customersRepository.findByEmail(dto.email);
+    // // Check email conflict
+    // if (dto.email) {
+    //   const existing = await this.customersRepository.findByEmail(dto.email);
 
-      if (existing && existing.userId !== id) {
-        throw new ConflictException(
-          `Customer with email "${dto.email}" already exists`,
-        );
-      }
-    }
+    //  // if (existing && existing.userId !== id) {
+    //   //  throw new ConflictException(
+    //   //    `Customer with email "${dto.email}" already exists`,
+    //   //  );
+    //  // }
+    // }
 
     const updated = await this.customersRepository.update(id, dto);
 

apps/edr-freight-api/src/modules/customers/dto/response-customer.dto.ts

@@ -2,7 +2,7 @@
 import { Customer } from '../entities/customer.entity';
 
 export class ResponseCustomerDto {
-  UserId: string;
+  //UserId: string;
   firstName: string;
   lastName: string;
   email: string;
@@ -30,7 +30,7 @@ export class ResponseCustomerDto {
   updatedAt: Date;
 
   constructor(customer: Customer) {
-    this.UserId = customer.userId;
+    //this.UserId = customer.userId;
     this.firstName = customer.firstName;
     this.lastName = customer.lastName;
     this.email = customer.email;

apps/edr-freight-api/src/modules/customers/entities/customer.entity.ts

@@ -3,12 +3,12 @@ import { Column, Entity, Index } from 'typeorm';
 
 @Entity({ schema: 'freight', name: 'customers' })
 @Index(['email'])
-@Index(['userId'])
+//@Index(['userId'])
 @Index(['tinNumber'])
 @Index(['fanNumber'])
 export class Customer extends BaseEntity {
-  @Column({ name: 'user_id', type: 'uuid' })
-  userId!: string;
+  //@Column({ name: 'user_id', type: 'uuid' })
+  //userId!: string;
 
   @Column({ name: 'first_name', type: 'varchar', length: 100 })
   firstName!: string;

apps/edr-freight-api/src/modules/train-scheduling/dto/get-eligible-container-bookings.dto.ts

@@ -1,5 +1,7 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
-import { IsDateString, IsOptional, IsUUID } from 'class-validator';
+import { IsDateString, IsIn, IsOptional, IsUUID } from 'class-validator';
+
+import { BOOKING_STATUSES } from '../../bookings/entities/booking.entity';
 
 export class GetEligibleContainerBookingsDto {
   @ApiPropertyOptional({ format: 'uuid' })
@@ -19,5 +21,6 @@ export class GetEligibleContainerBookingsDto {
 
   @ApiPropertyOptional()
   @IsOptional()
+  @IsIn(BOOKING_STATUSES)
   status?: string;
 }

apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts

@@ -118,11 +118,9 @@ export class TrainSchedulingService {
       );
     }
 
-    if (query.status) {
-      queryBuilder.andWhere("booking.status = :status", {
-        status: query.status,
-      });
-    }
+    queryBuilder.andWhere("booking.status = :status", {
+      status: query.status ?? "PAID",
+    });
 
     const bookings = await queryBuilder
       .orderBy("booking.scheduled_date", "ASC")

apps/edr-freight-api/src/modules/trains/trains.controller.ts

@@ -1,14 +1,18 @@
 import {
   Body,
   Controller,
+  Delete,
   Get,
   Param,
   ParseUUIDPipe,
+  Patch,
   Post,
+  Query,
 } from "@nestjs/common";
 import { ApiOperation, ApiTags } from "@nestjs/swagger";
 
 import { CreateTrainDto } from "./dto/create-train.dto";
+import { UpdateTrainDto } from "./dto/update-train.dto";
 import { TrainsService } from "./trains.service";
 
 @ApiTags("trains")
@@ -24,8 +28,8 @@ export class TrainsController {
 
   @Get()
   @ApiOperation({ summary: "List all trains" })
-  findAll() {
-    return this.trainsService.findAll();
+  findAll(@Query() query: Record<string, string | undefined>) {
+    return this.trainsService.findAll(query);
   }
 
   @Get(":id")
@@ -33,4 +37,16 @@ export class TrainsController {
   findOne(@Param("id", ParseUUIDPipe) id: string) {
     return this.trainsService.findById(id);
   }
+
+  @Patch(":id")
+  @ApiOperation({ summary: "Update a train" })
+  update(@Param("id", ParseUUIDPipe) id: string, @Body() dto: UpdateTrainDto) {
+    return this.trainsService.update(id, dto);
+  }
+
+  @Delete(":id")
+  @ApiOperation({ summary: "Delete a train" })
+  remove(@Param("id", ParseUUIDPipe) id: string) {
+    return this.trainsService.remove(id);
+  }
 }

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

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
+import { FindOptionsOrder, FindOptionsWhere, ILike, Repository } from 'typeorm';
 import { CreateTrainDto } from './dto/create-train.dto';
 import { UpdateTrainDto } from './dto/update-train.dto';
 import { Train } from './entities/train.entity';
@@ -17,8 +17,28 @@ export class TrainsService {
     return this.trainRepo.save(train);
   }
 
-  findAll(): Promise<Train[]> {
-    return this.trainRepo.find({ order: { code: 'ASC' } });
+  findAll(query: Record<string, string | undefined> = {}): Promise<Train[]> {
+    const where: FindOptionsWhere<Train>[] | FindOptionsWhere<Train> = [];
+    const search = query.search?.trim();
+    const status = query.status?.trim();
+
+    if (search) {
+      where.push({ code: ILike(`%${search}%`), ...(status ? { status: status as Train['status'] } : {}) });
+      where.push({ trainNumber: ILike(`%${search}%`), ...(status ? { status: status as Train['status'] } : {}) });
+      where.push({ trainName: ILike(`%${search}%`), ...(status ? { status: status as Train['status'] } : {}) });
+    }
+
+    const sortBy = ['code', 'trainNumber', 'trainName', 'capacityTons', 'status'].includes(query.sortBy ?? '')
+      ? (query.sortBy as keyof Train)
+      : 'code';
+    const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
+
+    return this.trainRepo.find({
+      where: search ? where : status ? { status: status as Train['status'] } : {},
+      order: { [sortBy]: sortOrder } as FindOptionsOrder<Train>,
+      skip: query.page && query.limit ? (Number(query.page) - 1) * Number(query.limit) : undefined,
+      take: query.limit ? Number(query.limit) : undefined,
+    });
   }
 
   async findById(id: string): Promise<Train> {
@@ -38,4 +58,4 @@ export class TrainsService {
     const train = await this.findById(id);
     await this.trainRepo.remove(train);
   }
-}
+}

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

@@ -7,6 +7,7 @@ import {
   ParseUUIDPipe,
   Patch,
   Post,
+  Query,
 } from '@nestjs/common';
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
 import { CreateWagonDto } from './dto/create-wagon.dto';
@@ -28,8 +29,8 @@ export class WagonsController {
 
   @Get()
   @ApiOperation({ summary: 'List all wagons' })
-  findAll() {
-    return this.wagonsService.findAll();
+  findAll(@Query() query: Record<string, string | undefined>) {
+    return this.wagonsService.findAll(query);
   }
 
   @Get(':id')
@@ -73,4 +74,4 @@ export class TrainWagonsReorderController {
   reorder(@Param('trainId', ParseUUIDPipe) trainId: string, @Body() dto: ReorderWagonsDto) {
     return this.wagonsService.reorderWagons(trainId, dto);
   }
-}
+}

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

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException, ConflictException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, DataSource } from 'typeorm';
+import { Repository, DataSource, FindOptionsOrder, FindOptionsWhere, ILike } from 'typeorm';
 import { CreateWagonDto } from './dto/create-wagon.dto';
 import { UpdateWagonDto } from './dto/update-wagon.dto';
 import { AssignWagonToTrainDto } from './dto/assign-wagon-to-train.dto';
@@ -26,8 +26,31 @@ export class WagonsService {
     return this.wagonRepo.save(wagon);
   }
 
-  async findAll(): Promise<Wagon[]> {
-    return this.wagonRepo.find({ order: { wagonNumber: 'ASC' } });
+  async findAll(query: Record<string, string | undefined> = {}): Promise<Wagon[]> {
+    const where: FindOptionsWhere<Wagon>[] | FindOptionsWhere<Wagon> = [];
+    const search = query.search?.trim();
+    const status = query.status?.trim();
+    const trainId = query.trainId?.trim();
+
+    if (search) {
+      where.push({
+        wagonNumber: ILike(`%${search}%`),
+        ...(status ? { status } : {}),
+        ...(trainId ? { trainId } : {}),
+      });
+    }
+
+    const sortBy = ['wagonNumber', 'tareWeight', 'maxPayloadWeight', 'status', 'sequenceNumber'].includes(query.sortBy ?? '')
+      ? (query.sortBy as keyof Wagon)
+      : 'wagonNumber';
+    const sortOrder = query.sortOrder?.toUpperCase() === 'DESC' ? 'DESC' : 'ASC';
+
+    return this.wagonRepo.find({
+      where: search ? where : { ...(status ? { status } : {}), ...(trainId ? { trainId } : {}) },
+      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,
+    });
   }
 
   async findById(id: string): Promise<Wagon> {
@@ -39,8 +62,6 @@ export class WagonsService {
   async update(id: string, dto: UpdateWagonDto): Promise<Wagon> {
     const wagon = await this.findById(id);
     Object.assign(wagon, dto);
-    if (dto.trainId === undefined) wagon.trainId = null;
-    if (dto.sequenceNumber === undefined) wagon.sequenceNumber = null;
     return this.wagonRepo.save(wagon);
   }
 
@@ -98,4 +119,4 @@ export class WagonsService {
       await queryRunner.release();
     }
   }
-}
+}

apps/edr-freight-api/src/scripts/create-freight-schema.js

@@ -0,0 +1,25 @@
+const { Client } = require('pg');
+
+(async function createSchema(){
+  const client = new Client({
+    host: 'localhost',
+    port: 5432,
+    user: 'postgres',
+    password: '',
+    database: 'edr_freight',
+  });
+
+  try {
+    console.log('Connecting to Postgres...');
+    await client.connect();
+    console.log('Creating schema freight if not exists...');
+    await client.query('CREATE SCHEMA IF NOT EXISTS freight');
+    console.log('Schema ensured.');
+    await client.end();
+    process.exit(0);
+  } catch (err) {
+    console.error('Failed to create schema:', err);
+    try { await client.end(); } catch {}
+    process.exit(1);
+  }
+})();

apps/edr-freight-api/src/scripts/create-freight-schema.ts

@@ -0,0 +1,27 @@
+import { Client } from 'pg';
+
+async function createSchema() {
+  const client = new Client({
+    host: 'localhost',
+    port: 5432,
+    user: 'postgres',
+    password: '',
+    database: 'edr_freight',
+  });
+
+  try {
+    console.log('Connecting to Postgres...');
+    await client.connect();
+    console.log('Creating schema freight if not exists...');
+    await client.query('CREATE SCHEMA IF NOT EXISTS freight');
+    console.log('Schema ensured.');
+    await client.end();
+    process.exit(0);
+  } catch (err) {
+    console.error('Failed to create schema:', err);
+    try { await client.end(); } catch {}
+    process.exit(1);
+  }
+}
+
+createSchema();

apps/edr-freight-api/src/scripts/run-migrations.ts

@@ -0,0 +1,21 @@
+import { AppDataSource } from '../data-source';
+
+async function runMigrations() {
+  try {
+    console.log('Initializing datasource...');
+    await AppDataSource.initialize();
+    console.log('Datasource initialized. Running migrations...');
+    const migrations = await AppDataSource.runMigrations();
+    console.log(`Applied ${migrations.length} migrations.`);
+    await AppDataSource.destroy();
+    process.exit(0);
+  } catch (err) {
+    console.error('Migration run failed:', err);
+    try {
+      await AppDataSource.destroy();
+    } catch {}
+    process.exit(1);
+  }
+}
+
+runMigrations();

apps/edr-freight-api/src/seed/demo-bookings.seeder.ts

@@ -4,7 +4,11 @@ import { DataSource } from "typeorm";
 
 import { BookingContainer } from "../modules/bookings/entities/booking-container.entity";
 import { Booking } from "../modules/bookings/entities/booking.entity";
-import { Customer } from "../modules/customers/entities/customer.entity";
+import {
+  Company,
+  CompanyStatus,
+  CompanyType,
+} from "../modules/companies/entities/company.entity";
 import { Locomotive } from "../modules/locomotives/entities/locomotive.entity";
 import { ServiceType } from "../modules/rule-engine/entities/service-type.entity";
 import { Yard } from "../modules/rule-engine/entities/yard.entity";
@@ -14,7 +18,8 @@ import { ContainerType } from "../modules/rule-engine/entities/container-type.en
 const SEED_FLAG = "SEED_DEMO_BOOKINGS";
 
 const SERVICE_TYPE_CODE = "RAIL_CONTAINER";
-const CUSTOMER_EMAIL = "train-scheduling-demo@edr.local";
+const COMPANY_EMAIL = "train-scheduling-demo@edr.local";
+const COMPANY_TIN = "1234567890";
 
 const YARDS = [
   { code: "DJIBOUTI", label: "Djibouti", country: "Djibouti", displayOrder: 1 },
@@ -183,39 +188,35 @@ export class DemoBookingsSeeder {
         { conflictPaths: { code: true } },
       );
 
-      await manager.getRepository(Customer).upsert(
+      await manager.getRepository(Company).upsert(
         {
-          userId: "00000000-0000-0000-0000-000000000111",
-          firstName: "Train",
-          lastName: "Scheduling",
-          email: CUSTOMER_EMAIL,
-          phone: "251900000001",
-          companyName: "Train Scheduling Demo Customer",
-          companyEmail: CUSTOMER_EMAIL,
-          companyPhone: "251900000001",
-          companyLocation: "Addis Ababa",
-          companyAddress: "Demo Address",
-          customerType: "DEMO",
-          status: "ACTIVE",
-          contactPersonName: "Train Scheduling",
-          contactPersonPhone: "251900000001",
-          tinNumber: "1234567890",
+          name: "Train Scheduling Demo Customer",
+          type: CompanyType.Customer,
+          status: CompanyStatus.Active,
+          tin: COMPANY_TIN,
           vatNumber: "1234567890",
           fanNumber: "1234567890123456",
+          country: "Ethiopia",
+          address: "Demo Address",
+          phone: "251900000001",
+          email: COMPANY_EMAIL,
+          website: null,
+          contactPersonName: "Train Scheduling",
+          contactPersonPhone: "251900000001",
           generalManagerName: "Demo Manager",
-          generalManagerEmail: CUSTOMER_EMAIL,
+          generalManagerEmail: COMPANY_EMAIL,
           generalManagerPhone: "251900000001",
         },
-        { conflictPaths: { email: true } },
+        { conflictPaths: { tin: true } },
       );
 
-      const [serviceType, customer, yards, containerTypes] = await Promise.all([
+      const [serviceType, company, yards, containerTypes] = await Promise.all([
         manager
           .getRepository(ServiceType)
           .findOneByOrFail({ code: SERVICE_TYPE_CODE }),
         manager
-          .getRepository(Customer)
-          .findOneByOrFail({ email: CUSTOMER_EMAIL }),
+          .getRepository(Company)
+          .findOneByOrFail({ tin: COMPANY_TIN }),
         manager.getRepository(Yard).find(),
         manager.getRepository(ContainerType).find(),
       ]);
@@ -247,7 +248,7 @@ export class DemoBookingsSeeder {
         await manager.getRepository(Booking).upsert(
           {
             reference: demoBooking.reference,
-            companyId: customer.id,
+            companyId: company.id,
             status: "APPROVED",
             scheduledDate: new Date(demoBooking.scheduledDate),
             totalAmount: 0,