251208:1625 Frontend: to be complete admin panel, Backend: tobe recheck all task

backend/src/modules/drawing/contract-drawing.controller.ts

@@ -29,15 +29,17 @@ import { User } from '../user/entities/user.entity';
 @Controller('drawings/contract')
 export class ContractDrawingController {
   constructor(
-    private readonly contractDrawingService: ContractDrawingService,
+    private readonly contractDrawingService: ContractDrawingService
   ) {}
 
+  // Force rebuild for DTO changes
+
   @Post()
   @ApiOperation({ summary: 'Create new Contract Drawing' })
   @RequirePermission('drawing.create') // สิทธิ์ ID 39: สร้าง/แก้ไขข้อมูลแบบ
   create(
     @Body() createDto: CreateContractDrawingDto,
-    @CurrentUser() user: User,
+    @CurrentUser() user: User
   ) {
     return this.contractDrawingService.create(createDto, user);
   }
@@ -62,7 +64,7 @@ export class ContractDrawingController {
   update(
     @Param('id', ParseIntPipe) id: number,
     @Body() updateDto: UpdateContractDrawingDto,
-    @CurrentUser() user: User,
+    @CurrentUser() user: User
   ) {
     return this.contractDrawingService.update(id, updateDto, user);
   }

backend/src/modules/drawing/contract-drawing.service.ts

@@ -31,7 +31,7 @@ export class ContractDrawingService {
     @InjectRepository(Attachment)
     private attachmentRepo: Repository<Attachment>,
     private fileStorageService: FileStorageService,
-    private dataSource: DataSource,
+    private dataSource: DataSource
   ) {}
 
   /**
@@ -51,7 +51,7 @@ export class ContractDrawingService {
 
     if (exists) {
       throw new ConflictException(
-        `Contract Drawing No. "${createDto.contractDrawingNo}" already exists in this project.`,
+        `Contract Drawing No. "${createDto.contractDrawingNo}" already exists in this project.`
       );
     }
 
@@ -85,7 +85,7 @@ export class ContractDrawingService {
       if (createDto.attachmentIds?.length) {
         // ✅ FIX TS2345: แปลง number[] เป็น string[] ก่อนส่ง
         await this.fileStorageService.commit(
-          createDto.attachmentIds.map(String),
+          createDto.attachmentIds.map(String)
         );
       }
 
@@ -95,7 +95,7 @@ export class ContractDrawingService {
       await queryRunner.rollbackTransaction();
       // ✅ FIX TS18046: Cast err เป็น Error
       this.logger.error(
-        `Failed to create contract drawing: ${(err as Error).message}`,
+        `Failed to create contract drawing: ${(err as Error).message}`
       );
       throw err;
     } finally {
@@ -114,7 +114,7 @@ export class ContractDrawingService {
       subCategoryId,
       search,
       page = 1,
-      pageSize = 20,
+      limit = 20,
     } = searchDto;
 
     const query = this.drawingRepo
@@ -143,14 +143,14 @@ export class ContractDrawingService {
           qb.where('drawing.contractDrawingNo LIKE :search', {
             search: `%${search}%`,
           }).orWhere('drawing.title LIKE :search', { search: `%${search}%` });
-        }),
+        })
       );
     }
 
     query.orderBy('drawing.contractDrawingNo', 'ASC');
 
-    const skip = (page - 1) * pageSize;
-    query.skip(skip).take(pageSize);
+    const skip = (page - 1) * limit;
+    query.skip(skip).take(limit);
 
     const [items, total] = await query.getManyAndCount();
 
@@ -159,8 +159,8 @@ export class ContractDrawingService {
       meta: {
         total,
         page,
-        pageSize,
-        totalPages: Math.ceil(total / pageSize),
+        limit,
+        totalPages: Math.ceil(total / limit),
       },
     };
   }
@@ -213,7 +213,7 @@ export class ContractDrawingService {
         // Commit new files
         // ✅ FIX TS2345: แปลง number[] เป็น string[] ก่อนส่ง
         await this.fileStorageService.commit(
-          updateDto.attachmentIds.map(String),
+          updateDto.attachmentIds.map(String)
         );
       }
 
@@ -225,7 +225,7 @@ export class ContractDrawingService {
       await queryRunner.rollbackTransaction();
       // ✅ FIX TS18046: Cast err เป็น Error (Optional: Added logger here too for consistency)
       this.logger.error(
-        `Failed to update contract drawing: ${(err as Error).message}`,
+        `Failed to update contract drawing: ${(err as Error).message}`
       );
       throw err;
     } finally {

backend/src/modules/drawing/dto/search-contract-drawing.dto.ts

@@ -29,5 +29,9 @@ export class SearchContractDrawingDto {
   @IsOptional()
   @IsInt()
   @Type(() => Number)
-  pageSize: number = 20; // มีค่า Default ไม่ต้องใส่ ! หรือ ?
+  limit: number = 20;
+
+  @IsOptional()
+  @IsString()
+  type?: string;
 }

backend/src/modules/drawing/dto/search-shop-drawing.dto.ts

@@ -28,5 +28,5 @@ export class SearchShopDrawingDto {
   @IsOptional()
   @IsInt()
   @Type(() => Number)
-  pageSize: number = 20; // มีค่า Default
+  limit: number = 20; // มีค่า Default
 }

backend/src/modules/drawing/shop-drawing.service.ts

@@ -208,10 +208,10 @@ export class ShopDrawingService {
     const {
       projectId,
       mainCategoryId,
-      subCategoryId,
+      // subCategoryId, // Unused
       search,
       page = 1,
-      pageSize = 20,
+      limit = 20,
     } = searchDto;
 
     const query = this.shopDrawingRepo
@@ -225,10 +225,6 @@ export class ShopDrawingService {
       query.andWhere('sd.mainCategoryId = :mainCategoryId', { mainCategoryId });
     }
 
-    if (subCategoryId) {
-      query.andWhere('sd.subCategoryId = :subCategoryId', { subCategoryId });
-    }
-
     if (search) {
       query.andWhere(
         new Brackets((qb) => {
@@ -241,8 +237,8 @@ export class ShopDrawingService {
 
     query.orderBy('sd.updatedAt', 'DESC');
 
-    const skip = (page - 1) * pageSize;
-    query.skip(skip).take(pageSize);
+    const skip = (page - 1) * limit;
+    query.skip(skip).take(limit);
 
     const [items, total] = await query.getManyAndCount();
 
@@ -262,8 +258,8 @@ export class ShopDrawingService {
       meta: {
         total,
         page,
-        pageSize,
-        totalPages: Math.ceil(total / pageSize),
+        limit,
+        totalPages: Math.ceil(total / limit),
       },
     };
   }