1 files changed, 38 insertions, 20 deletions

diff --git a/lib/form-list/repository.ts b/lib/form-list/repository.ts
index ced320db..d3c555bf 100644
--- a/lib/form-list/repository.ts
+++ b/lib/form-list/repository.ts
@@ -1,4 +1,5 @@
 import db from "@/db/db";
+import { projects } from "@/db/schema";
 import { Item, items } from "@/db/schema/items";
 import { tagTypeClassFormMappings } from "@/db/schema/vendorData";
 import {
@@ -17,30 +18,47 @@ import {
 import { PgTransaction } from "drizzle-orm/pg-core";
 
 export async function selectFormLists(
-    tx: PgTransaction<any, any, any>,
-    params: {
-      where?: any; // drizzle-orm의 조건식 (and, eq...) 등
-      orderBy?: (ReturnType<typeof asc> | ReturnType<typeof desc>)[];
-      offset?: number;
-      limit?: number;
-    }
-  ) {
-    const { where, orderBy, offset = 0, limit = 10 } = params;
-  
-    return tx
-      .select()
-      .from(tagTypeClassFormMappings)
-      .where(where)
-      .orderBy(...(orderBy ?? []))
-      .offset(offset)
-      .limit(limit);
+  tx: PgTransaction<any, any, any>,
+  params: {
+    where?: any;
+    orderBy?: (ReturnType<typeof asc> | ReturnType<typeof desc>)[];
+    offset?: number;
+    limit?: number;
   }
+) {
+  const { where, orderBy, offset = 0, limit = 10 } = params;
+  
+  return tx
+    .select({
+      id: tagTypeClassFormMappings.id,
+      projectId: tagTypeClassFormMappings.projectId,
+      tagTypeLabel: tagTypeClassFormMappings.tagTypeLabel,
+      classLabel: tagTypeClassFormMappings.classLabel,
+      formCode: tagTypeClassFormMappings.formCode,
+      formName: tagTypeClassFormMappings.formName,
+      createdAt: tagTypeClassFormMappings.createdAt,
+      updatedAt: tagTypeClassFormMappings.updatedAt,
+      // 프로젝트 정보 추가
+      projectCode: projects.code,
+      projectName: projects.name
+    })
+    .from(tagTypeClassFormMappings)
+    .innerJoin(projects, eq(tagTypeClassFormMappings.projectId, projects.id))
+    .where(where)
+    .orderBy(...(orderBy ?? []))
+    .offset(offset)
+    .limit(limit);
+}
+
   /** 총 개수 count */
   export async function countFormLists(
     tx: PgTransaction<any, any, any>,
     where?: any
   ) {
-    const res = await tx.select({ count: count() }).from(tagTypeClassFormMappings).where(where);
+    const res = await tx
+      .select({ count: count() })
+      .from(tagTypeClassFormMappings)
+      .leftJoin(projects, eq(tagTypeClassFormMappings.projectId, projects.id))
+      .where(where);
     return res[0]?.count ?? 0;
-  }
-  
\ No newline at end of file
+  }
\ No newline at end of file