260318:1237 Fix UUID #4

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

@@ -13,6 +13,7 @@ import { AsBuiltDrawingRevision } from './entities/asbuilt-drawing-revision.enti
 import { ShopDrawingRevision } from './entities/shop-drawing-revision.entity';
 import { Attachment } from '../../common/file-storage/entities/attachment.entity';
 import { User } from '../user/entities/user.entity';
+import { Project } from '../project/entities/project.entity';
 
 // DTOs
 import { CreateAsBuiltDrawingDto } from './dto/create-asbuilt-drawing.dto';
@@ -39,6 +40,22 @@ export class AsBuiltDrawingService {
     private dataSource: DataSource
   ) {}
 
+  /**
+   * ADR-019: Resolve projectId (INT or UUID string) to internal INT ID
+   */
+  private async resolveProjectId(projectId: number | string): Promise<number> {
+    if (typeof projectId === 'number') return projectId;
+    const num = Number(projectId);
+    if (!isNaN(num)) return num;
+    const project = await this.dataSource.manager.findOne(Project, {
+      where: { uuid: projectId },
+      select: ['id'],
+    });
+    if (!project)
+      throw new NotFoundException(`Project with UUID ${projectId} not found`);
+    return project.id;
+  }
+
   /**
    * สร้าง AS Built Drawing ใหม่ พร้อม Revision แรก (Rev 0)
    */
@@ -73,9 +90,14 @@ export class AsBuiltDrawingService {
         });
       }
 
+      // ADR-019: Resolve UUID→INT
+      const internalProjectId = await this.resolveProjectId(
+        createDto.projectId
+      );
+
       // 3. Create Master AS Built Drawing
       const asBuiltDrawing = queryRunner.manager.create(AsBuiltDrawing, {
-        projectId: createDto.projectId,
+        projectId: internalProjectId,
         drawingNumber: createDto.drawingNumber,
         mainCategoryId: createDto.mainCategoryId,
         subCategoryId: createDto.subCategoryId,

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

@@ -12,6 +12,7 @@ import { ContractDrawing } from './entities/contract-drawing.entity';
 import { Attachment } from '../../common/file-storage/entities/attachment.entity';
 import { User } from '../user/entities/user.entity';
 import { Contract } from '../contract/entities/contract.entity';
+import { Project } from '../project/entities/project.entity';
 
 // DTOs
 import { CreateContractDrawingDto } from './dto/create-contract-drawing.dto';
@@ -36,6 +37,22 @@ export class ContractDrawingService {
     private dataSource: DataSource
   ) {}
 
+  /**
+   * ADR-019: Resolve projectId (INT or UUID string) to internal INT ID
+   */
+  private async resolveProjectId(projectId: number | string): Promise<number> {
+    if (typeof projectId === 'number') return projectId;
+    const num = Number(projectId);
+    if (!isNaN(num)) return num;
+    const project = await this.dataSource.manager.findOne(Project, {
+      where: { uuid: projectId },
+      select: ['id'],
+    });
+    if (!project)
+      throw new NotFoundException(`Project with UUID ${projectId} not found`);
+    return project.id;
+  }
+
   /**
    * Resolve issueDate from contract.startDate for file storage path
    * Fallback: contract.startDate → current date
@@ -54,10 +71,13 @@ export class ContractDrawingService {
    * - ผูกไฟล์แนบและ Commit ไฟล์จาก Temp -> Permanent
    */
   async create(createDto: CreateContractDrawingDto, user: User) {
+    // ADR-019: Resolve UUID→INT for projectId
+    const internalProjectId = await this.resolveProjectId(createDto.projectId);
+
     // 1. ตรวจสอบเลขที่แบบซ้ำ (Unique per Project)
     const exists = await this.drawingRepo.findOne({
       where: {
-        projectId: createDto.projectId,
+        projectId: internalProjectId,
         contractDrawingNo: createDto.contractDrawingNo,
       },
     });
@@ -83,7 +103,7 @@ export class ContractDrawingService {
 
       // 3. สร้าง Entity
       const drawing = queryRunner.manager.create(ContractDrawing, {
-        projectId: createDto.projectId,
+        projectId: internalProjectId,
         contractDrawingNo: createDto.contractDrawingNo,
         title: createDto.title,
         mapCatId: createDto.mapCatId, // Updated
@@ -98,9 +118,8 @@ export class ContractDrawingService {
       // 4. Commit Files (ย้ายไฟล์จริง)
       if (createDto.attachmentIds?.length) {
         // ✅ FIX TS2345: แปลง number[] เป็น string[] ก่อนส่ง
-        const issueDate = await this.resolveIssueDateByProject(
-          createDto.projectId
-        );
+        const issueDate =
+          await this.resolveIssueDateByProject(internalProjectId);
         await this.fileStorageService.commit(
           createDto.attachmentIds.map(String),
           { issueDate, documentType: 'ContractDrawing' }

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

@@ -13,6 +13,7 @@ import { ShopDrawingRevision } from './entities/shop-drawing-revision.entity';
 import { ContractDrawing } from './entities/contract-drawing.entity';
 import { Attachment } from '../../common/file-storage/entities/attachment.entity';
 import { User } from '../user/entities/user.entity';
+import { Project } from '../project/entities/project.entity';
 
 // DTOs
 import { CreateShopDrawingDto } from './dto/create-shop-drawing.dto';
@@ -39,6 +40,22 @@ export class ShopDrawingService {
     private dataSource: DataSource
   ) {}
 
+  /**
+   * ADR-019: Resolve projectId (INT or UUID string) to internal INT ID
+   */
+  private async resolveProjectId(projectId: number | string): Promise<number> {
+    if (typeof projectId === 'number') return projectId;
+    const num = Number(projectId);
+    if (!isNaN(num)) return num;
+    const project = await this.dataSource.manager.findOne(Project, {
+      where: { uuid: projectId },
+      select: ['id'],
+    });
+    if (!project)
+      throw new NotFoundException(`Project with UUID ${projectId} not found`);
+    return project.id;
+  }
+
   /**
    * สร้าง Shop Drawing ใหม่ พร้อม Revision แรก (Rev 0)
    */
@@ -73,9 +90,14 @@ export class ShopDrawingService {
         });
       }
 
+      // ADR-019: Resolve UUID→INT
+      const internalProjectId = await this.resolveProjectId(
+        createDto.projectId
+      );
+
       // 3. Create Master Shop Drawing
       const shopDrawing = queryRunner.manager.create(ShopDrawing, {
-        projectId: createDto.projectId,
+        projectId: internalProjectId,
         drawingNumber: createDto.drawingNumber,
         mainCategoryId: createDto.mainCategoryId,
         subCategoryId: createDto.subCategoryId,