(대표님) 20250619 1844 KST 작업사항

7 files changed, 724 insertions, 0 deletions

diff --git a/lib/incoterms/service.ts b/lib/incoterms/service.ts
new file mode 100644
index 00000000..116b7f1c
--- /dev/null
+++ b/lib/incoterms/service.ts
@@ -0,0 +1,149 @@
+"use server";
+import db from "@/db/db";
+import { incoterms } from "@/db/schema/procurementRFQ";
+import { GetIncotermsSchema } from "@/lib/incoterms/validations";
+import { filterColumns } from "@/lib/filter-columns";
+import { asc, desc, ilike, and, or, count, eq } from "drizzle-orm";
+
+// Incoterms CRUD
+export async function getIncoterms(input: GetIncotermsSchema) {
+  try {
+    const offset = (input.page - 1) * input.perPage;
+
+    // 1. where 절
+    let advancedWhere;
+    try {
+      advancedWhere = filterColumns({
+        table: incoterms,
+        filters: input.filters,
+        joinOperator: input.joinOperator,
+      });
+    } catch (whereErr) {
+      console.error("Error building advanced where:", whereErr);
+      advancedWhere = undefined;
+    }
+
+    let globalWhere;
+    if (input.search) {
+      try {
+        const s = `%${input.search}%`;
+        globalWhere = or(
+          ilike(incoterms.code, s),
+          ilike(incoterms.description, s)
+        );
+      } catch (searchErr) {
+        console.error("Error building search where:", searchErr);
+        globalWhere = undefined;
+      }
+    }
+
+    // 2. where 결합
+    let finalWhere;
+    if (advancedWhere && globalWhere) {
+      finalWhere = and(advancedWhere, globalWhere);
+    } else {
+      finalWhere = advancedWhere || globalWhere;
+    }
+
+    // 3. order by
+    let orderBy;
+    try {
+      orderBy =
+        input.sort.length > 0
+          ? input.sort
+              .map((item) => {
+                if (!item || !item.id || typeof item.id !== "string" || !(item.id in incoterms)) return null;
+                const col = incoterms[item.id as keyof typeof incoterms];
+                return item.desc ? desc(col) : asc(col);
+              })
+              .filter((v): v is Exclude<typeof v, null> => v !== null)
+          : [asc(incoterms.createdAt)];
+    } catch (orderErr) {
+      console.error("Error building order by:", orderErr);
+      orderBy = [asc(incoterms.createdAt)];
+    }
+
+    // 4. 쿼리 실행
+    let data = [];
+    let total = 0;
+
+    try {
+      const queryBuilder = db.select().from(incoterms);
+
+      if (finalWhere) {
+        queryBuilder.where(finalWhere);
+      }
+
+      if (orderBy && orderBy.length > 0) {
+        queryBuilder.orderBy(...orderBy);
+      }
+      if (typeof offset === "number" && !isNaN(offset)) {
+        queryBuilder.offset(offset);
+      }
+      if (typeof input.perPage === "number" && !isNaN(input.perPage)) {
+        queryBuilder.limit(input.perPage);
+      }
+
+      data = await queryBuilder;
+
+      const countBuilder = db
+        .select({ count: count() })
+        .from(incoterms);
+
+      if (finalWhere) {
+        countBuilder.where(finalWhere);
+      }
+
+      const countResult = await countBuilder;
+      total = countResult[0]?.count || 0;
+    } catch (queryErr) {
+      console.error("Query execution failed:", queryErr);
+      throw queryErr;
+    }
+
+    const pageCount = Math.ceil(total / input.perPage);
+
+    return { data, pageCount };
+  } catch (err) {
+    console.error("Error in getIncoterms:", err);
+    if (err instanceof Error) {
+      console.error("Error message:", err.message);
+      console.error("Error stack:", err.stack);
+    }
+    return { data: [], pageCount: 0 };
+  }
+}
+
+export async function createIncoterm(data: Omit<typeof incoterms.$inferInsert, "createdAt">) {
+  try {
+    const [created] = await db.insert(incoterms).values(data).returning();
+    return { data: created };
+  } catch (err) {
+    console.error("Error creating incoterm:", err);
+    return { error: "생성 중 오류가 발생했습니다." };
+  }
+}
+
+export async function updateIncoterm(code: string, data: Partial<typeof incoterms.$inferInsert>) {
+  try {
+    const [updated] = await db
+      .update(incoterms)
+      .set(data)
+      .where(eq(incoterms.code, code))
+      .returning();
+    return { data: updated };
+  } catch (err) {
+    console.error("Error updating incoterm:", err);
+    return { error: "수정 중 오류가 발생했습니다." };
+  }
+}
+
+export async function deleteIncoterm(code: string) {
+  try {
+    await db.delete(incoterms).where(eq(incoterms.code, code));
+    return { success: true };
+  } catch (err) {
+    console.error("Error deleting incoterm:", err);
+    return { error: "삭제 중 오류가 발생했습니다." };
+  }
+} 
\ No newline at end of file
diff --git a/lib/incoterms/table/incoterms-add-dialog.tsx b/lib/incoterms/table/incoterms-add-dialog.tsx
new file mode 100644
index 00000000..ef378e1e
--- /dev/null
+++ b/lib/incoterms/table/incoterms-add-dialog.tsx
@@ -0,0 +1,162 @@
+"use client";
+
+import * as React from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { z } from "zod";
+import { Plus, Loader2 } from "lucide-react";
+
+import { Button } from "@/components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { createIncoterm } from "../service";
+import { toast } from "sonner";
+
+const createIncotermSchema = z.object({
+  code: z.string().min(1, "코드는 필수입니다."),
+  description: z.string().min(1, "설명은 필수입니다."),
+  isActive: z.boolean().default(true),
+});
+
+type CreateIncotermFormValues = z.infer<typeof createIncotermSchema>;
+
+interface IncotermsAddDialogProps {
+  onSuccess?: () => void;
+}
+
+export function IncotermsAddDialog({ onSuccess }: IncotermsAddDialogProps) {
+  const [open, setOpen] = React.useState(false);
+  const [isLoading, setIsLoading] = React.useState(false);
+
+  const form = useForm<CreateIncotermFormValues>({
+    resolver: zodResolver(createIncotermSchema),
+    defaultValues: {
+      code: "",
+      description: "",
+      isActive: true,
+    },
+  });
+
+  const handleOpenChange = (newOpen: boolean) => {
+    setOpen(newOpen);
+    if (!newOpen) {
+      form.reset();
+    }
+  };
+
+  const handleCancel = () => {
+    form.reset();
+    setOpen(false);
+  };
+
+  const onSubmit = async (data: CreateIncotermFormValues) => {
+    setIsLoading(true);
+    try {
+      const result = await createIncoterm(data);
+      if (result.data) {
+        toast.success("인코텀즈가 추가되었습니다.");
+        setOpen(false);
+        if (onSuccess) {
+          onSuccess();
+        }
+      } else {
+        toast.error(result.error || "생성 중 오류가 발생했습니다.");
+      }
+    } catch (error) {
+      console.error("인코텀즈 생성 오류:", error);
+      toast.error("인코텀즈 생성에 실패했습니다.");
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogTrigger asChild>
+        <Button size="sm" variant="outline">
+          <Plus className="mr-2 h-4 w-4" />
+          인코텀즈 추가
+        </Button>
+      </DialogTrigger>
+      <DialogContent className="max-w-md">
+        <DialogHeader>
+          <DialogTitle>인코텀즈 추가</DialogTitle>
+          <DialogDescription>
+            새로운 인코텀즈를 추가합니다. 필수 정보를 입력해주세요.
+          </DialogDescription>
+        </DialogHeader>
+
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
+            <FormField
+              control={form.control}
+              name="code"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    코드 <span className="text-red-500">*</span>
+                  </FormLabel>
+                  <FormControl>
+                    <Input placeholder="인코텀즈 코드" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>
+                    설명 <span className="text-red-500">*</span>
+                  </FormLabel>
+                  <FormControl>
+                    <Input placeholder="인코텀즈 설명" {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+          </form>
+        </Form>
+
+        <DialogFooter>
+          <Button
+            type="button"
+            variant="outline"
+            onClick={handleCancel}
+            disabled={isLoading}
+          >
+            취소
+          </Button>
+          <Button
+            type="submit"
+            onClick={form.handleSubmit(onSubmit)}
+            disabled={isLoading}
+          >
+            {isLoading && <Loader2 className="mr-2 h-4 w-4 animate-spin" />}
+            {isLoading ? "생성 중..." : "인코텀즈 추가"}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+} 
\ No newline at end of file
diff --git a/lib/incoterms/table/incoterms-edit-sheet.tsx b/lib/incoterms/table/incoterms-edit-sheet.tsx
new file mode 100644
index 00000000..9cd067c7
--- /dev/null
+++ b/lib/incoterms/table/incoterms-edit-sheet.tsx
@@ -0,0 +1,146 @@
+"use client"
+
+import * as React from "react"
+import { zodResolver } from "@hookform/resolvers/zod"
+import { useForm } from "react-hook-form"
+import { toast } from "sonner"
+import * as z from "zod"
+import { Button } from "@/components/ui/button"
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from "@/components/ui/form"
+import {
+  Sheet,
+  SheetContent,
+  SheetDescription,
+  SheetHeader,
+  SheetTitle,
+} from "@/components/ui/sheet"
+import { Input } from "@/components/ui/input"
+import { Switch } from "@/components/ui/switch"
+import { updateIncoterm } from "../service"
+import { incoterms } from "@/db/schema/procurementRFQ"
+
+const updateIncotermSchema = z.object({
+  code: z.string().min(1, "코드는 필수입니다."),
+  description: z.string().min(1, "설명은 필수입니다."),
+  isActive: z.boolean().default(true),
+})
+
+type UpdateIncotermSchema = z.infer<typeof updateIncotermSchema>
+
+interface IncotermsEditSheetProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  data: typeof incoterms.$inferSelect
+  onSuccess: () => void
+}
+
+export function IncotermsEditSheet({
+  open,
+  onOpenChange,
+  data,
+  onSuccess,
+}: IncotermsEditSheetProps) {
+  const form = useForm<UpdateIncotermSchema>({
+    resolver: zodResolver(updateIncotermSchema),
+    defaultValues: {
+      code: data.code,
+      description: data.description,
+      isActive: data.isActive,
+    },
+    mode: "onChange"
+  })
+
+  React.useEffect(() => {
+    if (data) {
+      form.reset({
+        code: data.code,
+        description: data.description,
+        isActive: data.isActive,
+      })
+    }
+  }, [data, form])
+
+  async function onSubmit(input: UpdateIncotermSchema) {
+    try {
+      await updateIncoterm(data.code, input)
+      toast.success("수정이 완료되었습니다.")
+      onSuccess()
+      onOpenChange(false)
+    } catch {
+      toast.error("수정 중 오류가 발생했습니다.")
+    }
+  }
+
+  return (
+    <Sheet open={open} onOpenChange={onOpenChange}>
+      <SheetContent className="flex flex-col gap-6 sm:max-w-md">
+        <SheetHeader className="text-left">
+          <SheetTitle>인코텀즈 수정</SheetTitle>
+          <SheetDescription>
+            인코텀즈 정보를 수정하고 변경사항을 저장하세요
+          </SheetDescription>
+        </SheetHeader>
+        <Form {...form}>
+          <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-4">
+            <FormField
+              control={form.control}
+              name="code"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>코드</FormLabel>
+                  <FormControl>
+                    <Input {...field} disabled />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="description"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel>설명</FormLabel>
+                  <FormControl>
+                    <Input {...field} />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+            <FormField
+              control={form.control}
+              name="isActive"
+              render={({ field }) => (
+                <FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
+                  <div className="space-y-0.5">
+                    <FormLabel>활성화</FormLabel>
+                  </div>
+                  <FormControl>
+                    <Switch
+                      checked={field.value}
+                      onCheckedChange={field.onChange}
+                    />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
+            <div className="flex justify-end space-x-2">
+              <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
+                취소
+              </Button>
+              <Button type="submit">저장</Button>
+            </div>
+          </form>
+        </Form>
+      </SheetContent>
+    </Sheet>
+  )
+} 
\ No newline at end of file
diff --git a/lib/incoterms/table/incoterms-table-columns.tsx b/lib/incoterms/table/incoterms-table-columns.tsx
new file mode 100644
index 00000000..56a44e8b
--- /dev/null
+++ b/lib/incoterms/table/incoterms-table-columns.tsx
@@ -0,0 +1,102 @@
+import type {  ColumnDef,  Row } from "@tanstack/react-table";
+import { Button } from "@/components/ui/button";
+import { Badge } from "@/components/ui/badge";
+import { Ellipsis } from "lucide-react";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { incoterms } from "@/db/schema/procurementRFQ";
+import { toast } from "sonner";
+import { deleteIncoterm } from "../service";
+
+type Incoterm = typeof incoterms.$inferSelect;
+
+interface GetColumnsProps {
+  setRowAction: (action: { type: string; row: Row<Incoterm> }) => void;
+  onSuccess: () => void;
+}
+
+const handleDelete = async (code: string, onSuccess: () => void) => {
+  const result = await deleteIncoterm(code);
+  if (result.success) {
+    toast.success("삭제 완료");
+    onSuccess();
+  } else {
+    toast.error(result.error || "삭제 실패");
+  }
+};
+
+export function getColumns({ setRowAction, onSuccess }: GetColumnsProps): ColumnDef<Incoterm>[] {
+  return [
+    {
+      id: "code",
+      header: () => <div>코드</div>,
+      cell: ({ row }) => <div>{row.original.code}</div>,
+      enableSorting: true,
+      enableHiding: false,
+    },
+    {
+      id: "description",
+      header: () => <div>설명</div>,
+      cell: ({ row }) => <div>{row.original.description}</div>,
+      enableSorting: true,
+      enableHiding: false,
+    },
+    {
+      id: "isActive",
+      header: () => <div>상태</div>,
+      cell: ({ row }) => (
+        <Badge variant={row.original.isActive ? "default" : "secondary"}>
+          {row.original.isActive ? "활성" : "비활성"}
+        </Badge>
+      ),
+      enableSorting: true,
+      enableHiding: false,
+    },
+    {
+      id: "createdAt",
+      header: () => <div>생성일</div>,
+      cell: ({ row }) => {
+        const value = row.original.createdAt;
+        const date = value ? new Date(value) : null;
+        return date ? date.toLocaleDateString() : "";
+      },
+      enableSorting: true,
+      enableHiding: false,
+    },
+    {
+      id: "actions",
+      cell: ({ row }) => (
+        <DropdownMenu>
+          <DropdownMenuTrigger asChild>
+            <Button
+              aria-label="Open menu"
+              variant="ghost"
+              className="flex size-8 p-0 data-[state=open]:bg-muted"
+            >
+              <Ellipsis className="size-4" aria-hidden="true" />
+            </Button>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent align="end" className="w-40">
+            <DropdownMenuItem
+              onSelect={() => setRowAction({ type: "edit", row })}
+            >
+              수정
+            </DropdownMenuItem>
+            <DropdownMenuSeparator />
+            <DropdownMenuItem
+              onSelect={() => handleDelete(row.original.code, onSuccess)}
+              className="text-destructive"
+            >
+              삭제
+            </DropdownMenuItem>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      ),
+    },
+  ];
+} 
\ No newline at end of file
diff --git a/lib/incoterms/table/incoterms-table-toolbar.tsx b/lib/incoterms/table/incoterms-table-toolbar.tsx
new file mode 100644
index 00000000..b87982c9
--- /dev/null
+++ b/lib/incoterms/table/incoterms-table-toolbar.tsx
@@ -0,0 +1,16 @@
+"use client";
+
+import * as React from "react";
+import { IncotermsAddDialog } from "./incoterms-add-dialog";
+
+interface IncotermsTableToolbarProps {
+  onSuccess?: () => void;
+}
+
+export function IncotermsTableToolbar({ onSuccess }: IncotermsTableToolbarProps) {
+  return (
+    <div className="flex items-center gap-2">
+      <IncotermsAddDialog onSuccess={onSuccess} />
+    </div>
+  );
+} 
\ No newline at end of file
diff --git a/lib/incoterms/table/incoterms-table.tsx b/lib/incoterms/table/incoterms-table.tsx
new file mode 100644
index 00000000..c5b5bba4
--- /dev/null
+++ b/lib/incoterms/table/incoterms-table.tsx
@@ -0,0 +1,116 @@
+"use client";
+import * as React from "react";
+import { useDataTable } from "@/hooks/use-data-table";
+import { DataTable } from "@/components/data-table/data-table";
+import { DataTableAdvancedToolbar } from "@/components/data-table/data-table-advanced-toolbar";
+import { getColumns } from "./incoterms-table-columns";
+import { incoterms } from "@/db/schema/procurementRFQ";
+import { IncotermsTableToolbar } from "./incoterms-table-toolbar";
+import { toast } from "sonner";
+import { IncotermsEditSheet } from "./incoterms-edit-sheet";
+import { Row } from "@tanstack/react-table";
+import { getIncoterms } from "../service";
+
+interface IncotermsTableProps {
+  promises?: Promise<[{ data: typeof incoterms.$inferSelect[]; pageCount: number }] >;
+}
+
+export function IncotermsTable({ promises }: IncotermsTableProps) {
+  const [rawData, setRawData] = React.useState<{ data: typeof incoterms.$inferSelect[]; pageCount: number }>({ data: [], pageCount: 0 });
+  const [isEditSheetOpen, setIsEditSheetOpen] = React.useState(false);
+  const [selectedRow, setSelectedRow] = React.useState<typeof incoterms.$inferSelect | null>(null);
+
+  React.useEffect(() => {
+    if (promises) {
+      promises.then(([result]) => {
+        setRawData(result);
+      });
+    } else {
+      // fallback: 클라이언트에서 직접 fetch (CSR)
+      (async () => {
+        try {
+          const result = await getIncoterms({
+            page: 1,
+            perPage: 10,
+            search: "",
+            sort: [{ id: "createdAt", desc: true }],
+            filters: [],
+            joinOperator: "and",
+            flags: ["advancedTable"],
+            code: "",
+            description: "",
+            isActive: ""
+          });
+          setRawData(result);
+        } catch (error) {
+          console.error("Error refreshing data:", error);
+          toast.error("데이터를 불러오는 중 오류가 발생했습니다.");
+        }
+      })();
+    }
+  }, [promises]);
+
+  const refreshData = React.useCallback(async () => {
+    try {
+      const result = await getIncoterms({
+        page: 1,
+        perPage: 10,
+        search: "",
+        sort: [{ id: "createdAt", desc: true }],
+        filters: [],
+        joinOperator: "and",
+        flags: ["advancedTable"],
+        code: "",
+        description: "",
+        isActive: ""
+      });
+      setRawData(result);
+    } catch (error) {
+      console.error("Error refreshing data:", error);
+      toast.error("데이터를 불러오는 중 오류가 발생했습니다.");
+    }
+  }, []);
+
+  const handleRowAction = async (action: { type: string; row: Row<typeof incoterms.$inferSelect> }) => {
+    if (action.type === "edit") {
+      setSelectedRow(action.row.original);
+      setIsEditSheetOpen(true);
+    }
+  };
+
+  const columns = React.useMemo(() => getColumns({ setRowAction: handleRowAction, onSuccess: refreshData }), [refreshData]);
+
+  const { table } = useDataTable({
+    data: rawData.data,
+    columns,
+    pageCount: rawData.pageCount,
+    filterFields: [],
+    enablePinning: true,
+    enableAdvancedFilter: true,
+    initialState: {
+      sorting: [{ id: "createdAt", desc: true }],
+      columnPinning: { right: ["actions"] },
+    },
+    getRowId: (originalRow) => String(originalRow.code),
+    shallow: false,
+    clearOnDefault: true,
+  });
+
+  return (
+    <>
+      <DataTable table={table}>
+        <DataTableAdvancedToolbar table={table} filterFields={[]} shallow={false}>
+          <IncotermsTableToolbar onSuccess={refreshData} />
+        </DataTableAdvancedToolbar>
+      </DataTable>
+      {isEditSheetOpen && selectedRow && (
+        <IncotermsEditSheet
+          open={isEditSheetOpen}
+          onOpenChange={setIsEditSheetOpen}
+          data={selectedRow}
+          onSuccess={refreshData}
+        />
+      )}
+    </>
+  );
+} 
\ No newline at end of file
diff --git a/lib/incoterms/validations.ts b/lib/incoterms/validations.ts
new file mode 100644
index 00000000..3f51dcd6
--- /dev/null
+++ b/lib/incoterms/validations.ts
@@ -0,0 +1,33 @@
+import {
+  createSearchParamsCache,
+  parseAsArrayOf,
+  parseAsInteger,
+  parseAsString,
+  parseAsStringEnum,
+} from "nuqs/server";
+import * as z from "zod";
+
+import { getFiltersStateParser, getSortingStateParser } from "@/lib/parsers";
+import { incoterms } from "@/db/schema/procurementRFQ";
+
+export const SearchParamsCache = createSearchParamsCache({
+  // UI 모드나 플래그 관련
+    flags: parseAsArrayOf(z.enum(["advancedTable", "floatingBar"])).withDefault([]),
+
+  // 페이징
+    page: parseAsInteger.withDefault(1),
+    perPage: parseAsInteger.withDefault(10),
+    
+  // 정렬 (createdAt 기준 내림차순)
+    sort: getSortingStateParser<typeof incoterms>().withDefault([
+        { id: "createdAt", desc: true }]),
+
+  // 기존 필드  
+  code: parseAsString.withDefault(""),
+  description: parseAsString.withDefault(""),
+  isActive: parseAsString.withDefault(""),
+  filters: getFiltersStateParser().withDefault([]),
+  joinOperator: parseAsStringEnum(["and", "or"]).withDefault("and"),
+  search: parseAsString.withDefault(""),
+});
+export type GetIncotermsSchema = Awaited<ReturnType<typeof SearchParamsCache.parse>>;