(임수민) GTC 기본계약 코멘트 관련 수정

4 files changed, 20 insertions, 6 deletions

diff --git a/lib/basic-contract/gtc-vendor/clause-table.tsx b/lib/basic-contract/gtc-vendor/clause-table.tsx
index 88b1f45c..3ed19982 100644
--- a/lib/basic-contract/gtc-vendor/clause-table.tsx
+++ b/lib/basic-contract/gtc-vendor/clause-table.tsx
@@ -39,6 +39,7 @@ interface GtcClausesTableProps {
   document: any
   vendorId?: number
   vendorName?: string
+  contractId?: number
 }
 
 export function GtcClausesVendorTable({
@@ -46,7 +47,8 @@ export function GtcClausesVendorTable({
   documentId,
   document,
   vendorId,
-  vendorName
+  vendorName,
+  contractId
 }: GtcClausesTableProps) {
   const [{ data, pageCount }, users, vendorData, vendor] = React.use(promises)
 
@@ -198,6 +200,7 @@ export function GtcClausesVendorTable({
             documentId={documentId}
             document={document}
             vendor={vendor}
+            contractId={contractId}
           />
         </DataTableAdvancedToolbar>
       </DataTable>
diff --git a/lib/basic-contract/gtc-vendor/gtc-clauses-table-toolbar-actions.tsx b/lib/basic-contract/gtc-vendor/gtc-clauses-table-toolbar-actions.tsx
index f0cebe5f..fe4905f7 100644
--- a/lib/basic-contract/gtc-vendor/gtc-clauses-table-toolbar-actions.tsx
+++ b/lib/basic-contract/gtc-vendor/gtc-clauses-table-toolbar-actions.tsx
@@ -45,6 +45,7 @@ interface GtcClausesTableToolbarActionsProps {
   document: any
   currentUserId?: number // 현재 사용자 ID 추가
   vendor:Vendor
+  contractId?: number
 }
 
 // GTC 조항을 위한 Excel 컬럼 정의 (실용적으로 간소화)
@@ -103,7 +104,8 @@ export function GtcClausesTableToolbarActions({
   table,
   documentId,
   document,
-  vendor
+  vendor,
+  contractId
 }: GtcClausesTableToolbarActionsProps) {
   const [showCreateDialog, setShowCreateDialog] = React.useState(false)
   const [showReorderDialog, setShowReorderDialog] = React.useState(false)
@@ -344,6 +346,7 @@ export function GtcClausesTableToolbarActions({
         clauses={previewClauses}
         contractDocument={document}
         vendor={vendor}
+        contractId={contractId}
         onExport={() => {
           console.log("Export from preview dialog")
         }}
diff --git a/lib/basic-contract/gtc-vendor/preview-document-dialog.tsx b/lib/basic-contract/gtc-vendor/preview-document-dialog.tsx
index c017b8be..444bad59 100644
--- a/lib/basic-contract/gtc-vendor/preview-document-dialog.tsx
+++ b/lib/basic-contract/gtc-vendor/preview-document-dialog.tsx
@@ -39,6 +39,7 @@ interface PreviewDocumentDialogProps
   clauses: GtcClauseTreeView[]
   contractDocument: any
   vendor: Vendor
+  contractId?: number
   onExport?: () => void
 }
 
@@ -46,6 +47,7 @@ export function PreviewDocumentDialog({
   clauses, 
   contractDocument,
   vendor,
+  contractId,
   onExport,
   ...props 
 }: PreviewDocumentDialogProps) {
@@ -234,13 +236,18 @@ export function PreviewDocumentDialog({
       return
     }
 
+    if (!contractId) {
+      toast.error("계약 ID를 찾을 수 없습니다. URL에 contractId 파라미터가 필요합니다.")
+      return
+    }
+
     setIsSaving(true)
     
     try {
-      console.log("💾 문서 저장 시작")
+      console.log("💾 문서 저장 시작", { contractId })
       
       const result = await saveGtcDocumentAction({
-        documentId: contractDocument.id,
+        documentId: contractId,
         pdfBuffer: convertedPdf,
         originalFileName: selectedFile.name,
         vendor
diff --git a/lib/basic-contract/service.ts b/lib/basic-contract/service.ts
index 2fcebd59..700c6f8f 100644
--- a/lib/basic-contract/service.ts
+++ b/lib/basic-contract/service.ts
@@ -27,6 +27,7 @@ import {
   gtcClauses, 

   gtcDocuments,

   vendors,

+  vendorContacts,

   gtcNegotiationHistory,

   type GtcVendorClause,

   type GtcClause,

@@ -3582,8 +3583,8 @@ export async function saveGtcDocumentAction({
     // 2. 파일 저장 (공용 파일 저장 함수 사용)

     const saveResult = await saveBuffer({

       buffer: Buffer.from(pdfBuffer),

-      fileName,

-      directory: 'basic-contracts',

+      fileName,      

+      directory: 'basicContract',

       originalName: fileName,

       userId: userId.toString()

     })