@7365admin1/layer-common 4.0.3-staging.231 → 4.0.3-staging.233

package/components/HidReaderManagement.vue

@@ -311,9 +311,7 @@ type HidSyncUser = HidRecord & {
 };
 
 type HidSyncPayload = {
-  objects: Array<{ object: "users"; values: HidSyncUser[] }>;
   users: HidSyncUser[];
-  unmappedCount: number;
   stats: { newEnrolled: number; updatedInformation: number; facialData: number };
   defaultMessage: string;
 };
@@ -331,12 +329,10 @@ const {
   updateReader,
   deleteReader,
   testReader,
-  syncReaderFacialData,
   configureReaderIntegration,
   setReaderMonitor,
   setReaderOperatingMode,
-  getIdentities,
-  runObjectOperation,
+  getReaderUsers,
 } = useHidAmico();
 
 const readers = ref<HidRecord[]>([]);
@@ -594,48 +590,11 @@ async function runConfirmedAction() {
 
       actionStage.value = "loading";
       const payload = syncPreviewPayload.value;
-      const unmappedCount = Number(payload.unmappedCount || 0);
-
-      if (!payload.objects.length) {
-        const facialSync = await syncReaderFacialData(selectedReader.value._id);
-        const facialStats = toFacialSyncStats(facialSync);
-        if (unmappedCount) {
-          const message = [
-            syncMessage.value || `Found ${unmappedCount} HID user(s) that must be linked from the HID User Mapping screen.`,
-            facialStats.message,
-          ].filter(Boolean).join(" ");
-          await applyReaderSyncState(selectedReader.value._id, "completed", message);
-          showResult(true, "Sync Review Required", message, {
-            readerName: selectedReader.value.name || "HID Reader",
-            stats: { ...syncPreviewStats.value, facialData: facialStats.syncedCount },
-          });
-          confirmDialog.value = false;
-          resetActionFlow();
-          await loadReaders();
-          return;
-        }
-
-        const message = syncMessage.value || "No active HID users found to sync.";
-        await applyReaderSyncState(selectedReader.value._id, "failed", message);
-        showResult(false, "Sync Device Failed", message);
-        confirmDialog.value = false;
-        resetActionFlow();
-        await loadReaders();
-        return;
-      }
-      const result = await syncHidUsers(selectedReader.value._id, payload.users);
-      const facialSync = await syncReaderFacialData(selectedReader.value._id);
-      const facialStats = toFacialSyncStats(facialSync);
-      const mappingMessage = unmappedCount
-        ? `${unmappedCount} HID user(s) still need to be linked from the HID User Mapping screen.`
-        : "";
-      const message = [syncMessage.value, result.message, facialStats.message, mappingMessage]
-        .filter(Boolean)
-        .join(" ");
+      const message = syncMessage.value || `Read ${payload.users.length} HID user(s) directly from Amico.`;
       await applyReaderSyncState(selectedReader.value._id, "completed", message);
       showResult(true, "Sync Successful", message, {
         readerName: selectedReader.value.name || "HID Reader",
-        stats: { ...syncPreviewStats.value, facialData: facialStats.syncedCount },
+        stats: syncPreviewStats.value,
       });
     }
     if (pendingAction.value === "delete") {
@@ -698,163 +657,31 @@ async function applyReaderSyncState(readerId: string, status: "completed" | "fai
 }
 
 async function buildSyncPayload(readerId: string) {
-  const response = await getIdentities(readerId, {
+  const readerResponse = await getReaderUsers(readerId, {
     page: 1,
-    limit: 500,
-    status: "active",
+    limit: 100,
+    includeVisitors: true,
   });
-  let identities = response?.items ?? response?.data?.items ?? response?.data?.identities ?? [];
-
-  if (!identities.length) {
-    const hidResponse = await runObjectOperation(readerId, {
-      operation: "load",
-      object: "users",
-      limit: 500,
-      offset: 0,
-    });
-    const hidUsers = normalizeHidUsers(hidResponse);
-    return {
-      objects: [],
-      users: [],
-      unmappedCount: hidUsers.length,
-      stats: {
-        newEnrolled: 0,
-        updatedInformation: 0,
-        facialData: countFacialData(hidUsers),
-      },
-      defaultMessage: hidUsers.length
-        ? `Found ${hidUsers.length} HID user(s) that must be linked from the HID User Mapping screen.`
-        : "",
-    };
-  }
-
-  const allLinkedIds = new Set(
-    identities
-      .map((identity) => Number(identity.hidUserId))
-      .filter((id: number) => Number.isInteger(id) && id > 0),
-  );
-  const users = identities
-    .filter((identity) => (
-      identity.type !== "visitor"
-      && (identity.metadata as Record<string, unknown> | undefined)?.temporary !== true
-    ))
-    .map(toHidUserObject)
+  const readerData = readerResponse?.data ?? readerResponse;
+  const directUsers = Array.isArray(readerResponse?.items)
+    ? readerResponse.items
+    : Array.isArray(readerData?.items) ? readerData.items : [];
+  const users = directUsers
+    .map((user) => toHidUserObject(user as HidRecord))
     .filter((user): user is HidSyncUser => user !== null);
-  const existingHidUsers = await getExistingHidUsers(readerId);
-  const existingIds = new Set(existingHidUsers.map((user) => Number(user.hidUserId)));
-  const hidUsersToImport = existingHidUsers.filter((user) => {
-    const hidUserId = Number(user.hidUserId);
-    return Number.isInteger(hidUserId) && hidUserId > 0 && !allLinkedIds.has(hidUserId);
-  });
-  const newEnrolled = users.filter((user) => !existingIds.has(Number(user.id))).length;
-  const updatedInformation = users.filter((user) => existingIds.has(Number(user.id))).length;
-  const totalUsersToSync = users.length;
 
   return {
-    objects: users.length
-      ? [
-          {
-            object: "users",
-            values: users,
-          },
-        ]
-      : [],
     users,
-    unmappedCount: hidUsersToImport.length,
     stats: {
-      newEnrolled,
-      updatedInformation,
-      facialData: countFacialData([...users, ...hidUsersToImport]),
+      newEnrolled: users.length,
+      updatedInformation: 0,
+      facialData: countFacialData(directUsers as HidRecord[]),
     },
-    defaultMessage: [
-      totalUsersToSync ? `Ready to sync ${totalUsersToSync} linked HID user(s).` : "",
-      hidUsersToImport.length
-        ? `${hidUsersToImport.length} HID user(s) must be linked from the HID User Mapping screen.`
-        : "",
-    ].filter(Boolean).join(" "),
-  };
-}
-
-async function syncHidUsers(readerId: string, users: HidSyncUser[]) {
-  const existingIds = await getExistingHidUserIds(readerId);
-  const usersToCreate = users.filter((user) => !existingIds.has(Number(user.id)));
-  const usersToModify = users.filter((user) => existingIds.has(Number(user.id)));
-  const results: HidRecord[] = [];
-
-  if (usersToModify.length) {
-    const modifyResults = [];
-    for (const user of usersToModify) {
-      const result = await runObjectOperation(readerId, {
-        operation: "modify",
-        object: "users",
-        where: {
-          users: {
-            id: user.id,
-          },
-        },
-        values: toHidUserValues(user),
-      });
-      modifyResults.push(result);
-    }
-    results.push({ operation: "modify", count: usersToModify.length, result: modifyResults });
-  }
-
-  if (usersToCreate.length) {
-    const result = await runObjectOperation(readerId, {
-      operation: "create",
-      object: "users",
-      values: usersToCreate.map(toHidUserCreateValues),
-    });
-    results.push({ operation: "create", count: usersToCreate.length, result });
-  }
-
-  for (const user of users) {
-    await syncHidUserRole(readerId, user.id, user._identityType === "admin");
-  }
-
-  return {
-    results,
-    message: `Synced ${users.length} HID user(s). ${usersToModify.length} updated, ${usersToCreate.length} created.`,
+    defaultMessage: users.length
+      ? `Read ${users.length} HID user(s) directly from Amico.`
+      : "No HID users found on this reader.",
   };
-}
-
-async function getExistingHidUserIds(readerId: string) {
-  const users = await getExistingHidUsers(readerId);
-  return new Set(users.map((user) => Number(user.hidUserId)));
-}
 
-async function getExistingHidUsers(readerId: string) {
-  const hidResponse = await runObjectOperation(readerId, {
-    operation: "load",
-    object: "users",
-    limit: 500,
-    offset: 0,
-  });
-  return normalizeHidUsers(hidResponse);
-}
-
-function normalizeHidUsers(response: HidRecord) {
-  const users =
-    response?.data?.users ||
-    response?.data?.data?.users ||
-    response?.users ||
-    [];
-
-  return Array.isArray(users)
-    ? users
-      // Visitor QR passes are linked by their visitor transaction and must not
-      // be offered for manual HID user mapping or counted as unmapped users.
-      .filter((user) => Number(user?.user_type_id) !== 1)
-      .map((user) => ({
-        hidUserId: user.id,
-        registration: user.registration,
-        cardNo: user.card_value || user.cardNo,
-        name: user.name,
-        metadata: {
-          name: user.name,
-        },
-      }))
-    : [];
 }
 
 function toHidUserObject(identity: HidRecord): HidSyncUser | null {
@@ -872,89 +699,6 @@ function toHidUserObject(identity: HidRecord): HidSyncUser | null {
   };
 }
 
-function toHidUserCreateValues(user: HidSyncUser) {
-  return {
-    id: user.id,
-    ...toHidUserValues(user),
-  };
-}
-
-function toHidUserValues(user: HidSyncUser) {
-  return {
-    name: user.name,
-    registration: user.registration || "",
-  };
-}
-
-async function syncHidUserRole(readerId: string, hidUserId: unknown, isAdministrator: boolean) {
-  const userId = toHidNumericId(hidUserId);
-  if (!readerId || !userId) return;
-
-  const existingRole = await getHidUserRole(readerId, userId);
-  if (isAdministrator) {
-    if (existingRole) {
-      await runObjectOperation(readerId, {
-        operation: "modify",
-        object: "user_roles",
-        where: {
-          user_roles: {
-            user_id: userId,
-          },
-        },
-        values: {
-          role: 1,
-        },
-      });
-      return;
-    }
-
-    await runObjectOperation(readerId, {
-      operation: "create",
-      object: "user_roles",
-      values: [
-        {
-          user_id: userId,
-          role: 1,
-        },
-      ],
-    });
-    return;
-  }
-
-  if (existingRole) {
-    await runObjectOperation(readerId, {
-      operation: "destroy",
-      object: "user_roles",
-      where: {
-        user_roles: {
-          user_id: userId,
-        },
-      },
-    });
-  }
-}
-
-async function getHidUserRole(readerId: string, userId: number) {
-  const response = await runObjectOperation(readerId, {
-    operation: "load",
-    object: "user_roles",
-    where: {
-      user_roles: {
-        user_id: userId,
-      },
-    },
-    limit: 1,
-    offset: 0,
-  });
-  const data = response?.data || response || {};
-  const roles =
-    data?.user_roles ||
-    data?.data?.user_roles ||
-    data?.result?.user_roles ||
-    [];
-  return Array.isArray(roles) ? roles[0] : undefined;
-}
-
 function toHidNumericId(value: unknown) {
   const raw = String(value ?? "").trim();
   if (!raw) return undefined;
@@ -983,16 +727,6 @@ function countFacialData(users: HidRecord[]) {
   return users.filter((user) => user.face || user.photo || user.image || user.imageUrl || user.faceImage).length;
 }
 
-function toFacialSyncStats(response: unknown) {
-  const root = asHidRecord(response);
-  const data = asHidRecord(root.data ?? root);
-  const syncedCount = Number(data.syncedCount);
-  return {
-    syncedCount: Number.isSafeInteger(syncedCount) && syncedCount >= 0 ? syncedCount : 0,
-    message: String(data.message || "").trim(),
-  };
-}
-
 function getFriendlyHidError(error: unknown) {
   const message = getHidErrorMessage(error);
   const lowerMessage = message.toLowerCase();