@simplysm/sd-cli 13.0.70 → 13.0.72

package/templates/init/packages/client-admin/src/views/home/my-info/MyInfoDetail.tsx.hbs

@@ -0,0 +1,248 @@
+import { createMemo } from "solid-js";
+import { CrudDetail, FormTable, Icon, Select, TextInput } from "@simplysm/solid";
+import { useAuth } from "../../../providers/AuthProvider";
+import { useAppService } from "../../../providers/AppServiceProvider";
+import { useAppStructure } from "../../../providers/AppStructureProvider";
+import { expr } from "@{{projectName}}/db-main";
+import { IconX } from "@tabler/icons-solidjs";
+import { jsonParse } from "@simplysm/core-common";
+
+type DetailData = {
+  email: string;
+  currentPassword: string;
+  newPassword: string;
+  confirmPassword: string;
+  firstRouterLink?: string;
+};
+
+export function MyInfoDetail() {
+  const auth = useAuth();
+  const appService = useAppService();
+  const appStructure = useAppStructure();
+
+  const routeMap = createMemo(() => {
+    const menus = appStructure.usableMenus();
+    const map = new Map<string, string>();
+
+    const flatten = (items: typeof menus, prefix = ""): void => {
+      for (const item of items) {
+        const label = prefix !== "" ? `${prefix} > ${item.title}` : item.title;
+        if (item.href !== undefined) {
+          map.set(item.href, label);
+        }
+        if (item.children !== undefined) {
+          flatten(item.children, label);
+        }
+      }
+    };
+
+    flatten(menus);
+    return map;
+  });
+
+  const routeOptions = createMemo(() => Array.from(routeMap().keys()));
+
+  async function handleLoad() {
+    const authData = auth.authInfo();
+    if (!authData) throw new Error("직원 정보를 불러올 수 없습니다.");
+
+    return appService.orm.connect(async (db) => {
+      const employee = await db
+        .employee()
+        .where((c: any) => [expr.eq(c.id, authData.employeeId)])
+        .single();
+
+      const config = await db
+        .employeeConfig()
+        .where((c: any) => [
+          expr.eq(c.employeeId, authData.employeeId),
+          expr.eq(c.code, "firstRouterLink"),
+        ])
+        .first();
+
+      let firstRouterLink: string | undefined;
+      if (config?.valueJson !== undefined && config.valueJson !== "") {
+        try {
+          firstRouterLink = jsonParse(config.valueJson);
+        } catch {
+          // JSON 파싱 실패 시 기본값 유지
+        }
+      }
+
+      return {
+        data: {
+          email: employee?.email ?? "",
+          currentPassword: "",
+          newPassword: "",
+          confirmPassword: "",
+          firstRouterLink,
+        } as DetailData,
+        info: { isNew: false, isDeleted: false },
+      };
+    });
+  }
+
+  async function handleSubmit(data: DetailData) {
+    const authData = auth.authInfo();
+    if (!authData) throw new Error("직원 정보를 불러올 수 없습니다.");
+
+    const isPasswordChanging =
+      data.currentPassword.trim() !== "" ||
+      data.newPassword.trim() !== "" ||
+      data.confirmPassword.trim() !== "";
+
+    if (isPasswordChanging) {
+      await appService.auth.changePassword(data.currentPassword.trim(), data.newPassword.trim());
+    }
+
+    await appService.orm.connect(async (db) => {
+      await db
+        .employee()
+        .where((c: any) => [expr.eq(c.id, authData.employeeId)])
+        .update(() => ({
+          email: expr.val("string", data.email.trim()),
+        }));
+
+      const existingConfig = await db
+        .employeeConfig()
+        .where((c: any) => [
+          expr.eq(c.employeeId, authData.employeeId),
+          expr.eq(c.code, "firstRouterLink"),
+        ])
+        .first();
+
+      const valueJson =
+        data.firstRouterLink !== undefined
+          ? JSON.stringify(data.firstRouterLink)
+          : JSON.stringify(null);
+
+      if (existingConfig) {
+        await db
+          .employeeConfig()
+          .where((c: any) => [
+            expr.eq(c.employeeId, authData.employeeId),
+            expr.eq(c.code, "firstRouterLink"),
+          ])
+          .update(() => ({
+            valueJson: expr.val("string", valueJson),
+          }));
+      } else {
+        await db.employeeConfig().insert([
+          {
+            employeeId: authData.employeeId,
+            code: "firstRouterLink",
+            valueJson,
+          },
+        ]);
+      }
+    });
+
+    await auth.tryReloadAuth();
+    return true;
+  }
+
+  return (
+    <CrudDetail<DetailData> class={"px-2 py-4"} load={handleLoad} submit={handleSubmit}>
+      {(ctx) => (
+        <div class="flex flex-col gap-8">
+          <section>
+            <h3 class="mb-4 border-l-4 border-base-500 pl-3 font-bold text-base-500">인증정보</h3>
+            <FormTable>
+              <tr>
+                <th>이메일</th>
+                <td>
+                  <TextInput
+                    type="email"
+                    required
+                    value={ctx.data.email}
+                    onValueChange={(v) => ctx.setData("email", v)}
+                    autocomplete="off"
+                  />
+                </td>
+              </tr>
+              <tr>
+                <th>현재 비밀번호</th>
+                <td>
+                  <TextInput
+                    required={Boolean(ctx.data.newPassword || ctx.data.confirmPassword)}
+                    class="w-56"
+                    type="password"
+                    autocomplete="off"
+                    value={ctx.data.currentPassword}
+                    onValueChange={(v) => ctx.setData("currentPassword", v)}
+                    placeholder="비밀번호 변경 시에만 입력"
+                  />
+                </td>
+              </tr>
+              <tr>
+                <th>새 비밀번호</th>
+                <td>
+                  <TextInput
+                    required={Boolean(ctx.data.currentPassword || ctx.data.confirmPassword)}
+                    minLength={8}
+                    class="w-56"
+                    type="password"
+                    autocomplete="off"
+                    value={ctx.data.newPassword}
+                    onValueChange={(v) => ctx.setData("newPassword", v)}
+                    placeholder="비밀번호 변경 시에만 입력"
+                  />
+                </td>
+              </tr>
+              <tr>
+                <th>새 비밀번호 확인</th>
+                <td>
+                  <TextInput
+                    required={Boolean(ctx.data.currentPassword || ctx.data.newPassword)}
+                    minLength={8}
+                    validate={() =>
+                      ctx.data.newPassword !== ctx.data.confirmPassword
+                        ? "비밀번호가 일치하지 않습니다"
+                        : ""
+                    }
+                    class="w-56"
+                    type="password"
+                    autocomplete="off"
+                    value={ctx.data.confirmPassword}
+                    onValueChange={(v) => ctx.setData("confirmPassword", v)}
+                    placeholder="비밀번호 변경 시에만 입력"
+                  />
+                </td>
+              </tr>
+            </FormTable>
+          </section>
+
+          <section>
+            <h3 class="mb-4 border-l-4 border-base-500 pl-3 font-bold text-base-500">시스템설정</h3>
+            <FormTable>
+              <tbody>
+                <tr>
+                  <th>로그인 시 화면</th>
+                  <td>
+                    <Select
+                      class="w-full"
+                      value={ctx.data.firstRouterLink}
+                      onValueChange={(v) => ctx.setData("firstRouterLink", v)}
+                      items={routeOptions()}
+                      renderValue={(v) => <>{routeMap().get(v) ?? v}</>}
+                      placeholder="선택 안함"
+                    >
+                      <Select.ItemTemplate>
+                        {(href: string) => <>{routeMap().get(href) ?? href}</>}
+                      </Select.ItemTemplate>
+                      <Select.Action
+                        onClick={() => ctx.setData("firstRouterLink", undefined as any)}
+                      >
+                        <Icon icon={IconX} class={"text-danger-500"} />
+                      </Select.Action>
+                    </Select>
+                  </td>
+                </tr>
+              </tbody>
+            </FormTable>
+          </section>
+        </div>
+      )}
+    </CrudDetail>
+  );
+}

package/templates/init/packages/client-admin/src/views/home/system/system-log/SystemLogSheet.tsx.hbs

@@ -0,0 +1,169 @@
+import {
+  CrudSheet,
+  DateRangePicker,
+  type ExcelConfig,
+  FormGroup,
+  type SortingDef,
+  TextInput,
+} from "@simplysm/solid";
+import { DateOnly, type DateTime, objGetChainValue, strIsNullOrEmpty } from "@simplysm/core-common";
+import { expr } from "@{{projectName}}/db-main";
+import { type ExprUnit } from "@simplysm/orm-common";
+import { ExcelWrapper } from "@simplysm/excel";
+import { downloadBlob } from "@simplysm/core-browser";
+import { z } from "zod";
+import { useAppService } from "../../../../providers/AppServiceProvider";
+
+type SheetItem = {
+  id: number;
+  clientName?: string;
+  dateTime?: DateTime;
+  severity?: string;
+  message?: string;
+  employeeName?: string;
+};
+
+type Filter = {
+  fromDate?: DateOnly;
+  toDate?: DateOnly;
+  searchText?: string;
+};
+
+const ITEMS_PER_PAGE = 50;
+
+const excelWrapper = new ExcelWrapper(
+  z.object({
+    id: z.number().describe("ID"),
+    dateTime: z.custom<DateTime>().optional().describe("일시"),
+    severity: z.string().optional().describe("심각도"),
+    employeeName: z.string().optional().describe("사용자명"),
+    clientName: z.string().optional().describe("클라이언트"),
+    message: z.string().optional().describe("메시지"),
+  }),
+);
+
+export function SystemLogSheet() {
+  const appService = useAppService();
+
+  const excel: ExcelConfig<SheetItem> = {
+    download: async (items) => {
+      await using wb = await excelWrapper.write("시스템로그", items);
+      const blob = await wb.getBlob();
+      downloadBlob(blob, "시스템로그.xlsx");
+    },
+  };
+
+  async function search(filter: Filter, page: number | undefined, sorts: SortingDef[]) {
+    return appService.orm.connect(async (db) => {
+      let qr = db._log();
+
+      // 조회기간 필터
+      if (filter.fromDate != null || filter.toDate != null) {
+        qr = qr.where((c) => [
+          expr.between(expr.cast(c.dateTime, { type: "date" }), filter.fromDate, filter.toDate),
+        ]);
+      }
+
+      // 검색어 필터
+      const searchText = filter.searchText?.trim();
+      if (!strIsNullOrEmpty(searchText)) {
+        qr = qr.search((c) => [c.clientName, c.severity, c.employee!.name], searchText);
+      }
+
+      // 페이지 수
+      const pageCount = page != null ? Math.ceil((await qr.count()) / ITEMS_PER_PAGE) : undefined;
+
+      // select + include
+      let qr2 = qr.include((c) => c.employee).select((c) => ({
+        id: c.id,
+        clientName: c.clientName,
+        dateTime: c.dateTime,
+        severity: c.severity,
+        message: c.message,
+        employeeName: c.employee?.name,
+      }));
+
+      // 정렬
+      for (const sort of sorts) {
+        qr2 = qr2.orderBy(
+          (c) => objGetChainValue(c, sort.key) as ExprUnit<any>,
+          sort.desc ? "DESC" : "ASC",
+        );
+      }
+      if (!sorts.some((s) => s.key === "id")) {
+        qr2 = qr2.orderBy((c) => c.id, "DESC");
+      }
+
+      // 페이지네이션
+      if (page != null) {
+        qr2 = qr2.limit((page - 1) * ITEMS_PER_PAGE, ITEMS_PER_PAGE);
+      }
+
+      const items = (await qr2.result()) as SheetItem[];
+      return { items, pageCount };
+    });
+  }
+
+  return (
+    <CrudSheet<SheetItem, Filter>
+      search={search}
+      getItemKey={(item) => item.id}
+      persistKey="system-log"
+      editable={false}
+      excel={excel}
+    >
+      <CrudSheet.Filter<Filter>>
+        {(filter, setFilter) => (
+          <>
+            <FormGroup.Item label="조회기간">
+              <DateRangePicker
+                from={filter.fromDate}
+                onFromChange={(v) => setFilter("fromDate", v)}
+                to={filter.toDate}
+                onToChange={(v) => setFilter("toDate", v)}
+              />
+            </FormGroup.Item>
+            <FormGroup.Item label="검색어">
+              <TextInput
+                value={filter.searchText}
+                onValueChange={(v) => setFilter("searchText", v)}
+              />
+            </FormGroup.Item>
+          </>
+        )}
+      </CrudSheet.Filter>
+
+      <CrudSheet.Column<SheetItem> key="id" header="#" fixed>
+        {({ item }) => <div class="px-2 py-1 text-right">{item.id}</div>}
+      </CrudSheet.Column>
+
+      <CrudSheet.Column<SheetItem> key="dateTime" header="일시">
+        {({ item }) => (
+          <div class="px-2 py-1">
+            {item.dateTime?.toFormatString("yyyy-MM-dd HH:mm") ?? ""}
+          </div>
+        )}
+      </CrudSheet.Column>
+
+      <CrudSheet.Column<SheetItem> key="severity" header="심각도">
+        {({ item }) => <div class="px-2 py-1">{item.severity}</div>}
+      </CrudSheet.Column>
+
+      <CrudSheet.Column<SheetItem> key="employeeName" header="사용자명">
+        {({ item }) => <div class="px-2 py-1">{item.employeeName}</div>}
+      </CrudSheet.Column>
+
+      <CrudSheet.Column<SheetItem> key="clientName" header="클라이언트">
+        {({ item }) => <div class="px-2 py-1">{item.clientName}</div>}
+      </CrudSheet.Column>
+
+      <CrudSheet.Column<SheetItem> key="message" header="메시지">
+        {({ item }) => (
+          <div class="px-2 py-1">
+            <pre class="whitespace-pre-wrap">{item.message}</pre>
+          </div>
+        )}
+      </CrudSheet.Column>
+    </CrudSheet>
+  );
+}

package/templates/init/packages/client-admin/src/views/not-found/NotFoundView.tsx

@@ -0,0 +1,15 @@
+import { A } from "@solidjs/router";
+
+export function NotFoundView() {
+  return (
+    <div class="flex h-full items-center justify-center">
+      <div class="rounded-lg border border-base-200 bg-base-50 p-8 text-center dark:border-base-700 dark:bg-base-800">
+        <h1 class="mb-4 text-2xl font-bold">404</h1>
+        <p class="mb-4 text-base-600 dark:text-base-400">페이지를 찾을 수 없습니다.</p>
+        <A href="/home" class="text-primary-500 hover:underline">
+          홈으로 돌아가기
+        </A>
+      </div>
+    </div>
+  );
+}

package/templates/init/packages/client-admin/tailwind.config.ts

@@ -0,0 +1,10 @@
+import { fileURLToPath } from "url";
+import simplysmPreset from "@simplysm/solid/tailwind.config";
+
+const __dirname = fileURLToPath(new URL(".", import.meta.url));
+
+export default {
+  darkMode: "class",
+  presets: [simplysmPreset],
+  content: [`${__dirname}index.html`, `${__dirname}src/**/*.{ts,tsx}`, ...simplysmPreset.content],
+};

package/templates/init/packages/db-main/package.json.hbs

@@ -0,0 +1,13 @@
+{
+  "name": "@{{projectName}}/db-main",
+  "version": "1.0.0",
+  "type": "module",
+  "private": true,
+  "exports": {
+    ".": "./src/index.ts"
+  },
+  "dependencies": {
+    "@simplysm/core-common": "~13.0.72",
+    "@simplysm/orm-common": "~13.0.72"
+  }
+}

package/templates/init/packages/db-main/src/MainDbContext.ts

@@ -0,0 +1,20 @@
+import { defineDbContext, type DbContextInstance } from "@simplysm/orm-common";
+import { Employee } from "./tables/Employee";
+import { Role } from "./tables/Role";
+import { RolePermission } from "./tables/RolePermission";
+import { EmployeeConfig } from "./tables/EmployeeConfig";
+import { _Log } from "./tables/_Log";
+import { _DataLog } from "./tables/_DataLog";
+
+export const MainDbContext = defineDbContext({
+  tables: {
+    employee: Employee,
+    role: Role,
+    rolePermission: RolePermission,
+    employeeConfig: EmployeeConfig,
+    _log: _Log,
+    _dataLog: _DataLog,
+  },
+});
+
+export type MainDbContext = DbContextInstance<typeof MainDbContext>;

package/templates/init/packages/db-main/src/dataLogExt.ts

@@ -0,0 +1,127 @@
+import { DateTime } from "@simplysm/core-common";
+import {
+  type DataRecord,
+  expr,
+  Queryable,
+  queryable,
+  type TableBuilder,
+} from "@simplysm/orm-common";
+import { _DataLog } from "./tables/_DataLog";
+
+// ── Type Declarations ──
+
+export interface IDataLogJoinOptions {
+  includeActions?: string[];
+  excludeActions?: string[];
+}
+
+export interface IDataLogJoinResult {
+  action?: string;
+  dateTime?: DateTime;
+  employeeId?: number;
+  employeeName?: string;
+}
+
+export interface IInsertDataLogParam {
+  action: string;
+  itemId: number;
+  employeeId?: number;
+  valueJson?: string;
+}
+
+declare module "@simplysm/orm-common" {
+  interface Queryable<TData extends DataRecord, TFrom extends TableBuilder<any, any> | never> {
+    joinLastDataLog(
+      opts?: IDataLogJoinOptions,
+    ): Queryable<TData & { lastDataLog?: IDataLogJoinResult }, TFrom>;
+
+    joinFirstDataLog(
+      opts?: IDataLogJoinOptions,
+    ): Queryable<TData & { firstDataLog?: IDataLogJoinResult }, TFrom>;
+
+    insertDataLog(log: IInsertDataLogParam): Promise<void>;
+  }
+}
+
+// ── Runtime: insertDataLog ──
+
+Queryable.prototype.insertDataLog = async function (
+  this: Queryable<any, any>,
+  log: IInsertDataLogParam,
+): Promise<void> {
+  const tableName = (this.meta.from as TableBuilder<any, any>).meta.name;
+  const dataLogQr = queryable(this.meta.db, _DataLog);
+
+  await dataLogQr().insert([
+    {
+      tableName,
+      action: log.action,
+      itemId: log.itemId,
+      valueJson: log.valueJson,
+      dateTime: new DateTime(),
+      employeeId: log.employeeId,
+    },
+  ]);
+};
+
+// ── Runtime: joinLastDataLog ──
+
+Queryable.prototype.joinLastDataLog = function (
+  this: Queryable<any, any>,
+  opts?: IDataLogJoinOptions,
+) {
+  const tableName = (this.meta.from as TableBuilder<any, any>).meta.name;
+
+  return this.joinSingle("lastDataLog", (qr, en) =>
+    qr
+      .from(_DataLog)
+      .where((dl) => [
+        expr.eq(dl.tableName, tableName),
+        expr.eq(dl.itemId, en["id"]),
+        ...(opts?.includeActions ? [expr.in(dl.action, opts.includeActions)] : []),
+        ...(opts?.excludeActions ? [expr.not(expr.in(dl.action, opts.excludeActions))] : []),
+      ])
+      .orderBy((dl) => dl.tableName, "DESC")
+      .orderBy((dl) => dl.itemId, "DESC")
+      .orderBy((dl) => dl.dateTime, "DESC")
+      .top(1)
+      .include((dl) => dl.employee)
+      .select((dl) => ({
+        action: dl.action,
+        dateTime: dl.dateTime,
+        employeeId: dl.employeeId,
+        employeeName: dl.employee!.name,
+      })),
+  );
+};
+
+// ── Runtime: joinFirstDataLog ──
+
+Queryable.prototype.joinFirstDataLog = function (
+  this: Queryable<any, any>,
+  opts?: IDataLogJoinOptions,
+) {
+  const tableName = (this.meta.from as TableBuilder<any, any>).meta.name;
+
+  return this.joinSingle("firstDataLog", (qr, en) =>
+    qr
+      .from(_DataLog)
+      .where((dl) => [
+        expr.eq(dl.tableName, tableName),
+        expr.eq(dl.itemId, en["id"]),
+        ...(opts?.includeActions ? [expr.in(dl.action, opts.includeActions)] : []),
+        ...(opts?.excludeActions ? [expr.not(expr.in(dl.action, opts.excludeActions))] : []),
+      ])
+      .orderBy((dl) => dl.tableName, "ASC")
+      .orderBy((dl) => dl.itemId, "ASC")
+      .orderBy((dl) => dl.dateTime, "ASC")
+      .top(1)
+      .include((dl) => dl.employee)
+      .select((dl) => ({
+        action: dl.action,
+        dateTime: dl.dateTime,
+        employeeId: dl.employeeId,
+        employeeName: dl.employee!.name,
+      })),
+  );
+};

package/templates/init/packages/db-main/src/index.ts

@@ -0,0 +1,10 @@
+export { Role } from "./tables/Role";
+export { Employee } from "./tables/Employee";
+export { RolePermission } from "./tables/RolePermission";
+export { EmployeeConfig } from "./tables/EmployeeConfig";
+export { _Log } from "./tables/_Log";
+export { _DataLog } from "./tables/_DataLog";
+export { MainDbContext } from "./MainDbContext";
+export { expr } from "@simplysm/orm-common";
+import "./dataLogExt";
+export type { IDataLogJoinOptions, IDataLogJoinResult, IInsertDataLogParam } from "./dataLogExt";

package/templates/init/packages/db-main/src/tables/Employee.ts

@@ -0,0 +1,24 @@
+import { Table } from "@simplysm/orm-common";
+import { Role } from "./Role";
+
+export const Employee = Table("Employee")
+  .columns((c) => ({
+    id: c.bigint().autoIncrement(),
+    name: c.varchar(100),
+    email: c.varchar(200).nullable(),
+    phoneNumber: c.varchar(50).nullable(),
+    birthDate: c.date().nullable(),
+    enteringDate: c.date().nullable(),
+    leavingDate: c.date().nullable(),
+    socialSecurityNumber: c.varchar(20).nullable(),
+    payrollAccountBank: c.varchar(100).nullable(),
+    payrollAccountNumber: c.varchar(100).nullable(),
+    encryptedPassword: c.varchar(200).nullable(),
+    roleId: c.bigint().nullable(),
+    isDeleted: c.boolean().default(false),
+  }))
+  .primaryKey("id")
+  .indexes((i) => [i.index("email").unique()])
+  .relations((r) => ({
+    role: r.foreignKey(["roleId"], () => Role),
+  }));

package/templates/init/packages/db-main/src/tables/EmployeeConfig.ts

@@ -0,0 +1,13 @@
+import { Table } from "@simplysm/orm-common";
+import { Employee } from "./Employee";
+
+export const EmployeeConfig = Table("EmployeeConfig")
+  .columns((c) => ({
+    employeeId: c.bigint(),
+    code: c.varchar(200),
+    valueJson: c.text(),
+  }))
+  .primaryKey("employeeId", "code")
+  .relations((r) => ({
+    employee: r.foreignKey(["employeeId"], () => Employee),
+  }));

package/templates/init/packages/db-main/src/tables/Role.ts

@@ -0,0 +1,9 @@
+import { Table } from "@simplysm/orm-common";
+
+export const Role = Table("Role")
+  .columns((c) => ({
+    id: c.bigint().autoIncrement(),
+    name: c.varchar(100),
+    isDeleted: c.boolean().default(false),
+  }))
+  .primaryKey("id");

package/templates/init/packages/db-main/src/tables/RolePermission.ts

@@ -0,0 +1,13 @@
+import { Table } from "@simplysm/orm-common";
+import { Role } from "./Role";
+
+export const RolePermission = Table("RolePermission")
+  .columns((c) => ({
+    roleId: c.bigint(),
+    code: c.varchar(200),
+    valueJson: c.text(),
+  }))
+  .primaryKey("roleId", "code")
+  .relations((r) => ({
+    role: r.foreignKey(["roleId"], () => Role),
+  }));