260330:1424 Addied correspondence_revieion_attcahments table table #03

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
-    contractId: undefined,
+    // [FIX v1.8.1] correspondences ไม่มี contract_id โดยตรง → จะ auto-populate จาก discipline useEffect หรือจาก object contract เองในกรณี mock/test
+    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 {