테넌트 목록 조회 cursor기반으로 재구성. 사용자 metadata 미사용 필드 제거

adminfront/src/features/users/UserCreatePage.tsx

@@ -42,11 +42,10 @@ import {
   type UserAppointment,
   type UserCreateRequest,
   type UserCreateResponse,
-  createTenant,
   createUser,
+  fetchAllTenants,
   fetchMe,
   fetchTenant,
-  fetchTenants,
 } from "../../lib/adminApi";
 import { t } from "../../lib/i18n";
 import {
@@ -56,9 +55,10 @@ import {
   parseOrgChartTenantSelection,
 } from "./orgChartPicker";
 import type { UserSchemaField } from "./userSchemaFields";
+import { resolvePersonalTenant } from "./utils/personalTenant";
 
 type UserFormValues = UserCreateRequest & { metadata: Record<string, unknown> };
-type UserType = "hanmac" | "external" | "personal";
+type UserCategory = "hanmac" | "external" | "personal";
 
 type PickerTarget = { kind: "appointment"; index: number };
 
@@ -114,8 +114,8 @@ function UserCreatePage() {
   >(null);
   const [createdEmail, setCreatedEmail] = React.useState<string | null>(null);
   const [autoPassword, setAutoPassword] = React.useState(true);
-  const [isHanmacFamily, setIsHanmacFamily] = React.useState(true);
-  const [userType, setUserType] = React.useState<UserType>("hanmac");
+  const [userCategory, setUserCategory] =
+    React.useState<UserCategory>("hanmac");
   const [additionalAppointments, setAdditionalAppointments] = React.useState<
     AppointmentDraft[]
   >([]);
@@ -125,8 +125,8 @@ function UserCreatePage() {
   const [isResolvingTenant, setIsResolvingTenant] = React.useState(false);
 
   const { data: tenantsData } = useQuery({
-    queryKey: ["tenants", { limit: 100 }],
-    queryFn: () => fetchTenants(100, 0),
+    queryKey: ["tenants", "all"],
+    queryFn: () => fetchAllTenants(),
   });
   const tenants = tenantsData?.items ?? [];
 
@@ -177,17 +177,11 @@ function UserCreatePage() {
 
   const selectedTenantSlug = watch("tenantSlug");
   const personalTenant = React.useMemo(
-    () =>
-      tenants.find(
-        (tenant) =>
-          tenant.slug === "personal" ||
-          (tenant.type === "PERSONAL" &&
-            tenant.name.toLowerCase() === "personal"),
-      ),
+    () => resolvePersonalTenant(tenants),
     [tenants],
   );
   const selectedTenant =
-    userType !== "external"
+    userCategory !== "external"
       ? undefined
       : nonHanmacFamilyTenants.find((t) => t.slug === selectedTenantSlug);
 
@@ -231,7 +225,7 @@ function UserCreatePage() {
   const pickerUrl = buildAuthenticatedOrgChartTenantPickerUrl(
     import.meta.env.ORGFRONT_URL,
     {
-      tenantId: userType === "hanmac" ? hanmacFamilyTenantId : undefined,
+      tenantId: userCategory === "hanmac" ? hanmacFamilyTenantId : undefined,
     },
   );
 
@@ -310,25 +304,16 @@ function UserCreatePage() {
     );
   };
 
-  const handleUserTypeChange = (value: string) => {
-    const nextType = value as UserType;
-    setUserType(nextType);
-    setIsHanmacFamily(nextType === "hanmac");
-    if (nextType !== "hanmac") {
+  const handleUserCategoryChange = (value: string) => {
+    const nextCategory = value as UserCategory;
+    setUserCategory(nextCategory);
+    if (nextCategory !== "hanmac") {
       setAdditionalAppointments([]);
     }
   };
 
   const ensurePersonalTenant = async () => {
-    if (personalTenant) return personalTenant;
-    const tenant = await createTenant({
-      name: "Personal",
-      slug: "personal",
-      type: "PERSONAL",
-      status: "active",
-    });
-    queryClient.invalidateQueries({ queryKey: ["tenants"] });
-    return tenant;
+    return personalTenant;
   };
 
   const mutation = useMutation({
@@ -355,10 +340,13 @@ function UserCreatePage() {
     setGeneratedPassword(null);
     setCreatedEmail(null);
 
+    const {
+      hanmacFamily: _hanmacFamily,
+      userType: _userType,
+      ...formMetadata
+    } = data.metadata ?? {};
     const metadata: Record<string, unknown> = {
-      ...(data.metadata ?? {}),
-      hanmacFamily: userType === "hanmac" && isHanmacFamily,
-      userType,
+      ...formMetadata,
     };
 
     const payload: UserCreateRequest = {
@@ -369,7 +357,7 @@ function UserCreatePage() {
       metadata,
     };
 
-    if (userType === "external") {
+    if (userCategory === "external") {
       if (!data.tenantSlug) {
         setError(
           t(
@@ -386,7 +374,7 @@ function UserCreatePage() {
       payload.jobTitle = data.jobTitle;
     }
 
-    if (userType === "personal") {
+    if (userCategory === "personal") {
       try {
         const tenant = await ensurePersonalTenant();
         payload.tenantSlug = tenant.slug;
@@ -405,7 +393,7 @@ function UserCreatePage() {
       }
     }
 
-    if (userType === "hanmac") {
+    if (userCategory === "hanmac") {
       const appointments = additionalAppointments
         .filter((appointment) => appointment.tenantId)
         .map((appointment) => ({
@@ -644,7 +632,7 @@ function UserCreatePage() {
               </div>
             </div>
 
-            <Tabs value={userType} onValueChange={handleUserTypeChange}>
+            <Tabs value={userCategory} onValueChange={handleUserCategoryChange}>
               <TabsList className="flex h-auto w-full justify-start rounded-none border-b bg-transparent p-0 text-foreground">
                 <TabsTrigger
                   value="hanmac"