Merge branch 'freight/develop' into freight/feature/payment

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.module.ts

@@ -2,13 +2,14 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Cargo } from './entities/cargoes.entity';
 import { Container } from '../container-management/entities/container.entity';
+import { CargoType } from '../rule-engine/entities/cargo-type.entity';
 import { CargoesController } from './cargoes.controller';
 import { CargoesService } from './cargoes.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Cargo, Container])],
+  imports: [TypeOrmModule.forFeature([Cargo, Container, CargoType])],
   controllers: [CargoesController],
   providers: [CargoesService],
   exports: [CargoesService],
 })
-export class CargoesModule {}
+export class CargoesModule {}

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

@@ -1,12 +1,13 @@
 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';
 import { DeliverCargoDto } from './dto/deliver-cargo.dto';
 import { Cargo } from './entities/cargoes.entity';
 import { Container } from '../container-management/entities/container.entity';
+import { CargoType } from '../rule-engine/entities/cargo-type.entity';
 
 @Injectable()
 export class CargoesService {
@@ -15,15 +16,64 @@ export class CargoesService {
     private readonly cargoRepo: Repository<Cargo>,
     @InjectRepository(Container)
     private readonly containerRepo: Repository<Container>,
+    @InjectRepository(CargoType)
+    private readonly cargoTypeRepo: Repository<CargoType>,
   ) {}
 
   async create(dto: CreateCargoDto): Promise<Cargo> {
+    const existing = await this.cargoRepo.findOne({
+      where: { cargoReference: dto.cargoReference },
+    });
+    if (existing) {
+      throw new ConflictException(`Cargo reference "${dto.cargoReference}" already exists`);
+    }
+
+    const container = await this.containerRepo.findOne({ where: { id: dto.containerId } });
+    if (!container) {
+      throw new NotFoundException(`Container ${dto.containerId} not found`);
+    }
+
+    if (dto.cargoTypeId) {
+      const cargoType = await this.cargoTypeRepo.findOne({
+        where: { id: dto.cargoTypeId, isActive: true },
+      });
+      if (!cargoType) throw new NotFoundException(`Cargo type ${dto.cargoTypeId} not found`);
+    }
+
     const cargo = this.cargoRepo.create(dto);
     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> {
@@ -34,6 +84,24 @@ export class CargoesService {
 
   async update(id: string, dto: UpdateCargoDto): Promise<Cargo> {
     const cargo = await this.findById(id);
+    if (dto.cargoReference && dto.cargoReference !== cargo.cargoReference) {
+      const existing = await this.cargoRepo.findOne({
+        where: { cargoReference: dto.cargoReference },
+      });
+      if (existing) {
+        throw new ConflictException(`Cargo reference "${dto.cargoReference}" already exists`);
+      }
+    }
+    if (dto.containerId) {
+      const container = await this.containerRepo.findOne({ where: { id: dto.containerId } });
+      if (!container) throw new NotFoundException(`Container ${dto.containerId} not found`);
+    }
+    if (dto.cargoTypeId) {
+      const cargoType = await this.cargoTypeRepo.findOne({
+        where: { id: dto.cargoTypeId, isActive: true },
+      });
+      if (!cargoType) throw new NotFoundException(`Cargo type ${dto.cargoTypeId} not found`);
+    }
     Object.assign(cargo, dto);
     return this.cargoRepo.save(cargo);
   }
@@ -101,4 +169,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.module.ts

@@ -3,12 +3,13 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { Container } from './entities/container.entity';
 import { Wagon } from '../wagons/entities/wagon.entity';
+import { ContainerType } from '../rule-engine/entities/container-type.entity';
 import { ContainersController } from './containers.controller';
 import { ContainersService } from './containers.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Container, Wagon])],   // ✅ add Wagon
+  imports: [TypeOrmModule.forFeature([Container, Wagon, ContainerType])],
   controllers: [ContainersController],
   providers: [ContainersService],
 })
-export class ContainersModule {}
+export class ContainersModule {}

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

@@ -1,12 +1,13 @@
 // 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';
 import { Container } from './entities/container.entity';
 import { Wagon } from '../wagons/entities/wagon.entity';
+import { ContainerType } from '../rule-engine/entities/container-type.entity';
 
 @Injectable()
 export class ContainersService {
@@ -15,17 +16,61 @@ export class ContainersService {
     private readonly containerRepo: Repository<Container>,
     @InjectRepository(Wagon)
     private readonly wagonRepo: Repository<Wagon>,   // ✅ use raw repository
+    @InjectRepository(ContainerType)
+    private readonly containerTypeRepo: Repository<ContainerType>,
   ) {}
 
   async create(dto: CreateContainerDto): Promise<Container> {
+    const existing = await this.containerRepo.findOne({
+      where: { containerNumber: dto.containerNumber },
+    });
+    if (existing) {
+      throw new ConflictException(`Container number "${dto.containerNumber}" already exists`);
+    }
+
+    const containerType = await this.containerTypeRepo.findOne({
+      where: { id: dto.containerTypeId, isActive: true },
+    });
+    if (!containerType) {
+      throw new NotFoundException(`Container type ${dto.containerTypeId} not found`);
+    }
+
+    if (dto.wagonId) {
+      const wagon = await this.wagonRepo.findOne({ where: { id: dto.wagonId } });
+      if (!wagon) throw new NotFoundException(`Wagon ${dto.wagonId} not found`);
+    }
+
     const container = this.containerRepo.create(dto);
     if (dto.wagonId === undefined) container.wagonId = null;
     if (dto.position === undefined) container.position = null;
     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> {
@@ -36,9 +81,27 @@ export class ContainersService {
 
   async update(id: string, dto: UpdateContainerDto): Promise<Container> {
     const container = await this.findById(id);
+    if (dto.containerNumber && dto.containerNumber !== container.containerNumber) {
+      const existing = await this.containerRepo.findOne({
+        where: { containerNumber: dto.containerNumber },
+      });
+      if (existing) {
+        throw new ConflictException(`Container number "${dto.containerNumber}" already exists`);
+      }
+    }
+    if (dto.containerTypeId) {
+      const containerType = await this.containerTypeRepo.findOne({
+        where: { id: dto.containerTypeId, isActive: true },
+      });
+      if (!containerType) {
+        throw new NotFoundException(`Container type ${dto.containerTypeId} not found`);
+      }
+    }
+    if (dto.wagonId) {
+      const wagon = await this.wagonRepo.findOne({ where: { id: dto.wagonId } });
+      if (!wagon) throw new NotFoundException(`Wagon ${dto.wagonId} not found`);
+    }
     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 +145,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/payment/payment.controller.ts

@@ -4,11 +4,6 @@ import { Public } from "@edr/api-common";
 import { randomUUID } from "crypto";
 import { Response } from "express"
 
-// import * as fs from 'fs';
-// import * as path from 'path';
-// import Handlebars from 'handlebars';
-
-
 @Public()
 @Controller("payments")
 export class PaymentController {
@@ -63,4 +58,4 @@ export class PaymentController {
     `);
     }
 
-}
+}

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/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/wagon-types/wagon-types.controller.ts

@@ -0,0 +1,16 @@
+import { Controller, Get } from '@nestjs/common';
+import { ApiTags, ApiOperation } from '@nestjs/swagger';
+import { WagonTypesService } from './wagon-types.service';
+import { WagonType } from './entities/wagon-type.entity';
+
+@ApiTags('Wagon Types')
+@Controller('wagon-types')
+export class WagonTypesController {
+  constructor(private readonly wagonTypesService: WagonTypesService) {}
+
+  @Get()
+  @ApiOperation({ summary: 'Get all active wagon types' })
+  async findAll(): Promise<WagonType[]> {
+    return this.wagonTypesService.findAll();
+  }
+}

apps/edr-freight-api/src/modules/wagon-types/wagon-types.module.ts

@@ -2,11 +2,13 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { WagonType } from './entities/wagon-type.entity';
+import { WagonTypesController } from './wagon-types.controller';
 import { WagonTypesRepository } from './wagon-types.repository';
 import { WagonTypesService } from './wagon-types.service';
 
 @Module({
   imports: [TypeOrmModule.forFeature([WagonType])],
+  controllers: [WagonTypesController],
   providers: [WagonTypesRepository, WagonTypesService],
   exports: [WagonTypesRepository, WagonTypesService],
 })

apps/edr-freight-api/src/modules/wagon-types/wagon-types.service.ts

@@ -7,6 +7,13 @@ import { WagonTypesRepository } from './wagon-types.repository';
 export class WagonTypesService {
   constructor(private readonly wagonTypesRepository: WagonTypesRepository) {}
 
+  async findAll(): Promise<WagonType[]> {
+    return this.wagonTypesRepository.findAll({
+      where: { isActive: true },
+      order: { code: 'ASC' },
+    });
+  }
+
   async findByCode(code: string): Promise<WagonType> {
     const [wagonType] = await this.wagonTypesRepository.findAll({ where: { code } });
 

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();
     }
   }
-}
+}