abmp-npm 1.1.80 → 1.1.82

package/backend/consts.js

@@ -1,5 +1,4 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
-const BACKUP_API_URL = 'https://psdevteamenterpris.wixstudio.com/abmp-backup/_functions';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
 
 /**
@@ -41,5 +40,4 @@ module.exports = {
   COMPILED_FILTERS_FIELDS,
   MEMBERSHIPS_TYPES,
   SSO_TOKEN_AUTH_API_URL,
-  BACKUP_API_URL,
 };

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

@@ -1,7 +1,115 @@
-const { bulkSaveMembers } = require('../members-data-methods');
+const { bulkSaveMembers, getMemberBySlug } = require('../members-data-methods');
 
 const { generateUpdatedMemberData } = require('./process-member-methods');
-const { changeWixMembersEmails } = require('./utils');
+const { changeWixMembersEmails, extractUrlCounter, incrementUrlCounter } = require('./utils');
+
+/**
+ * Ensures unique URLs within a batch of members by deduplicating URLs
+ * Groups members by their base URL (normalized) and assigns unique counters
+ * Also checks database to handle cross-page conflicts
+ * @param {Array} memberDataList - Array of processed member data
+ * @returns {Promise<Array>} - Array of members with unique URLs assigned
+ */
+async function ensureUniqueUrlsInBatch(memberDataList) {
+  if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
+    return memberDataList;
+  }
+
+  // Group members by their normalized base URL
+  const urlGroups = new Map();
+
+  memberDataList.forEach(member => {
+    if (!member || !member.url) {
+      return;
+    }
+
+    const baseUrl = member.url;
+    if (!urlGroups.has(baseUrl)) {
+      urlGroups.set(baseUrl, []);
+    }
+    urlGroups.get(baseUrl).push(member);
+  });
+
+  // For each group, check database and assign unique URLs sequentially
+  for (const [baseUrl, members] of urlGroups.entries()) {
+    if (members.length <= 1) {
+      // Single member - still check DB to ensure it doesn't conflict with other pages
+      const member = members[0];
+      if (member) {
+        const dbMember = await getMemberBySlug({
+          slug: baseUrl,
+          excludeDropped: false,
+          normalizeSlugForComparison: true,
+        });
+
+        if (dbMember && dbMember.url) {
+          // Conflict found in DB, need to add counter
+          member.url = incrementUrlCounter(dbMember.url, baseUrl);
+          console.log(
+            `Found DB conflict for single member with base URL "${baseUrl}", assigned: ${member.url}`
+          );
+        }
+      }
+      continue;
+    }
+
+    // Sort members to ensure consistent ordering (by memberId for determinism)
+    members.sort((a, b) => {
+      if (a.memberId && b.memberId) {
+        return String(a.memberId).localeCompare(String(b.memberId));
+      }
+      return 0;
+    });
+
+    // Check database for existing members with this base URL to find highest counter
+    const dbMember = await getMemberBySlug({
+      slug: baseUrl,
+      excludeDropped: false,
+      normalizeSlugForComparison: true,
+    });
+
+    const dbMaxCounter = extractUrlCounter(dbMember?.url);
+
+    // Find the highest existing counter among all members in this batch group
+    let batchMaxCounter = -1;
+    members.forEach(member => {
+      const originalUrl = member.url;
+      const urlParts = originalUrl.split('-');
+      const lastSegment = urlParts[urlParts.length - 1];
+      const isNumeric = /^\d+$/.test(lastSegment);
+      if (isNumeric) {
+        const counter = parseInt(lastSegment, 10);
+        if (counter > batchMaxCounter) {
+          batchMaxCounter = counter;
+        }
+      }
+    });
+
+    // Start index from the maximum of DB counter and batch counter + 1
+    const maxCounter = Math.max(dbMaxCounter, batchMaxCounter);
+    const startIndex = maxCounter + 1;
+
+    // Assign unique URLs: start from the appropriate index
+    members.forEach((member, index) => {
+      const assignedIndex = startIndex + index;
+      if (assignedIndex === 0) {
+        // Index 0 means no counter, use baseUrl
+        member.url = baseUrl;
+      } else {
+        // Index > 0 means add counter
+        member.url = `${baseUrl}-${assignedIndex}`;
+      }
+    });
+
+    console.log(
+      `Deduplicated ${members.length} members with base URL "${baseUrl}" (DB max: ${dbMaxCounter}, batch max: ${batchMaxCounter}, start: ${startIndex}): ${members
+        .map(m => m.url)
+        .join(', ')}`
+    );
+  }
+
+  return memberDataList;
+}
 
 /**
  * Processes and saves multiple member records in bulk
@@ -37,6 +145,9 @@ const bulkProcessAndSaveMemberData = async ({
       data => data !== null && data !== undefined
     );
 
+    // Ensure unique URLs within the batch to prevent duplicates (also checks DB for cross-page conflicts)
+    await ensureUniqueUrlsInBatch(validMemberData);
+
     if (validMemberData.length === 0) {
       return {
         totalProcessed: memberDataList.length,
@@ -73,4 +184,4 @@ const bulkProcessAndSaveMemberData = async ({
   }
 };
 
-module.exports = { bulkProcessAndSaveMemberData };
+module.exports = { bulkProcessAndSaveMemberData, ensureUniqueUrlsInBatch };

package/backend/daily-pull/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   ...require('./sync-to-cms-methods'),
   ...require('./consts'), //TODO: remove it once we finish NPM movement
+  ...require('./bulk-process-methods'),
 };

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

@@ -39,7 +39,7 @@ const ensureUniqueUrl = async ({ url, memberId, fullName }) => {
 
   const existingMember = await getMemberBySlug({
     slug: uniqueUrl,
-    excludeDropped: true,
+    excludeDropped: false,
     excludeSearchedMember: true,
     memberId,
     normalizeSlugForComparison: true,

package/backend/daily-pull/utils.js

@@ -15,6 +15,24 @@ const changeWixMembersEmails = async toChangeWixMembersEmails => {
   );
 };
 
+const extractUrlCounter = url => {
+  if (!url) return -1;
+  const lastSegment = url.split('-').pop() || '0';
+  const isNumeric = /^\d+$/.test(lastSegment);
+  return isNumeric ? parseInt(lastSegment, 10) : -1;
+};
+
+const incrementUrlCounter = (existingUrl, baseUrl) => {
+  if (existingUrl && existingUrl === baseUrl) {
+    console.log(
+      `Found member with same url ${existingUrl} for baseUrl ${baseUrl}, increasing counter by 1`
+    );
+    const lastSegment = existingUrl.split('-').pop() || '0';
+    const isNumeric = /^\d+$/.test(lastSegment);
+    const lastCounter = isNumeric ? parseInt(lastSegment, 10) : 0;
+    return `${baseUrl}-${lastCounter + 1}`;
+  }
+};
 /**
  * Validates core member data requirements
  * @param {Object} inputMemberData - Raw member data from API to validate
@@ -75,4 +93,6 @@ module.exports = {
   validateCoreMemberData,
   containsNonEnglish,
   createFullName,
+  extractUrlCounter,
+  incrementUrlCounter,
 };

package/backend/members-data-methods.js

@@ -273,7 +273,7 @@ async function urlExists(url, excludeMemberId) {
     let query = wixData
       .query(COLLECTIONS.MEMBERS_DATA)
       .contains('url', url)
-      .ne('action', MEMBER_ACTIONS.DROP);
+      .ne('action', MEMBER_ACTIONS.DROP); //TODO: change it to wix search
 
     if (excludeMemberId) {
       query = query.ne('memberId', excludeMemberId);

package/backend/pac-api-methods.js

@@ -1,4 +1,4 @@
-const { PAC_API_URL: _PAC_API_URL, BACKUP_API_URL } = require('./consts');
+const { PAC_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
 const getHeaders = async () => {
@@ -9,7 +9,7 @@ const getHeaders = async () => {
   return headers;
 };
 const fetchPACMembers = async (pageNum, actionFilter) => {
-  const url = `${BACKUP_API_URL}/Members?page=${pageNum}&actionFilter=${actionFilter}`;
+  const url = `${PAC_API_URL}/Members?page=${pageNum}&actionFilter=${actionFilter}`;
   const headers = await getHeaders();
   const fetchOptions = {
     method: 'get',

package/package.json

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