260330:1424 Addied correspondence_revieion_attcahments table table #03

backend/src/.jest-cache/perf-cache-51fed4c0665a260afb7eef9c4f4e1366-da39a3ee5e6b4b0d3255bfef95601890

@@ -1 +1 @@
-{"D:\\nap-dms.lcbp3\\backend\\src\\modules\\document-numbering\\document-numbering.service.spec.ts":[1,852],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\correspondence.service.spec.ts":[1,1935],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\correspondence.controller.spec.ts":[1,2180],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\migration\\migration.service.spec.ts":[1,628],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\due-date-reminder.service.spec.ts":[1,1141],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\migration\\migration.controller.spec.ts":[1,1507],"D:\\nap-dms.lcbp3\\backend\\src\\common\\pipes\\parse-uuid.pipe.spec.ts":[1,1043],"D:\\nap-dms.lcbp3\\backend\\src\\common\\services\\uuid-resolver.service.spec.ts":[1,2018],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\workflow-engine\\workflow-engine.service.spec.ts":[1,2079],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\user\\user.service.spec.ts":[1,2089],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\casl\\ability.factory.spec.ts":[1,2135],"D:\\nap-dms.lcbp3\\backend\\src\\common\\file-storage\\file-storage.service.spec.ts":[1,2194],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\project\\project.service.spec.ts":[1,1198],"D:\\nap-dms.lcbp3\\backend\\src\\common\\entities\\uuid-base.entity.spec.ts":[1,267],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\workflow-engine\\dsl\\parser.service.spec.ts":[1,2354],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\auth.service.spec.ts":[1,2520],"D:\\nap-dms.lcbp3\\backend\\src\\app.controller.spec.ts":[1,362],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\document-numbering\\services\\manual-override.service.spec.ts":[1,566],"D:\\nap-dms.lcbp3\\backend\\src\\common\\file-storage\\file-storage.controller.spec.ts":[1,1091],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\project\\project.controller.spec.ts":[1,1249],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\auth.controller.spec.ts":[1,1564],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\json-schema\\json-schema.controller.spec.ts":[1,1508]}
+{"D:\\nap-dms.lcbp3\\backend\\src\\modules\\document-numbering\\document-numbering.service.spec.ts":[1,852],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\correspondence.service.spec.ts":[1,2248],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\correspondence.controller.spec.ts":[1,2610],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\migration\\migration.service.spec.ts":[1,628],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\correspondence\\due-date-reminder.service.spec.ts":[1,1141],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\migration\\migration.controller.spec.ts":[1,1507],"D:\\nap-dms.lcbp3\\backend\\src\\common\\pipes\\parse-uuid.pipe.spec.ts":[1,1043],"D:\\nap-dms.lcbp3\\backend\\src\\common\\services\\uuid-resolver.service.spec.ts":[1,2018],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\workflow-engine\\workflow-engine.service.spec.ts":[1,2079],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\user\\user.service.spec.ts":[1,2089],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\casl\\ability.factory.spec.ts":[1,2135],"D:\\nap-dms.lcbp3\\backend\\src\\common\\file-storage\\file-storage.service.spec.ts":[1,2194],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\project\\project.service.spec.ts":[1,1198],"D:\\nap-dms.lcbp3\\backend\\src\\common\\entities\\uuid-base.entity.spec.ts":[1,267],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\workflow-engine\\dsl\\parser.service.spec.ts":[1,2354],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\auth.service.spec.ts":[1,2520],"D:\\nap-dms.lcbp3\\backend\\src\\app.controller.spec.ts":[1,362],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\document-numbering\\services\\manual-override.service.spec.ts":[1,566],"D:\\nap-dms.lcbp3\\backend\\src\\common\\file-storage\\file-storage.controller.spec.ts":[1,1091],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\project\\project.controller.spec.ts":[1,1249],"D:\\nap-dms.lcbp3\\backend\\src\\common\\auth\\auth.controller.spec.ts":[1,1564],"D:\\nap-dms.lcbp3\\backend\\src\\modules\\json-schema\\json-schema.controller.spec.ts":[1,1508]}

backend/src/modules/correspondence/correspondence.service.ts

@@ -499,6 +499,8 @@ export class CorrespondenceService {
         'originator',
         'recipients',
         'recipients.recipientOrganization', // [v1.5.1] Fixed relation name
+        'discipline',
+        'discipline.contract',
       ],
     });
 
@@ -521,6 +523,8 @@ export class CorrespondenceService {
         'originator',
         'recipients',
         'recipients.recipientOrganization',
+        'discipline',
+        'discipline.contract',
       ],
     });
 

frontend/components/correspondences/form.tsx

@@ -176,8 +176,11 @@ export function CorrespondenceForm({
     projectId:
       normalizePublicId(initialData?.project?.publicId) ??
       normalizePublicId(initialData?.projectId),
-    // [FIX v1.8.1] correspondences ไม่มี contract_id โดยตรง → จะ auto-populate จาก discipline useEffect
+    // [FIX v1.8.1] correspondences ไม่มี contract_id โดยตรง → จะ auto-populate จาก discipline useEffect หรือจาก object contract เองในกรณี mock/test
-    contractId: undefined,
+    contractId:
+      normalizePublicId(initialData?.contract?.publicId) ??
+      normalizePublicId(initialData?.discipline?.contract?.publicId) ??
+      normalizePublicId((initialData as Record<string, unknown>)?.contractId as string),
     documentTypeId: initialData?.correspondenceTypeId || undefined,
     disciplineId: initialData?.disciplineId || undefined,
     subject: currentRev?.subject || currentRev?.title || '',

frontend/types/correspondence.ts

@@ -65,6 +65,7 @@ export interface Correspondence {
   projectId: number;
   originatorId?: number;
   correspondenceTypeId: number;
+  disciplineId?: number;
   isInternal: boolean;
   createdAt: string;
 
@@ -79,6 +80,14 @@ export interface Correspondence {
     recipientType: 'TO' | 'CC';
     recipientOrganization?: Organization;
   }[];
+  contract?: { publicId: string; contractName: string; contractCode: string };
+  discipline?: {
+    id: number;
+    disciplineCode: string;
+    codeNameEn?: string;
+    codeNameTh?: string;
+    contract?: { publicId: string; contractName: string; contractCode: string };
+  };
 }
 
 export interface CreateCorrespondenceDto {