@7365admin1/core 3.41.0 → 3.41.1

package/dist/index.mjs

@@ -11249,8 +11249,9 @@ function useSiteRepo() {
     } catch (error2) {
       throw new BadRequestError18("Invalid org ID format.");
     }
+    const escapedName = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const query = {
-      name: { $regex: new RegExp(`^${name}$`, "i") },
+      name: { $regex: new RegExp(`^${escapedName}$`, "i") },
       // Case-insensitive exact match
       orgId,
       status: { $ne: "deleted" }
@@ -32346,7 +32347,57 @@ import {
   useAtlas as useAtlas46,
   NotFoundError as NotFoundError20
 } from "@7365admin1/node-server-utils";
+
+// src/utils/site-name.util.ts
 import levenshtein from "fast-levenshtein";
+var ROMAN = /^(?=[ivx])(x{0,3})(ix|iv|v?i{0,3})$/;
+var ROMAN_VALUE = { i: 1, v: 5, x: 10 };
+function normalizeSiteName(name) {
+  return String(name ?? "").normalize("NFKC").toLowerCase().replace(/[‘’']/g, "").replace(/[^a-z0-9]+/g, " ").trim();
+}
+function romanToNumber(token) {
+  let total = 0;
+  for (let i = 0; i < token.length; i++) {
+    const value = ROMAN_VALUE[token[i]];
+    const next = ROMAN_VALUE[token[i + 1]];
+    total += next && next > value ? -value : value;
+  }
+  return total;
+}
+function distinguishingTokens(normalized) {
+  if (!normalized)
+    return [];
+  return normalized.split(" ").filter((t) => /^\d+$/.test(t) || ROMAN.test(t) || /^[a-z]$/.test(t)).map((t) => ROMAN.test(t) ? String(romanToNumber(t)) : t);
+}
+function matchSiteName(candidate, existing) {
+  const a = normalizeSiteName(candidate);
+  const b = normalizeSiteName(existing);
+  if (!a || !b)
+    return null;
+  if (a === b)
+    return "duplicate";
+  const tokensA = distinguishingTokens(a).join(" ");
+  const tokensB = distinguishingTokens(b).join(" ");
+  if (tokensA !== tokensB)
+    return null;
+  return levenshtein.get(a, b) <= 2 ? "near-duplicate" : null;
+}
+function findSiteNameClash(candidate, existingNames) {
+  for (const name of existingNames) {
+    const match = matchSiteName(candidate, name);
+    if (match)
+      return { name, match };
+  }
+  return null;
+}
+function siteNameClashMessage(existingName, match) {
+  if (match === "duplicate") {
+    return `A site called "${existingName}" already exists in this organisation. Give the new site a different name, or edit "${existingName}" instead.`;
+  }
+  return `This name is within a character or two of "${existingName}", which already exists in this organisation. If it is the same property, edit "${existingName}" instead. If it is a different one, include what tells them apart \u2014 the block, tower, phase, or number \u2014 and save again.`;
+}
+
+// src/services/customer-site.service.ts
 function useCustomerSiteService() {
   const { add: _add, updateCustomerSiteById, getById: _getById } = useCustomerSiteRepo();
   const {
@@ -32368,20 +32419,18 @@ function useCustomerSiteService() {
       const exactMatches = await getSiteByExactName(value.name, value.siteOrg);
       if (exactMatches && exactMatches.length > 0) {
         throw new BadRequestError91(
-          "Site with this name already exists in the organization."
+          siteNameClashMessage(exactMatches[0].name, "duplicate")
         );
       }
-      const threshold = 2;
       const sites = await getSiteByName(value.name);
-      if (sites && sites.length > 0) {
-        const similar = sites.filter((doc) => {
-          return doc.orgId && doc.name && doc.orgId.toString() === value.siteOrg.toString() && levenshtein.get(value.name.toLowerCase(), doc.name.toLowerCase()) <= threshold;
-        });
-        if (similar.length > 0) {
-          throw new BadRequestError91(
-            "Failed to add site, site with closely similar name found. Please contact seven365 support."
-          );
-        }
+      const candidates = (sites ?? []).filter(
+        (doc) => doc.orgId && doc.name && doc.orgId.toString() === value.siteOrg.toString()
+      ).map((doc) => doc.name);
+      const clash = findSiteNameClash(value.name, candidates);
+      if (clash) {
+        throw new BadRequestError91(
+          siteNameClashMessage(clash.name, clash.match)
+        );
       }
       const siteId = await createSite(
         {