260318:0931 Fix UUID and UTF

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

@@ -35,13 +35,17 @@ import { RequirePermission } from '../../common/decorators/require-permission.de
 import { Audit } from '../../common/decorators/audit.decorator';
 import { ParseUuidPipe } from '../../common/pipes/parse-uuid.pipe';
 import { User } from '../user/entities/user.entity';
+import { ProjectService } from '../project/project.service';
 
 @ApiTags('Drawings - AS Built')
 @ApiBearerAuth()
 @UseGuards(JwtAuthGuard, RbacGuard)
 @Controller('drawings/asbuilt')
 export class AsBuiltDrawingController {
-  constructor(private readonly asBuiltDrawingService: AsBuiltDrawingService) {}
+  constructor(
+    private readonly asBuiltDrawingService: AsBuiltDrawingService,
+    private readonly projectService: ProjectService
+  ) {}
 
   @Post()
   @ApiOperation({ summary: 'Create new AS Built Drawing' })
@@ -74,6 +78,10 @@ export class AsBuiltDrawingController {
   @ApiResponse({ status: 200, description: 'List of AS Built Drawings' })
   @RequirePermission('drawing.view')
   async findAll(@Query() searchDto: SearchAsBuiltDrawingDto) {
+    const project = await this.projectService.findOneByUuid(
+      searchDto.projectUuid
+    );
+    searchDto.projectId = project.id;
     return this.asBuiltDrawingService.findAll(searchDto);
   }
 

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

@@ -22,6 +22,7 @@ import { RequirePermission } from '../../common/decorators/require-permission.de
 import { ParseUuidPipe } from '../../common/pipes/parse-uuid.pipe';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { User } from '../user/entities/user.entity';
+import { ProjectService } from '../project/project.service';
 
 @ApiTags('Contract Drawings')
 @ApiBearerAuth()
@@ -29,7 +30,8 @@ import { User } from '../user/entities/user.entity';
 @Controller('drawings/contract')
 export class ContractDrawingController {
   constructor(
-    private readonly contractDrawingService: ContractDrawingService
+    private readonly contractDrawingService: ContractDrawingService,
+    private readonly projectService: ProjectService
   ) {}
 
   // Force rebuild for DTO changes
@@ -47,7 +49,11 @@ export class ContractDrawingController {
   @Get()
   @ApiOperation({ summary: 'Search Contract Drawings' })
   @RequirePermission('document.view') // สิทธิ์ ID 31: ดูเอกสารทั่วไป
-  findAll(@Query() searchDto: SearchContractDrawingDto) {
+  async findAll(@Query() searchDto: SearchContractDrawingDto) {
+    const project = await this.projectService.findOneByUuid(
+      searchDto.projectUuid
+    );
+    searchDto.projectId = project.id;
     return this.contractDrawingService.findAll(searchDto);
   }
 

backend/src/modules/drawing/drawing.module.ts

@@ -37,6 +37,7 @@ import { DrawingMasterDataController } from './drawing-master-data.controller';
 // Modules
 import { FileStorageModule } from '../../common/file-storage/file-storage.module';
 import { UserModule } from '../user/user.module';
+import { ProjectModule } from '../project/project.module';
 
 @Module({
   imports: [
@@ -62,6 +63,7 @@ import { UserModule } from '../user/user.module';
     ]),
     FileStorageModule,
     UserModule,
+    ProjectModule,
   ],
   providers: [
     ShopDrawingService,

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

@@ -1,4 +1,4 @@
-import { IsNumber, IsOptional, IsString, Min } from 'class-validator';
+import { IsNumber, IsOptional, IsString, IsUUID, Min } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Type } from 'class-transformer';
 
@@ -6,10 +6,15 @@ import { Type } from 'class-transformer';
  * DTO for searching/filtering AS Built Drawings
  */
 export class SearchAsBuiltDrawingDto {
-  @ApiProperty({ description: 'Project ID' })
+  @ApiProperty({ description: 'Project UUID' })
+  @IsUUID()
+  projectUuid!: string;
+
+  @ApiPropertyOptional({ description: 'Project ID (resolved internally)' })
   @Type(() => Number)
   @IsNumber()
-  projectId!: number;
+  @IsOptional()
+  projectId?: number;
 
   @ApiPropertyOptional({ description: 'Filter by Main Category ID' })
   @Type(() => Number)

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

@@ -1,11 +1,14 @@
-import { IsInt, IsOptional, IsString, IsNotEmpty } from 'class-validator';
+import { IsInt, IsOptional, IsString, IsUUID } from 'class-validator';
 import { Type } from 'class-transformer';
 
 export class SearchContractDrawingDto {
+  @IsUUID()
+  projectUuid!: string;
+
+  @IsOptional()
   @IsInt()
   @Type(() => Number)
-  @IsNotEmpty()
-  projectId!: number; // จำเป็น: ใส่ !
+  projectId?: number;
 
   @IsOptional()
   @IsInt()

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

@@ -1,10 +1,14 @@
-import { IsInt, IsOptional, IsString } from 'class-validator';
+import { IsInt, IsOptional, IsString, IsUUID } from 'class-validator';
 import { Type } from 'class-transformer';
 
 export class SearchShopDrawingDto {
+  @IsUUID()
+  projectUuid!: string;
+
+  @IsOptional()
   @IsInt()
   @Type(() => Number)
-  projectId!: number; // จำเป็น: ใส่ !
+  projectId?: number;
 
   @IsOptional()
   @IsInt()

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

@@ -21,13 +21,17 @@ import { ParseUuidPipe } from '../../common/pipes/parse-uuid.pipe';
 import { CurrentUser } from '../../common/decorators/current-user.decorator';
 import { User } from '../user/entities/user.entity';
 import { Audit } from '../../common/decorators/audit.decorator'; // Import
+import { ProjectService } from '../project/project.service';
 
 @ApiTags('Shop Drawings')
 @ApiBearerAuth()
 @UseGuards(JwtAuthGuard, RbacGuard)
 @Controller('drawings/shop')
 export class ShopDrawingController {
-  constructor(private readonly shopDrawingService: ShopDrawingService) {}
+  constructor(
+    private readonly shopDrawingService: ShopDrawingService,
+    private readonly projectService: ProjectService
+  ) {}
 
   @Post()
   @ApiOperation({ summary: 'Create new Shop Drawing with initial revision' })
@@ -40,7 +44,11 @@ export class ShopDrawingController {
   @Get()
   @ApiOperation({ summary: 'Search Shop Drawings' })
   @RequirePermission('drawing.view')
-  findAll(@Query() searchDto: SearchShopDrawingDto) {
+  async findAll(@Query() searchDto: SearchShopDrawingDto) {
+    const project = await this.projectService.findOneByUuid(
+      searchDto.projectUuid
+    );
+    searchDto.projectId = project.id;
     return this.shopDrawingService.findAll(searchDto);
   }