(김준회) Revert "(대표님) EDP 작업사항"

태그 가져오기 실패 등 에러로 인한 Revert 처리

1 files changed, 15 insertions, 17 deletions

diff --git a/lib/forms-plant/stat.ts b/lib/forms-plant/stat.ts
index f734e782..f13bab61 100644
--- a/lib/forms-plant/stat.ts
+++ b/lib/forms-plant/stat.ts
@@ -1,7 +1,7 @@
 "use server"
 
 import db from "@/db/db"
-import { vendors, contracts, contractItems, forms,formsPlant,formEntriesPlant, formEntries, formMetas, tags,tagsPlant, tagClasses, tagClassAttributes, projects } from "@/db/schema"
+import { vendors, contracts, contractItems, forms, formEntries, formMetas, tags, tagClasses, tagClassAttributes, projects } from "@/db/schema"
 import { eq, and, inArray } from "drizzle-orm"
 import { getEditableFieldsByTag } from "./services"
 import { getServerSession } from "next-auth/next"
@@ -218,7 +218,7 @@ export async function getVendorFormStatus(projectId?: number): Promise<VendorFor
 
 
 
-export async function getFormStatusByVendor(projectId: number, projectCode: string, packageCode: string, formCode: string): Promise<FormStatusByVendor[]> {
+export async function getFormStatusByVendor(projectId: number, contractItemId: number, formCode: string): Promise<FormStatusByVendor[]> {
   try {
     const session = await getServerSession(authOptions)
     if (!session?.user?.id) {
@@ -244,16 +244,15 @@ export async function getFormStatusByVendor(projectId: number, projectCode: stri
     // 4. contractItem별 forms 조회
     const formsList = await db
       .select({
-        id: formsPlant.id,
-        formCode: formsPlant.formCode,
-        contractItemId: formsPlant.contractItemId
+        id: forms.id,
+        formCode: forms.formCode,
+        contractItemId: forms.contractItemId
       })
-      .from(formsPlant)
+      .from(forms)
       .where(
         and(
-          eq(formsPlant.projectCode, projectCode),
-          eq(formsPlant.packageCode, packageCode),
-          eq(formsPlant.formCode, formCode)
+          eq(forms.contractItemId, contractItemId),
+          eq(forms.formCode, formCode)
         )
       )
 
@@ -262,21 +261,20 @@ export async function getFormStatusByVendor(projectId: number, projectCode: stri
     // 5. formEntries 조회
     const entriesList = await db
       .select({
-        id: formEntriesPlant.id,
-        formCode: formEntriesPlant.formCode,
-        data: formEntriesPlant.data
+        id: formEntries.id,
+        formCode: formEntries.formCode,
+        data: formEntries.data
       })
-      .from(formEntriesPlant)
+      .from(formEntries)
       .where(
         and(
-          eq(formEntriesPlant.packageCode, packageCode),
-          eq(formEntriesPlant.projectCode, projectCode),
-          eq(formEntriesPlant.formCode, formCode)
+          eq(formEntries.contractItemId, contractItemId),
+          eq(formEntries.formCode, formCode)
         )
       )
 
     // 6. TAG별 편집 가능 필드 조회
-    const editableFieldsByTag = await getEditableFieldsByTag(projectCode,packageCode, projectId)
+    const editableFieldsByTag = await getEditableFieldsByTag(contractItemId, projectId)
 
     const vendorStatusList: VendorFormStatus[] = []