Trains management CRUD issues solved

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