로그인 및 미들웨어 처리. 구조 변경

6 files changed, 142 insertions, 96 deletions

diff --git a/lib/equip-class/repository.ts b/lib/equip-class/repository.ts
index ddf98dd2..d4d6d58b 100644
--- a/lib/equip-class/repository.ts
+++ b/lib/equip-class/repository.ts
@@ -1,45 +1,56 @@
 import db from "@/db/db";
+import { projects } from "@/db/schema";
 import { Item, items } from "@/db/schema/items";
 import { tagClasses } from "@/db/schema/vendorData";
 import {
   eq,
-  inArray,
-  not,
   asc,
   desc,
-  and,
-  ilike,
-  gte,
-  lte,
   count,
-  gt,
 } from "drizzle-orm";
 import { PgTransaction } from "drizzle-orm/pg-core";
 
 export async function selectTagClassLists(
-    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(tagClasses)
-      .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;
   }
-  /** 총 개수 count */
-  export async function countTagClassLists(
-    tx: PgTransaction<any, any, any>,
-    where?: any
-  ) {
-    const res = await tx.select({ count: count() }).from(tagClasses).where(where);
-    return res[0]?.count ?? 0;
-  }
\ No newline at end of file
+) {
+  const { where, orderBy, offset = 0, limit = 10 } = params;
+  
+  return tx
+    .select({
+      id: tagClasses.id,
+      projectId: tagClasses.projectId,
+      code: tagClasses.code,
+      label: tagClasses.label,
+      tagTypeCode: tagClasses.tagTypeCode,
+      createdAt: tagClasses.createdAt,
+      updatedAt: tagClasses.updatedAt,
+      // 프로젝트 정보 추가
+      projectCode: projects.code,
+      projectName: projects.name
+    })
+    .from(tagClasses)
+    .innerJoin(projects, eq(tagClasses.projectId, projects.id))
+    .where(where)
+    .orderBy(...(orderBy ?? []))
+    .offset(offset)
+    .limit(limit);
+}
+
+/** 총 개수 count */
+export async function countTagClassLists(
+  tx: PgTransaction<any, any, any>,
+  where?: any
+) {
+  const res = await tx
+    .select({ count: count() })
+    .from(tagClasses)
+    .leftJoin(projects, eq(tagClasses.projectId, projects.id))
+    .where(where);
+  return res[0]?.count ?? 0;
+}
\ No newline at end of file
diff --git a/lib/equip-class/service.ts b/lib/equip-class/service.ts
index c35f4fbe..deaacc58 100644
--- a/lib/equip-class/service.ts
+++ b/lib/equip-class/service.ts
@@ -8,6 +8,7 @@ import { tagClasses } from "@/db/schema/vendorData";
 import { asc, desc, ilike, inArray, and, gte, lte, not, or } from "drizzle-orm";
 import { GetTagClassesSchema } from "./validation";
 import { countTagClassLists, selectTagClassLists } from "./repository";
+import { projects } from "@/db/schema";
 
 export async function getTagClassists(input: GetTagClassesSchema) {
 
@@ -30,7 +31,9 @@ export async function getTagClassists(input: GetTagClassesSchema) {
           let globalWhere
           if (input.search) {
             const s = `%${input.search}%`
-            globalWhere = or(ilike(tagClasses.code, s), ilike(tagClasses.label, s)
+            globalWhere = or(ilike(tagClasses.code, s), ilike(tagClasses.label, s),
+            ilike(projects.name, s),
+            ilike(projects.code, s)
                  )
             // 필요시 여러 칼럼 OR조건 (status, priority, etc)
           }
@@ -49,12 +52,21 @@ export async function getTagClassists(input: GetTagClassesSchema) {
           
   
           const orderBy =
-            input.sort.length > 0
-              ? input.sort.map((item) =>
-                  item.desc ? desc(tagClasses[item.id]) : asc(tagClasses[item.id])
-                )
-              : [asc(tagClasses.createdAt)];
-  
+          input.sort.length > 0
+            ? input.sort.map((item) => {
+                // 프로젝트 관련 필드 정렬 처리
+                if (item.id === 'projectCode') {
+                  return item.desc ? desc(projects.code) : asc(projects.code);
+                } else if (item.id === 'projectName') {
+                  return item.desc ? desc(projects.name) : asc(projects.name);
+                } else {
+                  // 기존 필드 정렬
+                  return item.desc 
+                    ? desc(tagClasses[item.id as keyof typeof tagClasses.$inferSelect]) 
+                    : asc(tagClasses[item.id as keyof typeof tagClasses.$inferSelect]);
+                }
+              })
+            : [asc(tagClasses.createdAt)];
           // 트랜잭션 내부에서 Repository 호출
           const { data, total } = await db.transaction(async (tx) => {
             const data = await selectTagClassLists(tx, {
diff --git a/lib/equip-class/table/equipClass-table-columns.tsx b/lib/equip-class/table/equipClass-table-columns.tsx
index 1255abf3..d149c836 100644
--- a/lib/equip-class/table/equipClass-table-columns.tsx
+++ b/lib/equip-class/table/equipClass-table-columns.tsx
@@ -3,37 +3,28 @@
 import * as React from "react"
 import { type DataTableRowAction } from "@/types/table"
 import { type ColumnDef } from "@tanstack/react-table"
-import { InfoIcon } from "lucide-react"
 
 import { formatDate } from "@/lib/utils"
-import { Button } from "@/components/ui/button"
-import { Checkbox } from "@/components/ui/checkbox"
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/components/ui/tooltip"
 
 import { DataTableColumnHeaderSimple } from "@/components/data-table/data-table-column-simple-header"
-import { TagClasses } from "@/db/schema/vendorData"
 import { equipclassColumnsConfig } from "@/config/equipClassColumnsConfig"
+import { ExtendedTagClasses } from "../validation"
 
 interface GetColumnsProps {
-  setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<TagClasses> | null>>
+  setRowAction: React.Dispatch<React.SetStateAction<DataTableRowAction<ExtendedTagClasses> | null>>
 }
 
 /**
  * tanstack table 컬럼 정의 (중첩 헤더 버전)
  */
-export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagClasses>[] {
+export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<ExtendedTagClasses>[] {
 
 
   // ----------------------------------------------------------------
   // 3) 일반 컬럼들을 "그룹"별로 묶어 중첩 columns 생성
   // ----------------------------------------------------------------
-  // 3-1) groupMap: { [groupName]: ColumnDef<TagClasses>[] }
-  const groupMap: Record<string, ColumnDef<TagClasses>[]> = {}
+  // 3-1) groupMap: { [groupName]: ColumnDef<ExtendedTagClasses>[] }
+  const groupMap: Record<string, ColumnDef<ExtendedTagClasses>[]> = {}
 
   equipclassColumnsConfig.forEach((cfg) => {
     // 만약 group가 없으면 "_noGroup" 처리
@@ -44,7 +35,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagClas
     }
 
     // child column 정의
-    const childCol: ColumnDef<TagClasses> = {
+    const childCol: ColumnDef<ExtendedTagClasses> = {
       accessorKey: cfg.id,
       enableResizing: true,
       header: ({ column }) => (
@@ -72,7 +63,7 @@ export function getColumns({ setRowAction }: GetColumnsProps): ColumnDef<TagClas
   // ----------------------------------------------------------------
   // 3-2) groupMap에서 실제 상위 컬럼(그룹)을 만들기
   // ----------------------------------------------------------------
-  const nestedColumns: ColumnDef<TagClasses>[] = []
+  const nestedColumns: ColumnDef<ExtendedTagClasses>[] = []
 
   // 순서를 고정하고 싶다면 group 순서를 미리 정의하거나 sort해야 함
   // 여기서는 그냥 Object.entries 순서
diff --git a/lib/equip-class/table/equipClass-table-toolbar-actions.tsx b/lib/equip-class/table/equipClass-table-toolbar-actions.tsx
index 5e03d800..03db30a3 100644
--- a/lib/equip-class/table/equipClass-table-toolbar-actions.tsx
+++ b/lib/equip-class/table/equipClass-table-toolbar-actions.tsx
@@ -2,35 +2,66 @@
 
 import * as React from "react"
 import { type Table } from "@tanstack/react-table"
-import { Download, RefreshCcw, Upload } from "lucide-react"
-import { toast } from "sonner"
+import { Download, RefreshCcw } from "lucide-react"
 
 import { exportTableToExcel } from "@/lib/export"
 import { Button } from "@/components/ui/button"
-import { TagClasses } from "@/db/schema/vendorData"
-
-
+import { ExtendedTagClasses } from "../validation"
+import { toast } from "sonner"
 
 interface ItemsTableToolbarActionsProps {
-  table: Table<TagClasses>
+  table: Table<ExtendedTagClasses>
 }
 
 export function EquipClassTableToolbarActions({ table }: ItemsTableToolbarActionsProps) {
-  // 파일 input을 숨기고, 버튼 클릭 시 참조해 클릭하는 방식
-  const fileInputRef = React.useRef<HTMLInputElement>(null)
+  const [isLoading, setIsLoading] = React.useState(false)
+
+  const syncObjectClasses = async () => {
+    try {
+      setIsLoading(true)
 
+      // API 엔드포인트 호출
+      const response = await fetch('/api/cron/object-classes')
 
+      if (!response.ok) {
+        const errorData = await response.json()
+        throw new Error(errorData.error || 'Failed to sync object classes')
+      }
+
+      const data = await response.json()
+
+      // 성공 메시지 표시
+      toast.success(
+        `object classes synced successfully! ${data.result.items} items processed.`
+      )
+
+      // 페이지 새로고침으로 테이블 데이터 업데이트
+      window.location.reload()
+    } catch (error) {
+      console.error('Error syncing object classes:', error)
+      toast.error(
+        error instanceof Error
+          ? error.message
+          : 'An error occurred while syncing object classes'
+      )
+    } finally {
+      setIsLoading(false)
+    }
+  }
 
   return (
     <div className="flex items-center gap-2">
-      {/** 4) Export 버튼 */}
       <Button
         variant="samsung"
         size="sm"
         className="gap-2"
+        onClick={syncObjectClasses}
+        disabled={isLoading}
       >
-        <RefreshCcw className="size-4" aria-hidden="true" />
-        <span className="hidden sm:inline">Get Equip Class</span>
+        <RefreshCcw className={`size-4 ${isLoading ? 'animate-spin' : ''}`} aria-hidden="true" />
+        <span className="hidden sm:inline">
+          {isLoading ? 'Syncing...' : 'Get Equip Class'}
+        </span>
       </Button>
 
       {/** 4) Export 버튼 */}
@@ -39,7 +70,7 @@ export function EquipClassTableToolbarActions({ table }: ItemsTableToolbarAction
         size="sm"
         onClick={() =>
           exportTableToExcel(table, {
-            filename: "tasks",
+            filename: "Equip Class",
             excludeColumns: ["select", "actions"],
           })
         }
diff --git a/lib/equip-class/table/equipClass-table.tsx b/lib/equip-class/table/equipClass-table.tsx
index 56fd42aa..658718a6 100644
--- a/lib/equip-class/table/equipClass-table.tsx
+++ b/lib/equip-class/table/equipClass-table.tsx
@@ -12,10 +12,10 @@ import { DataTable } from "@/components/data-table/data-table"
 import { DataTableAdvancedToolbar } from "@/components/data-table/data-table-advanced-toolbar"
 import { useFeatureFlags } from "./feature-flags-provider"
 
-import { TagClasses } from "@/db/schema/vendorData"
 import { getTagClassists } from "../service"
 import { EquipClassTableToolbarActions } from "./equipClass-table-toolbar-actions"
 import { getColumns } from "./equipClass-table-columns"
+import { ExtendedTagClasses } from "../validation"
 
 interface ItemsTableProps {
   promises: Promise<
@@ -31,11 +31,8 @@ export function EquipClassTable({ promises }: ItemsTableProps) {
   const [{ data, pageCount }] =
     React.use(promises)
 
-
-console.log(data)
-
   const [rowAction, setRowAction] =
-    React.useState<DataTableRowAction<TagClasses> | null>(null)
+    React.useState<DataTableRowAction<ExtendedTagClasses> | null>(null)
 
   const columns = React.useMemo(
     () => getColumns({ setRowAction }),
@@ -53,7 +50,7 @@ console.log(data)
    * @prop {React.ReactNode} [icon] - An optional icon to display next to the label.
    * @prop {boolean} [withCount] - An optional boolean to display the count of the filter option.
    */
-  const filterFields: DataTableFilterField<TagClasses>[] = [
+  const filterFields: DataTableFilterField<ExtendedTagClasses>[] = [
 
   ]
 
@@ -67,7 +64,7 @@ console.log(data)
    * 3. Used with DataTableAdvancedToolbar: Enables a more sophisticated filtering UI.
    * 4. Date and boolean types: Adds support for filtering by date ranges and boolean values.
    */
-  const advancedFilterFields: DataTableAdvancedFilterField<TagClasses>[] = [
+  const advancedFilterFields: DataTableAdvancedFilterField<ExtendedTagClasses>[] = [
     {
       id: "code",
       label: "Code",
@@ -125,9 +122,7 @@ console.log(data)
         >
           <EquipClassTableToolbarActions table={table} />
         </DataTableAdvancedToolbar>
-
       </DataTable>
-
     </>
   )
 }
diff --git a/lib/equip-class/validation.ts b/lib/equip-class/validation.ts
index 48698ac4..3f62fb0f 100644
--- a/lib/equip-class/validation.ts
+++ b/lib/equip-class/validation.ts
@@ -8,27 +8,33 @@ import {
 import * as z from "zod"
 
 import { getFiltersStateParser, getSortingStateParser } from "@/lib/parsers"
-import { TagClasses } from "@/db/schema/vendorData";
+import { tagClasses } from "@/db/schema/vendorData";
 
-export const searchParamsCache = createSearchParamsCache({
-    flags: parseAsArrayOf(z.enum(["advancedTable", "floatingBar"])).withDefault(
-        []
-    ),
-    page: parseAsInteger.withDefault(1),
-    perPage: parseAsInteger.withDefault(10),
-    sort: getSortingStateParser<TagClasses>().withDefault([
-        { id: "createdAt", desc: true },
-    ]),
-    code: parseAsString.withDefault(""),
-    label: parseAsString.withDefault(""),
- 
-    // advanced filter
-    filters: getFiltersStateParser().withDefault([]),
-    joinOperator: parseAsStringEnum(["and", "or"]).withDefault("and"),
-    search: parseAsString.withDefault(""),
-
-})
+export type ExtendedTagClasses = typeof tagClasses.$inferSelect & {
+  projectCode: string;
+  projectName: string;
+};
 
+// 검색 파라미터 캐시 정의
+export const searchParamsCache = createSearchParamsCache({
+  flags: parseAsArrayOf(z.enum(["advancedTable", "floatingBar"])).withDefault([]),
+  page: parseAsInteger.withDefault(1),
+  perPage: parseAsInteger.withDefault(10),
+  
+  // 확장된 타입으로 정렬 파서 사용
+  sort: getSortingStateParser<ExtendedTagClasses>().withDefault([
+    { id: "createdAt", desc: true },
+  ]),
 
+  // 기존 필터 옵션들
+  code: parseAsString.withDefault(""),
+  label: parseAsString.withDefault(""),
+  
+  // 고급 필터
+  filters: getFiltersStateParser().withDefault([]),
+  joinOperator: parseAsStringEnum(["and", "or"]).withDefault("and"),
+  search: parseAsString.withDefault(""),
+});
 
-export type GetTagClassesSchema = Awaited<ReturnType<typeof searchParamsCache.parse>>
+// 타입 내보내기
+export type GetTagClassesSchema = Awaited<ReturnType<typeof searchParamsCache.parse>>;