abmp-npm 2.0.54 → 2.0.55

package/backend/cms-data-methods.js

@@ -148,7 +148,9 @@ function buildMembersSearchQuery(data) {
               latitude: filter.latitude,
               longitude: filter.longitude,
             },
-            findMainAddress(item.addressDisplayOption, item.addresses)
+            findMainAddress(item.addressDisplayOption, item.addresses, {
+              requireValidCoordinates: true,
+            })
           ),
         }));
         const resultWithDistances = {

package/backend/daily-pull/bulk-process-methods.js

@@ -16,7 +16,8 @@ async function ensureUniqueUrlsInBatch(memberDataList) {
     return memberDataList;
   }
 
-  // Group members by their normalized base URL
+  // Group members by their normalized base URL (case-insensitive to avoid
+  // "John-12" and "john-12" being treated as different when slugs are matched case-insensitively)
   const urlGroups = new Map();
 
   memberDataList.forEach(member => {
@@ -24,16 +25,17 @@ async function ensureUniqueUrlsInBatch(memberDataList) {
       return;
     }
 
-    // Extract the base URL (without any counter) for grouping
     const baseUrl = extractBaseUrl(member.url);
-    if (!urlGroups.has(baseUrl)) {
-      urlGroups.set(baseUrl, []);
+    const groupKey = baseUrl.toLowerCase();
+    if (!urlGroups.has(groupKey)) {
+      urlGroups.set(groupKey, []);
     }
-    urlGroups.get(baseUrl).push(member);
+    urlGroups.get(groupKey).push(member);
   });
 
   // For each group, check database and assign unique URLs sequentially
-  for (const [baseUrl, members] of urlGroups.entries()) {
+  for (const [groupKey, members] of urlGroups.entries()) {
+    const baseUrl = groupKey; // lowercase for consistent slug assignment
     if (members.length <= 1) {
       // Single member - still check DB to ensure it doesn't conflict with other pages
       const member = members[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.54",
+  "version": "2.0.55",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",

package/public/Utils/sharedUtils.js

@@ -66,20 +66,31 @@ function debouncedFunction({ func, debounceTimeout, timeoutType, args }) {
 
 const isValidLocation = location => location.latitude && location.longitude;
 
-function findMainAddress(addressDisplayOption = [], addresses = []) {
-  const options = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
-  const mainOpt = options.find(opt => opt.isMain);
+/**
+ * @param {Array} addressDisplayOption
+ * @param {Array} addresses
+ * @param {Object|boolean} [options] - Optional. Pass { requireValidCoordinates: true } for home search/distance; omit or false for profile display.
+ */
+function findMainAddress(addressDisplayOption = [], addresses = [], options = {}) {
+  const requireValidCoordinates =
+    typeof options === 'boolean' ? options : Boolean(options?.requireValidCoordinates);
+  const optionsArr = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
+  const mainOpt = optionsArr.find(opt => opt.isMain);
   if (mainOpt) {
     const mainAddr = addresses.find(
-      addr => addr.key === mainOpt.key && addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW
+      addr =>
+        addr.key === mainOpt.key &&
+        addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW &&
+        (!requireValidCoordinates || isValidLocation(addr))
     );
-    if (mainAddr && isValidLocation(mainAddr)) {
+    if (mainAddr) {
       return mainAddr;
     }
   }
-  // 2) fallback: if there is any visible address, use it
   const visibleAddresses = addresses.filter(
-    addr => addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW && isValidLocation(addr)
+    addr =>
+      addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW &&
+      (!requireValidCoordinates || isValidLocation(addr))
   );
   if (visibleAddresses.length) {
     return visibleAddresses[0];
@@ -107,8 +118,13 @@ function formatAddress(item) {
   return addressParts.filter(Boolean).join(', ');
 }
 
-function getMainAddress(addressDisplayOption = [], addresses = []) {
-  const mainAddr = findMainAddress(addressDisplayOption, addresses);
+/**
+ * @param {Array} addressDisplayOption
+ * @param {Array} addresses
+ * @param {Object|boolean} [options] - Optional. Pass { requireValidCoordinates: true } for home search/distance; omit or false for profile display.
+ */
+function getMainAddress(addressDisplayOption = [], addresses = [], options = {}) {
+  const mainAddr = findMainAddress(addressDisplayOption, addresses, options);
   if (mainAddr) {
     return formatAddress(mainAddr);
   }