feat: improve Worksmobile tenant sync handling

2026-06-02 18:05:36 +09:00
parent d6d39ca300
commit d32ca69eee
58 changed files with 4035 additions and 1400 deletions
--- a/orgfront/src/features/orgchart/hanmacFamilyOrder.test.ts
+++ b/orgfront/src/features/orgchart/hanmacFamilyOrder.test.ts
@@ -1,52 +1,64 @@
 import { describe, expect, it } from "vitest";
 import {
-  getHanmacFamilyTenantOrderRank,
-  orderHanmacFamilyChildren,
-  orderHanmacFamilyTenants,
+    getHanmacFamilyTenantOrderRank,
+    orderHanmacFamilyChildren,
+    orderHanmacFamilyTenants,
 } from "./hanmacFamilyOrder";

 function tenant(name: string, slug: string) {
-  return { name, slug };
+    return { name, slug };
 }

 describe("hanmac family organization order", () => {
-  it("orders the top hanmac-family siblings by policy", () => {
-    const ordered = orderHanmacFamilyTenants([
-      tenant("바론그룹", "baron-group"),
-      tenant("한맥기술", "hanmac"),
-      tenant("삼안", "saman"),
-      tenant("총괄기획&기술개발센터", "gpdtdc"),
-    ]);
+    it("orders the top hanmac-family siblings by policy", () => {
+        const ordered = orderHanmacFamilyTenants([
+            tenant("한라산업개발", "halla"),
+            tenant("바론그룹", "baron-group"),
+            tenant("한맥기술", "hanmac"),
+            tenant("삼안", "saman"),
+            tenant("총괄기획&기술개발센터", "gpdtdc"),
+        ]);

-    expect(ordered.map((item) => item.name)).toEqual([
-      "총괄기획&기술개발센터",
-      "삼안",
-      "한맥기술",
-      "바론그룹",
-    ]);
-  });
+        expect(ordered.map((item) => item.name)).toEqual([
+            "총괄기획&기술개발센터",
+            "삼안",
+            "한맥기술",
+            "바론그룹",
+            "한라산업개발",
+        ]);
+    });

-  it("keeps hanmac-family as the root before ordered descendants", () => {
-    const family = tenant("한맥가족", "hanmac-family");
-    const children = orderHanmacFamilyChildren(family, [
-      tenant("바론그룹", "baron-group"),
-      tenant("총괄기획&기술개발센터", "gpdtdc"),
-      tenant("삼안", "saman"),
-      tenant("한맥기술", "hanmac"),
-    ]);
+    it("keeps hanmac-family as the root before ordered descendants", () => {
+        const family = tenant("한맥가족", "hanmac-family");
+        const children = orderHanmacFamilyChildren(family, [
+            tenant("바론그룹", "baron-group"),
+            tenant("총괄기획&기술개발센터", "gpdtdc"),
+            tenant("삼안", "saman"),
+            tenant("한라산업개발", "halla"),
+            tenant("한맥기술", "hanmac"),
+        ]);

-    expect([family, ...children].map((item) => item.name)).toEqual([
-      "한맥가족",
-      "총괄기획&기술개발센터",
-      "삼안",
-      "한맥기술",
-      "바론그룹",
-    ]);
-  });
+        expect([family, ...children].map((item) => item.name)).toEqual([
+            "한맥가족",
+            "총괄기획&기술개발센터",
+            "삼안",
+            "한맥기술",
+            "바론그룹",
+            "한라산업개발",
+        ]);
+    });

-  it("does not rank generic technical centers as GPDTDC", () => {
-    expect(
-      getHanmacFamilyTenantOrderRank(tenant("기술개발센터", "rnd-center")),
-    ).toBe(Number.MAX_SAFE_INTEGER);
-  });
+    it("does not rank generic technical centers as GPDTDC", () => {
+        expect(
+            getHanmacFamilyTenantOrderRank(
+                tenant("기술개발센터", "rnd-center"),
+            ),
+        ).toBe(Number.MAX_SAFE_INTEGER);
+    });
+
+    it("ranks Halla as the fifth hanmac-family company", () => {
+        expect(
+            getHanmacFamilyTenantOrderRank(tenant("한라산업개발", "halla")),
+        ).toBe(4);
+    });
 });
--- a/orgfront/src/features/orgchart/hanmacFamilyOrder.ts
+++ b/orgfront/src/features/orgchart/hanmacFamilyOrder.ts
@@ -1,65 +1,67 @@
 export type HanmacFamilyOrderTenant = {
-  name: string;
-  slug: string;
+    name: string;
+    slug: string;
 };

 export const HANMAC_FAMILY_ROOT_SLUG = "hanmac-family";

 export const HANMAC_FAMILY_TENANT_ORDER = [
-  "gpdtdc",
-  "saman",
-  "hanmac",
-  "baron-group",
+    "gpdtdc",
+    "saman",
+    "hanmac",
+    "baron-group",
+    "halla",
 ] as const;

 function normalizedTenantText(tenant: HanmacFamilyOrderTenant) {
-  return `${tenant.slug} ${tenant.name}`.trim().toLowerCase();
+    return `${tenant.slug} ${tenant.name}`.trim().toLowerCase();
 }

 export function isHanmacFamilyRootTenant(tenant: HanmacFamilyOrderTenant) {
-  return (
-    tenant.slug.toLowerCase() === HANMAC_FAMILY_ROOT_SLUG ||
-    tenant.name.includes("한맥가족")
-  );
+    return (
+        tenant.slug.toLowerCase() === HANMAC_FAMILY_ROOT_SLUG ||
+        tenant.name.includes("한맥가족")
+    );
 }

 export function getHanmacFamilyTenantOrderRank(
-  tenant: HanmacFamilyOrderTenant,
+    tenant: HanmacFamilyOrderTenant,
 ) {
-  const text = normalizedTenantText(tenant);
-  if (text.includes("gpdtdc") || text.includes("총괄기획")) return 0;
-  if (text.includes("saman") || text.includes("삼안")) return 1;
-  if (
-    (text.includes("hanmac") || text.includes("한맥기술")) &&
-    !isHanmacFamilyRootTenant(tenant)
-  ) {
-    return 2;
-  }
-  if (text.includes("baron-group") || text.includes("바론그룹")) return 3;
-  return Number.MAX_SAFE_INTEGER;
+    const text = normalizedTenantText(tenant);
+    if (text.includes("gpdtdc") || text.includes("총괄기획")) return 0;
+    if (text.includes("saman") || text.includes("삼안")) return 1;
+    if (
+        (text.includes("hanmac") || text.includes("한맥기술")) &&
+        !isHanmacFamilyRootTenant(tenant)
+    ) {
+        return 2;
+    }
+    if (text.includes("baron-group") || text.includes("바론그룹")) return 3;
+    if (text.includes("halla") || text.includes("한라산업개발")) return 4;
+    return Number.MAX_SAFE_INTEGER;
 }

 export function compareHanmacFamilyTenants<T extends HanmacFamilyOrderTenant>(
-  a: T,
-  b: T,
+    a: T,
+    b: T,
 ) {
-  const rankDiff =
-    getHanmacFamilyTenantOrderRank(a) - getHanmacFamilyTenantOrderRank(b);
-  if (rankDiff !== 0) return rankDiff;
-  return a.name.localeCompare(b.name);
+    const rankDiff =
+        getHanmacFamilyTenantOrderRank(a) - getHanmacFamilyTenantOrderRank(b);
+    if (rankDiff !== 0) return rankDiff;
+    return a.name.localeCompare(b.name);
 }

 export function orderHanmacFamilyTenants<T extends HanmacFamilyOrderTenant>(
-  tenants: readonly T[],
+    tenants: readonly T[],
 ) {
-  return [...tenants].sort(compareHanmacFamilyTenants);
+    return [...tenants].sort(compareHanmacFamilyTenants);
 }

 export function orderHanmacFamilyChildren<T extends HanmacFamilyOrderTenant>(
-  parent: HanmacFamilyOrderTenant,
-  children: readonly T[],
+    parent: HanmacFamilyOrderTenant,
+    children: readonly T[],
 ) {
-  return isHanmacFamilyRootTenant(parent)
-    ? orderHanmacFamilyTenants(children)
-    : [...children];
+    return isHanmacFamilyRootTenant(parent)
+        ? orderHanmacFamilyTenants(children)
+        : [...children];
 }
--- a/orgfront/src/features/orgchart/pickerTree.test.ts
+++ b/orgfront/src/features/orgchart/pickerTree.test.ts
@@ -3,179 +3,237 @@ import type { TenantSummary, UserSummary } from "../../lib/adminApi";
 import { buildOrgPickerTree } from "./pickerTree";

 function tenant(
-  id: string,
-  type: string,
-  name: string,
-  slug: string,
-  parentId?: string,
+    id: string,
+    type: string,
+    name: string,
+    slug: string,
+    parentId?: string,
 ): TenantSummary {
-  return {
-    id,
-    type,
-    name,
-    slug,
-    description: "",
-    status: "active",
-    parentId,
-    memberCount: 0,
-    createdAt: "2026-05-11T00:00:00.000Z",
-    updatedAt: "2026-05-11T00:00:00.000Z",
-  };
+    return {
+        id,
+        type,
+        name,
+        slug,
+        description: "",
+        status: "active",
+        parentId,
+        memberCount: 0,
+        createdAt: "2026-05-11T00:00:00.000Z",
+        updatedAt: "2026-05-11T00:00:00.000Z",
+    };
 }

 describe("buildOrgPickerTree", () => {
-  it("uses the hanmac-family company-group as the default picker root", () => {
-    const tenants = [
-      tenant("wrong-group", "COMPANY_GROUP", "Wrong Group", "wrong-group"),
-      tenant(
-        "wrong-company",
-        "COMPANY",
-        "Wrong Company",
-        "wrong-company",
-        "wrong-group",
-      ),
-      tenant("hanmac-family-id", "COMPANY_GROUP", "한맥가족", "hanmac-family"),
-      tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
-    ];
+    it("uses the hanmac-family company-group as the default picker root", () => {
+        const tenants = [
+            tenant(
+                "wrong-group",
+                "COMPANY_GROUP",
+                "Wrong Group",
+                "wrong-group",
+            ),
+            tenant(
+                "wrong-company",
+                "COMPANY",
+                "Wrong Company",
+                "wrong-company",
+                "wrong-group",
+            ),
+            tenant(
+                "hanmac-family-id",
+                "COMPANY_GROUP",
+                "한맥가족",
+                "hanmac-family",
+            ),
+            tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
+        ];

-    const tree = buildOrgPickerTree({
-      tenants,
-      users: [] satisfies UserSummary[],
+        const tree = buildOrgPickerTree({
+            tenants,
+            users: [] satisfies UserSummary[],
+        });
+
+        expect(tree.companyGroupId).toBe("hanmac-family-id");
+        expect(tree.roots).toHaveLength(1);
+        expect(tree.roots[0]?.id).toBe("hanmac-family-id");
+        expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
+            "saman-id",
+        ]);
    });

-    expect(tree.companyGroupId).toBe("hanmac-family-id");
-    expect(tree.roots).toHaveLength(1);
-    expect(tree.roots[0]?.id).toBe("hanmac-family-id");
-    expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
-      "saman-id",
-    ]);
-  });
+    it("orders hanmac-family children by the shared organization policy", () => {
+        const tenants = [
+            tenant(
+                "hanmac-family-id",
+                "COMPANY_GROUP",
+                "한맥가족",
+                "hanmac-family",
+            ),
+            tenant(
+                "baron-group-id",
+                "COMPANY_GROUP",
+                "바론그룹",
+                "baron-group",
+                "hanmac-family-id",
+            ),
+            tenant(
+                "hanmac-id",
+                "COMPANY",
+                "한맥기술",
+                "hanmac",
+                "hanmac-family-id",
+            ),
+            tenant(
+                "halla-id",
+                "COMPANY",
+                "한라산업개발",
+                "halla",
+                "hanmac-family-id",
+            ),
+            tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
+            tenant(
+                "gpdtdc-id",
+                "ORGANIZATION",
+                "총괄기획&기술개발센터",
+                "gpdtdc",
+                "hanmac-family-id",
+            ),
+        ];

-  it("orders hanmac-family children by the shared organization policy", () => {
-    const tenants = [
-      tenant("hanmac-family-id", "COMPANY_GROUP", "한맥가족", "hanmac-family"),
-      tenant(
-        "baron-group-id",
-        "COMPANY_GROUP",
-        "바론그룹",
-        "baron-group",
-        "hanmac-family-id",
-      ),
-      tenant("hanmac-id", "COMPANY", "한맥기술", "hanmac", "hanmac-family-id"),
-      tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
-      tenant(
-        "gpdtdc-id",
-        "ORGANIZATION",
-        "총괄기획&기술개발센터",
-        "gpdtdc",
-        "hanmac-family-id",
-      ),
-    ];
+        const tree = buildOrgPickerTree({
+            tenants,
+            users: [] satisfies UserSummary[],
+        });

-    const tree = buildOrgPickerTree({
-      tenants,
-      users: [] satisfies UserSummary[],
+        expect(tree.roots[0]?.children.map((node) => node.name)).toEqual([
+            "총괄기획&기술개발센터",
+            "삼안",
+            "한맥기술",
+            "바론그룹",
+            "한라산업개발",
+        ]);
    });

-    expect(tree.roots[0]?.children.map((node) => node.name)).toEqual([
-      "총괄기획&기술개발센터",
-      "삼안",
-      "한맥기술",
-      "바론그룹",
-    ]);
-  });
+    it("scopes descendant filtering by tenant slug", () => {
+        const tenants = [
+            tenant(
+                "hanmac-family-id",
+                "COMPANY_GROUP",
+                "한맥가족",
+                "hanmac-family",
+            ),
+            tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
+            tenant(
+                "planning-id",
+                "ORGANIZATION",
+                "기획팀",
+                "planning",
+                "saman-id",
+            ),
+            tenant(
+                "hanmac-id",
+                "COMPANY",
+                "한맥기술",
+                "hanmac",
+                "hanmac-family-id",
+            ),
+        ];

-  it("scopes descendant filtering by tenant slug", () => {
-    const tenants = [
-      tenant("hanmac-family-id", "COMPANY_GROUP", "한맥가족", "hanmac-family"),
-      tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
-      tenant("planning-id", "ORGANIZATION", "기획팀", "planning", "saman-id"),
-      tenant("hanmac-id", "COMPANY", "한맥기술", "hanmac", "hanmac-family-id"),
-    ];
+        const tree = buildOrgPickerTree({
+            tenants,
+            users: [] satisfies UserSummary[],
+            tenantId: "saman",
+        });

-    const tree = buildOrgPickerTree({
-      tenants,
-      users: [] satisfies UserSummary[],
-      tenantId: "saman",
+        expect(tree.roots).toHaveLength(1);
+        expect(tree.roots[0]?.id).toBe("saman-id");
+        expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
+            "planning-id",
+        ]);
    });

-    expect(tree.roots).toHaveLength(1);
-    expect(tree.roots[0]?.id).toBe("saman-id");
-    expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
-      "planning-id",
-    ]);
-  });
+    it("excludes internal and private tenants from picker choices by default", () => {
+        const tenants = [
+            tenant(
+                "hanmac-family-id",
+                "COMPANY_GROUP",
+                "한맥가족",
+                "hanmac-family",
+            ),
+            tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
+            {
+                ...tenant(
+                    "internal-id",
+                    "ORGANIZATION",
+                    "내부 조직",
+                    "internal",
+                    "saman-id",
+                ),
+                config: { visibility: "internal" },
+            },
+            {
+                ...tenant(
+                    "secret-id",
+                    "ORGANIZATION",
+                    "비공개 조직",
+                    "secret",
+                    "saman-id",
+                ),
+                config: { visibility: "private" },
+            },
+            tenant(
+                "secret-child-id",
+                "USER_GROUP",
+                "비공개 하위",
+                "secret-child",
+                "secret-id",
+            ),
+            tenant("open-id", "ORGANIZATION", "공개 조직", "open", "saman-id"),
+        ];

-  it("excludes internal and private tenants from picker choices by default", () => {
-    const tenants = [
-      tenant("hanmac-family-id", "COMPANY_GROUP", "한맥가족", "hanmac-family"),
-      tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
-      {
-        ...tenant(
-          "internal-id",
-          "ORGANIZATION",
-          "내부 조직",
-          "internal",
-          "saman-id",
-        ),
-        config: { visibility: "internal" },
-      },
-      {
-        ...tenant(
-          "secret-id",
-          "ORGANIZATION",
-          "비공개 조직",
-          "secret",
-          "saman-id",
-        ),
-        config: { visibility: "private" },
-      },
-      tenant(
-        "secret-child-id",
-        "USER_GROUP",
-        "비공개 하위",
-        "secret-child",
-        "secret-id",
-      ),
-      tenant("open-id", "ORGANIZATION", "공개 조직", "open", "saman-id"),
-    ];
+        const tree = buildOrgPickerTree({
+            tenants,
+            users: [] satisfies UserSummary[],
+            tenantId: "saman",
+        });

-    const tree = buildOrgPickerTree({
-      tenants,
-      users: [] satisfies UserSummary[],
-      tenantId: "saman",
+        expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
+            "open-id",
+        ]);
    });

-    expect(tree.roots[0]?.children.map((node) => node.id)).toEqual(["open-id"]);
-  });
+    it("includes internal tenants when explicitly requested", () => {
+        const tenants = [
+            tenant(
+                "hanmac-family-id",
+                "COMPANY_GROUP",
+                "한맥가족",
+                "hanmac-family",
+            ),
+            tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
+            {
+                ...tenant(
+                    "internal-id",
+                    "ORGANIZATION",
+                    "내부 조직",
+                    "internal",
+                    "saman-id",
+                ),
+                config: { visibility: "internal" },
+            },
+            tenant("open-id", "ORGANIZATION", "공개 조직", "open", "saman-id"),
+        ];

-  it("includes internal tenants when explicitly requested", () => {
-    const tenants = [
-      tenant("hanmac-family-id", "COMPANY_GROUP", "한맥가족", "hanmac-family"),
-      tenant("saman-id", "COMPANY", "삼안", "saman", "hanmac-family-id"),
-      {
-        ...tenant(
-          "internal-id",
-          "ORGANIZATION",
-          "내부 조직",
-          "internal",
-          "saman-id",
-        ),
-        config: { visibility: "internal" },
-      },
-      tenant("open-id", "ORGANIZATION", "공개 조직", "open", "saman-id"),
-    ];
+        const tree = buildOrgPickerTree({
+            includeInternal: true,
+            tenants,
+            users: [] satisfies UserSummary[],
+            tenantId: "saman",
+        });

-    const tree = buildOrgPickerTree({
-      includeInternal: true,
-      tenants,
-      users: [] satisfies UserSummary[],
-      tenantId: "saman",
+        expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
+            "internal-id",
+            "open-id",
+        ]);
    });
-
-    expect(tree.roots[0]?.children.map((node) => node.id)).toEqual([
-      "internal-id",
-      "open-id",
-    ]);
-  });
 });