abmp-npm 1.10.4 → 1.10.6

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

@@ -1,7 +1,123 @@
-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,
+  extractBaseUrl,
+} = 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;
+    }
+
+    // Extract the base URL (without any counter) for grouping
+    const baseUrl = extractBaseUrl(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
+    members.sort((a, b) => {
+      if (a.url && b.url) {
+        return String(a.url).localeCompare(String(b.url));
+      }
+      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
@@ -36,7 +152,6 @@ const bulkProcessAndSaveMemberData = async ({
     const validMemberData = processedMemberDataList.filter(
       data => data !== null && data !== undefined
     );
-
     if (validMemberData.length === 0) {
       return {
         totalProcessed: memberDataList.length,
@@ -45,9 +160,14 @@ const bulkProcessAndSaveMemberData = async ({
         processingTime: Date.now() - startTime,
       };
     }
+    const newMembers = validMemberData.filter(data => data.isNewToDb);
+    const existingMembers = validMemberData.filter(data => !data.isNewToDb);
+    // Ensure unique URLs within the batch to prevent duplicates (also checks DB for cross-page conflicts)
+    const uniqueUrlsNewToDBMembersList = await ensureUniqueUrlsInBatch(newMembers);
+    const uniqueUrlsMembersData = [...uniqueUrlsNewToDBMembersList, ...existingMembers];
     const toChangeWixMembersEmails = [];
-    const toSaveMembersData = validMemberData.map(member => {
-      const { isLoginEmailChanged, ...restMemberData } = member;
+    const toSaveMembersData = uniqueUrlsMembersData.map(member => {
+      const { isLoginEmailChanged, isNewToDb: _isNewToDb, ...restMemberData } = member;
       if (member.contactId && isLoginEmailChanged) {
         toChangeWixMembersEmails.push(member);
       }
@@ -73,4 +193,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,
@@ -105,7 +105,7 @@ async function generateUpdatedMemberData({
     );
   }
 
-  return updatedMemberData;
+  return { ...updatedMemberData, isNewToDb: !existingDbMember };
 }
 
 /**
@@ -300,5 +300,4 @@ async function createCoreMemberData(inputMemberData, existingDbMember, currentPa
 
 module.exports = {
   generateUpdatedMemberData,
-  ensureUniqueUrl,
 };

package/backend/daily-pull/utils.js

@@ -15,6 +15,36 @@ 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 extractBaseUrl = url => {
+  if (!url) return url;
+  const urlParts = url.split('-');
+  const lastSegment = urlParts[urlParts.length - 1];
+  const isNumeric = /^\d+$/.test(lastSegment);
+  if (isNumeric && urlParts.length > 1) {
+    // Remove the numeric counter to get the base URL
+    return urlParts.slice(0, -1).join('-');
+  }
+  // No counter found, return the URL as-is
+  return url;
+};
+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
@@ -54,7 +84,7 @@ const validateCoreMemberData = inputMemberData => {
   return true;
 };
 
-const containsNonEnglish = str => /[^a-zA-Z0-9]/.test(str); // if it contains any non-english characters, test1 is allowed, but any others are not
+const containsNonEnglish = str => /[^a-zA-Z0-9-]/.test(str); // if it contains any non-english characters or invalid URL chars, test1 is allowed, hyphens are allowed
 
 /**
  * Creates a full name from first and last name components
@@ -75,4 +105,7 @@ module.exports = {
   validateCoreMemberData,
   containsNonEnglish,
   createFullName,
+  extractUrlCounter,
+  incrementUrlCounter,
+  extractBaseUrl,
 };

package/backend/dev-only-methods.js

@@ -0,0 +1,18 @@
+const { ensureUniqueUrlsInBatch } = require('./daily-pull/bulk-process-methods');
+const { wixData } = require('./elevated-modules');
+const { bulkSaveMembers } = require('./members-data-methods');
+const { queryAllItems } = require('./utils');
+
+async function deduplicateURls(collectionName, duplicateUrlsList) {
+  const query = await wixData.query(collectionName).hasSome('url', duplicateUrlsList).limit(1000);
+  const membersWithSameUrl = await queryAllItems(query);
+
+  console.log({ membersWithSameUrl });
+  const membersWithUniqueUrls = await ensureUniqueUrlsInBatch(membersWithSameUrl);
+  console.log({ membersWithUniqueUrls });
+  const deduplicatedUrls = membersWithUniqueUrls.map(m => m.url);
+  console.log({ deduplicatedUrls });
+  return await bulkSaveMembers(membersWithUniqueUrls, collectionName);
+}
+
+module.exports = { deduplicateURls };

package/backend/index.js

@@ -13,4 +13,5 @@ module.exports = {
   ...require('./login'),
   ...require('./data-hooks'),
   ...require('./http-functions'),
+  ...require('./dev-only-methods'),
 };

package/backend/members-data-methods.js

@@ -61,9 +61,10 @@ async function createContactAndMemberIfNew(memberData) {
 
 /** Performs bulk save operation for member data
  * @param { Array } memberDataList - Array of member data objects to save
+ * @param { string } [collectionName] - The collection name to save the members to (default: COLLECTIONS.MEMBERS_DATA)
  * @returns { Promise < Object >} - Bulk save operation result
  */
-async function bulkSaveMembers(memberDataList) {
+async function bulkSaveMembers(memberDataList, collectionName = COLLECTIONS.MEMBERS_DATA) {
   if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
     throw new Error('Invalid member data list provided for bulk save');
   }
@@ -71,9 +72,7 @@ async function bulkSaveMembers(memberDataList) {
   try {
     // bulkSave all with batches of 1000 items as this is the Velo limit for bulkSave
     const batches = chunkArray(memberDataList, 1000);
-    return await Promise.all(
-      batches.map(batch => wixData.bulkSave(COLLECTIONS.MEMBERS_DATA, batch))
-    );
+    return await Promise.all(batches.map(batch => wixData.bulkSave(collectionName, batch)));
   } catch (error) {
     console.error('Error bulk saving members:', error);
     throw new Error(`Bulk save failed: ${error.message}`);
@@ -133,7 +132,9 @@ async function getMemberBySlug({
     }
     query = query.limit(1000);
     const searchResult = await searchAllItems(query);
-    const membersList = searchResult.filter(item => item.url && item.url.includes(slug)); //replacement for contains
+    const membersList = searchResult.filter(
+      item => item.url && item.url.toLowerCase().includes(slug.toLowerCase())
+    ); //replacement for contains - case insensitive
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
@@ -270,23 +271,13 @@ async function urlExists(url, excludeMemberId) {
   if (!url) return false;
 
   try {
-    let query = wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .contains('url', url)
-      .ne('action', MEMBER_ACTIONS.DROP);
-
-    if (excludeMemberId) {
-      query = query.ne('memberId', excludeMemberId);
-    }
-
-    const { items } = await query.find();
-
-    // Case-insensitive comparison
-    const matchingMembers = items.filter(
-      item => item.url && item.url.toLowerCase() === url.toLowerCase()
-    );
-
-    return matchingMembers.length > 0;
+    const member = await getMemberBySlug({
+      slug: url,
+      excludeDropped: false,
+      excludeSearchedMember: true,
+      memberId: excludeMemberId,
+    });
+    return member !== null;
   } catch (error) {
     console.error('Error checking URL existence:', error);
     return false;

package/backend/tasks/consts.js

@@ -12,10 +12,6 @@ const TASKS_NAMES = {
   syncMemberLoginEmails: 'syncMemberLoginEmails',
   scheduleContactFormEmailMigration: 'scheduleContactFormEmailMigration',
   migrateContactFormEmails: 'migrateContactFormEmails',
-  scheduleMigrateExistingUrls: 'scheduleMigrateExistingUrls',
-  migrateUrlsChunk: 'migrateUrlsChunk',
-  scheduleGenerateMissingUrls: 'scheduleGenerateMissingUrls',
-  generateUrlsChunk: 'generateUrlsChunk',
 };
 
 module.exports = {

package/backend/tasks/migration-methods.js

@@ -20,27 +20,7 @@ function scheduleExternalProfileImageMigration() {
   });
 }
 
-// Schedule URL migration from backup collection
-function scheduleUrlMigration() {
-  return taskManager().schedule({
-    name: TASKS_NAMES.scheduleMigrateExistingUrls,
-    data: {},
-    type: 'scheduled',
-  });
-}
-
-// Schedule URL generation for members without URLs
-function scheduleUrlGeneration() {
-  return taskManager().schedule({
-    name: TASKS_NAMES.scheduleGenerateMissingUrls,
-    data: {},
-    type: 'scheduled',
-  });
-}
-
 module.exports = {
   scheduleConvertHtmlToRichContent,
   scheduleExternalProfileImageMigration,
-  scheduleUrlMigration,
-  scheduleUrlGeneration,
 };

package/backend/tasks/tasks-configs.js

@@ -17,12 +17,6 @@ const {
   scheduleEmailSync,
   syncMemberLoginEmails,
 } = require('./tasks-process-methods');
-const {
-  scheduleMigrateExistingUrls,
-  migrateUrlsChunk,
-  scheduleGenerateMissingUrls,
-  generateUrlsChunk,
-} = require('./url-migration-methods');
 
 const getDailyMembersDataSyncChildTasks = () => {
   // we don't want to sync none action as it means this members data hasn't changed and we don't need to sync it
@@ -95,7 +89,7 @@ const TASKS = {
     getIdentifier: () => 'SHOULD_NEVER_SKIP',
     process: updateSiteMapS3,
     shouldSkipCheck: () => false,
-    estimatedDurationSec: 70,
+    estimatedDurationSec: 90,
   },
   [TASKS_NAMES.scheduleContactFormEmailMigration]: {
     name: TASKS_NAMES.scheduleContactFormEmailMigration,
@@ -125,34 +119,6 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 45,
   },
-  [TASKS_NAMES.scheduleMigrateExistingUrls]: {
-    name: TASKS_NAMES.scheduleMigrateExistingUrls,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: scheduleMigrateExistingUrls,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 160,
-  },
-  [TASKS_NAMES.migrateUrlsChunk]: {
-    name: TASKS_NAMES.migrateUrlsChunk,
-    getIdentifier: task => `chunk-${task.data.chunkIndex}`,
-    process: migrateUrlsChunk,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 80,
-  },
-  [TASKS_NAMES.scheduleGenerateMissingUrls]: {
-    name: TASKS_NAMES.scheduleGenerateMissingUrls,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: scheduleGenerateMissingUrls,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 160,
-  },
-  [TASKS_NAMES.generateUrlsChunk]: {
-    name: TASKS_NAMES.generateUrlsChunk,
-    getIdentifier: task => `chunk-${task.data.chunkIndex}`,
-    process: generateUrlsChunk,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 80,
-  },
 };
 
 module.exports = { TASKS };

package/backend/utils.js

@@ -111,10 +111,8 @@ const getAllItems = async querySearchResult => {
   let oldResults = querySearchResult;
   console.log(`found items: ${oldResults.items.length}`);
   const allItems = oldResults.items;
-  console.log(`total pages: ${oldResults.totalPages}`);
   while (oldResults.hasNext()) {
     oldResults = await oldResults.next();
-    console.log(`next page: ${oldResults.currentPage}`);
     allItems.push(...oldResults.items);
   }
   console.log(`all items count : ${allItems.length}`);

package/dev-only-scripts/find-duplicate-urls.js

@@ -0,0 +1,202 @@
+const fs = require('fs');
+const path = require('path');
+
+// eslint-disable-next-line import/no-unresolved
+const csv = require('csv-parser');
+
+/**
+ * Finds duplicate URLs in a CSV file and generates a JSON report
+ * Usage: node scripts/find-duplicate-urls.js <path-to-csv-file>
+ */
+function findDuplicateUrls(csvFilePath) {
+  // Validate command-line argument
+  if (!csvFilePath) {
+    console.error('Error: CSV file path is required');
+    console.error('Usage: node scripts/find-duplicate-urls.js <path-to-csv-file>');
+    process.exit(1);
+  }
+
+  // Validate file exists and is readable
+  if (!fs.existsSync(csvFilePath)) {
+    console.error(`Error: File not found: ${csvFilePath}`);
+    process.exit(1);
+  }
+
+  const urlMap = new Map(); // url -> [memberId1, memberId2, ...]
+  let totalMembers = 0;
+  let rowNumber = 0;
+  let headersValidated = false;
+  let headers = null;
+  let urlColumnName = null;
+  let memberIdColumnName = null;
+
+  return new Promise((resolve, reject) => {
+    fs.createReadStream(csvFilePath)
+      .pipe(csv())
+      .on('headers', receivedHeaders => {
+        headers = receivedHeaders;
+        // Validate required columns exist - normalize by removing quotes, trimming, and lowercasing
+        const normalizedHeaders = headers.map(h => {
+          let normalized = String(h).trim();
+          // Remove all quotes (single and double) from the string
+          normalized = normalized.replace(/["']/g, '');
+          return normalized.toLowerCase().trim();
+        });
+
+        // Find the actual column names for url and memberId
+        const urlIndex = normalizedHeaders.indexOf('url');
+        const memberIdIndex = normalizedHeaders.indexOf('memberid');
+
+        if (urlIndex === -1 || memberIdIndex === -1) {
+          console.error('Error: CSV must contain "url" and "memberId" columns (case-insensitive)');
+          console.error(`Found columns: ${headers.join(', ')}`);
+          console.error(`Normalized columns: ${normalizedHeaders.join(', ')}`);
+          process.exit(1);
+        }
+
+        // Store the actual column names (with original casing/quotes)
+        urlColumnName = headers[urlIndex];
+        memberIdColumnName = headers[memberIdIndex];
+        headersValidated = true;
+      })
+      .on('data', row => {
+        // Validate headers on first data row if headers event didn't fire
+        if (!headersValidated) {
+          headers = Object.keys(row);
+          // Normalize by removing quotes, trimming, and lowercasing
+          const normalizedHeaders = headers.map(h => {
+            let normalized = String(h).trim();
+            // Remove all quotes (single and double) from the string
+            normalized = normalized.replace(/["']/g, '');
+            return normalized.toLowerCase().trim();
+          });
+
+          const urlIndex = normalizedHeaders.indexOf('url');
+          const memberIdIndex = normalizedHeaders.indexOf('memberid');
+
+          if (urlIndex === -1 || memberIdIndex === -1) {
+            console.error(
+              'Error: CSV must contain "url" and "memberId" columns (case-insensitive)'
+            );
+            console.error(`Found columns: ${headers.join(', ')}`);
+            console.error(`Normalized columns: ${normalizedHeaders.join(', ')}`);
+            process.exit(1);
+          }
+
+          // Store the actual column names
+          urlColumnName = headers[urlIndex];
+          memberIdColumnName = headers[memberIdIndex];
+          headersValidated = true;
+        }
+
+        rowNumber++;
+        totalMembers++;
+
+        // Get URL and memberId using the actual column names from headers
+        const url = row[urlColumnName];
+        const memberId = row[memberIdColumnName];
+
+        // Skip rows with missing URL or memberId
+        if (!url || !memberId) {
+          console.warn(
+            `Warning: Row ${rowNumber} skipped - missing url or memberId (url: ${url}, memberId: ${memberId})`
+          );
+          return;
+        }
+
+        const trimmedUrl = url.trim();
+        const trimmedMemberId = memberId.trim();
+
+        // Track URL occurrences
+        if (!urlMap.has(trimmedUrl)) {
+          urlMap.set(trimmedUrl, []);
+        }
+        urlMap.get(trimmedUrl).push(trimmedMemberId);
+      })
+      .on('error', error => {
+        console.error('Error reading CSV file:', error.message);
+        reject(error);
+      })
+      .on('end', () => {
+        if (!headersValidated) {
+          console.error('Error: Could not read CSV headers');
+          process.exit(1);
+        }
+
+        // Find duplicates (URLs with count > 1)
+        const duplicateUrls = [];
+        let totalDuplicates = 0;
+
+        for (const [url, memberIds] of urlMap.entries()) {
+          if (memberIds.length > 1) {
+            duplicateUrls.push({
+              url: url,
+              count: memberIds.length,
+              memberIds: memberIds,
+            });
+            totalDuplicates += memberIds.length;
+          }
+        }
+
+        // Sort by count (descending) then by URL (ascending)
+        duplicateUrls.sort((a, b) => {
+          if (b.count !== a.count) {
+            return b.count - a.count;
+          }
+          return a.url.localeCompare(b.url);
+        });
+
+        const totalUniqueUrls = urlMap.size;
+        const uniqueDuplicateUrls = duplicateUrls.length;
+
+        // Create a simple list of duplicated URLs (just the URL strings)
+        const duplicatedUrlsList = duplicateUrls.map(item => item.url);
+
+        // Generate report
+        const report = {
+          totalMembers: totalMembers,
+          totalUniqueUrls: totalUniqueUrls,
+          duplicateUrls: duplicateUrls,
+          duplicatedUrlsList: duplicatedUrlsList,
+          summary: {
+            totalDuplicates: totalDuplicates,
+            uniqueDuplicateUrls: uniqueDuplicateUrls,
+          },
+        };
+
+        // Generate output filename
+        const csvDir = path.dirname(csvFilePath);
+        const csvBasename = path.basename(csvFilePath, path.extname(csvFilePath));
+        const outputPath = path.join(csvDir, `${csvBasename}-duplicate-urls-report.json`);
+
+        // Write JSON report
+        fs.writeFileSync(outputPath, JSON.stringify(report, null, 2), 'utf8');
+
+        console.log('\n=== Duplicate URL Report ===');
+        console.log(`Total members processed: ${totalMembers}`);
+        console.log(`Total unique URLs: ${totalUniqueUrls}`);
+        console.log(`Unique URLs with duplicates: ${uniqueDuplicateUrls}`);
+        console.log(`Total duplicate entries: ${totalDuplicates}`);
+        console.log(`\nReport saved to: ${outputPath}`);
+        console.log(`\nTop 10 most duplicated URLs:`);
+        duplicateUrls.slice(0, 10).forEach((item, index) => {
+          console.log(
+            `  ${index + 1}. "${item.url}" - appears ${item.count} times (memberIds: ${item.memberIds.join(', ')})`
+          );
+        });
+
+        resolve(report);
+      });
+  });
+}
+
+// Run if executed directly
+if (require.main === module) {
+  const csvFilePath = process.argv[2];
+  findDuplicateUrls(csvFilePath).catch(error => {
+    console.error('Fatal error:', error.message);
+    process.exit(1);
+  });
+}
+
+module.exports = { findDuplicateUrls };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -9,7 +9,8 @@
     "lint:fix": "eslint . --fix",
     "format": "prettier --write \"**/*.{js,json,md}\"",
     "format:check": "prettier --check \"**/*.{js,json,md}\"",
-    "prepare": "husky"
+    "prepare": "husky",
+    "find-duplicates": "node dev-only-scripts/find-duplicate-urls.js"
   },
   "author": "",
   "license": "ISC",
@@ -30,7 +31,7 @@
   "dependencies": {
     "@wix/automations": "^1.0.261",
     "@wix/crm": "^1.0.1061",
-    "@wix/data": "^1.0.303",
+    "@wix/data": "^1.0.349",
     "@wix/essentials": "^0.1.28",
     "@wix/identity": "^1.0.178",
     "@wix/media": "^1.0.213",
@@ -44,6 +45,7 @@
     "aws4": "^1.13.2",
     "axios": "^1.13.1",
     "crypto": "^1.0.1",
+    "csv-parser": "^3.0.0",
     "jwt-js-decode": "^1.9.0",
     "lodash": "^4.17.21",
     "ngeohash": "^0.6.3",

package/pages/Profile.js

@@ -52,7 +52,7 @@ async function profileOnReady({ $w: _$w }) {
         profileData.mainAddress
       );
     } else {
-      collapseElements(['#locationContainer', '#location1Container', '#locationContainer2']);
+      deleteElements(['#locationContainer', '#location1Container', '#locationContainer2']);
     }
 
     setupAdditionalAddresses();
@@ -98,7 +98,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.memberSince) {
       _$w('#sinceYearText').text = profileData.memberSince;
     } else {
-      _$w('#memberSinceBox').collapse();
+      _$w('#memberSinceBox').delete();
     }
   }
 
@@ -106,7 +106,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.shouldHaveStudentBadge) {
       _$w('#studentContainer, #studentContainerMobile').expand();
     } else {
-      _$w('#studentContainer, #studentContainerMobile').collapse();
+      _$w('#studentContainer, #studentContainerMobile').delete();
     }
   }
 
@@ -114,7 +114,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.logoImage) {
       _$w('#logoImage').src = profileData.logoImage;
     } else {
-      _$w('#logoImage').collapse();
+      _$w('#logoImage').delete();
     }
 
     if (profileData.profileImage) {
@@ -131,7 +131,7 @@ async function profileOnReady({ $w: _$w }) {
         profileData.fullName
       );
     } else {
-      collapseElements(['#fullNameText', '#fullNameText2', '#fullNameTextFoter']);
+      deleteElements(['#fullNameText', '#fullNameText2', '#fullNameTextFoter']);
     }
   }
 
@@ -149,7 +149,7 @@ async function profileOnReady({ $w: _$w }) {
         wixWindow.openLightbox(LIGHTBOX_NAMES.CONTACT_US, profileData)
       );
     } else {
-      _$w('#contactButton').collapse();
+      _$w('#contactButton').delete();
     }
   }
 
@@ -157,7 +157,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.bookingUrl) {
       _$w('#bookNowButton').link = profileData.bookingUrl;
     } else {
-      _$w('#bookNowButton').collapse();
+      _$w('#bookNowButton').delete();
     }
   }
 
@@ -172,7 +172,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#phoneText').html = getPhoneHTML(_$w('#phoneText'));
       _$w('#phoneText2').html = getPhoneHTML(_$w('#phoneText2'));
     } else {
-      collapseElements(['#phoneContainer', '#phoneContainer2']);
+      deleteElements(['#phoneContainer', '#phoneContainer2']);
     }
   }
 
@@ -180,7 +180,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.licenceNo) {
       _$w('#licenceNoText').text = profileData.licenceNo;
     } else {
-      _$w('#licensesContainer').collapse();
+      _$w('#licensesContainer').delete();
     }
   }
 
@@ -194,7 +194,7 @@ async function profileOnReady({ $w: _$w }) {
     if (profileData.aboutService) {
       _$w('#aboutYouText').html = profileData.aboutService;
     } else {
-      _$w('#aboutSection').collapse();
+      _$w('#aboutSection').delete();
     }
   }
 
@@ -203,7 +203,7 @@ async function profileOnReady({ $w: _$w }) {
       _$w('#businessName').text = profileData.businessName;
       _$w('#businessName').expand();
     } else {
-      _$w('#businessName').collapse();
+      _$w('#businessName').delete();
     }
   }
 
@@ -213,13 +213,13 @@ async function profileOnReady({ $w: _$w }) {
     if (areasText) {
       _$w('#areaOfPracticesText').text = areasText;
     } else {
-      _$w('#areaOfPracticesText').collapse();
+      _$w('#areaOfPracticesText').delete();
     }
 
     if (Array.isArray(profileData.areasOfPractices) && profileData.areasOfPractices.length > 0) {
       populateRepeater(profileData.areasOfPractices, '#areaOfPracticesRepeater', '#practiceText');
     } else {
-      _$w('#servicesSection').collapse();
+      _$w('#servicesSection').delete();
     }
   }
 
@@ -229,16 +229,16 @@ async function profileOnReady({ $w: _$w }) {
     }
 
     if (!profileData.gallery?.length) {
-      _$w('#gallerySection').collapse();
+      _$w('#gallerySection').delete();
     } else {
       _$w('#gallery').items = profileData.gallery;
-      _$w('#gallerySection').expand();
+      _$w('#gallerySection').restore();
     }
   }
 
   function bindTestimonialsData() {
     if (!profileData.testimonials?.length) {
-      _$w('#testimonialsSection').collapse();
+      _$w('#testimonialsSection').delete();
     }
   }
 
@@ -267,7 +267,7 @@ async function profileOnReady({ $w: _$w }) {
       setupTestimonialsPagination(profileData.testimonials);
       _$w('#testimonialsSection').expand();
     } else {
-      _$w('#testimonialsSection').collapse();
+      _$w('#testimonialsSection').delete();
     }
   }
 
@@ -283,9 +283,9 @@ async function profileOnReady({ $w: _$w }) {
     });
   }
 
-  function collapseElements(elementIds) {
+  function deleteElements(elementIds) {
     elementIds.forEach(id => {
-      _$w(id).collapse();
+      _$w(id).delete();
     });
   }
 

package/pages/personalDetails.js

@@ -1106,6 +1106,7 @@ async function personalDetailsOnReady({
         });
         _$w('#profileLink').text = newProfileLink;
         _$w('#profileLink').link = newProfileLink;
+        _$w('#urlWebsiteText').text = newProfileLink;
 
         _$w(SLUG_FLAGS.VALID).collapse();
         _$w(SLUG_FLAGS.INVALID).collapse();
@@ -1858,8 +1859,15 @@ async function personalDetailsOnReady({
         itemMemberObj.toShowPhone = null;
       }
 
+      if (itemMemberObj.phones) {
+        itemMemberObj.phones = itemMemberObj.phones.filter(
+          phone => phone !== phoneToRemove.phoneNumber
+        );
+      }
+
       const updatedData = currentData.filter(item => item._id !== phoneId);
       renderPhonesList(updatedData);
+      checkFormChanges(FORM_SECTION_HANDLER_MAP.CONTACT_BOOKING);
     }
   }
 

package/backend/tasks/url-migration-methods.js

@@ -1,376 +0,0 @@
-const { taskManager } = require('psdev-task-manager');
-
-const { COLLECTIONS } = require('../../public/consts');
-const { ensureUniqueUrl } = require('../daily-pull/process-member-methods');
-const { wixData } = require('../elevated-modules');
-// const { bulkSaveMembers } = require('../members-data-methods');
-const { queryAllItems, chunkArray } = require('../utils');
-
-const { TASKS_NAMES } = require('./consts');
-
-const COLLECTION_WITH_URLS = 'MembersDataWithUrls';
-const CHUNK_SIZE = 5000; // 5k members per task
-
-/**
- * Step 1: Migrate existing URLs from backup collection
- * Queries backup collection and schedules tasks with memberIds and URLs
- */
-async function scheduleMigrateExistingUrls() {
-  console.log('=== Scheduling Step 1: Migrate Existing URLs ===');
-
-  try {
-    const membersQuery = await wixData.query(COLLECTION_WITH_URLS);
-    const startTime = Date.now();
-    const membersWithUrls = await queryAllItems(membersQuery);
-    const endTime = Date.now();
-    console.log(`QueryAllItems time: ${endTime - startTime}ms`);
-
-    const validMembers = membersWithUrls.filter(member => member.memberId && member.url);
-    console.log(`${validMembers.length} members have valid memberId and URL`);
-
-    if (validMembers.length === 0) {
-      console.log('No members to migrate URLs for');
-      return {
-        success: true,
-        message: 'No members need URL migration',
-        totalMembers: 0,
-        tasksScheduled: 0,
-      };
-    }
-
-    const migrationData = validMembers.map(member => ({
-      memberId: member.memberId,
-      url: member.url,
-    }));
-
-    const chunks = chunkArray(migrationData, CHUNK_SIZE);
-
-    for (let i = 0; i < chunks.length; i++) {
-      const chunk = chunks[i];
-      const task = {
-        name: TASKS_NAMES.migrateUrlsChunk,
-        data: {
-          urlData: chunk,
-          chunkIndex: i,
-          totalChunks: chunks.length,
-        },
-        type: 'scheduled',
-      };
-      await taskManager().schedule(task);
-      console.log(`Scheduled migration task ${i + 1}/${chunks.length} (${chunk.length} members)`);
-    }
-
-    const result = {
-      success: true,
-      message: `Scheduled ${chunks.length} tasks for ${validMembers.length} members`,
-      totalMembers: validMembers.length,
-      tasksScheduled: chunks.length,
-    };
-
-    console.log('=== Migration Scheduling Complete ===');
-    console.log(JSON.stringify(result, null, 2));
-
-    return result;
-  } catch (error) {
-    console.error('Error scheduling URL migration:', error);
-    throw error;
-  }
-}
-
-/**
- * Process a chunk of URL migrations (called by task manager)
- * Fetches members by memberId and updates with URLs using bulkSave
- */
-async function migrateUrlsChunk(data) {
-  const { urlData, chunkIndex, totalChunks } = data;
-  console.log(
-    `Processing migration chunk ${chunkIndex + 1}/${totalChunks} (${urlData.length} members)`
-  );
-
-  const result = {
-    successful: 0,
-    failed: 0,
-    skipped: 0,
-    errors: [],
-    skippedIds: [],
-    failedIds: [],
-  };
-
-  try {
-    const memberIds = urlData.map(({ memberId }) => memberId);
-
-    console.log(`Fetching ${memberIds.length} members from database...`);
-    const query = await wixData.query(COLLECTIONS.MEMBERS_DATA).hasSome('memberId', memberIds);
-    const members = await queryAllItems(query);
-    console.log(`Found ${members.length} members in database`);
-
-    const memberMap = new Map();
-    members.forEach(member => {
-      if (member.memberId) {
-        memberMap.set(member.memberId, member);
-      }
-    });
-
-    const membersToUpdate = [];
-    for (const { memberId, url } of urlData) {
-      const member = memberMap.get(memberId);
-
-      if (!member) {
-        console.log(`Member with memberId ${memberId} not found - skipping`);
-        result.skipped++;
-        result.skippedIds.push(memberId);
-        continue;
-      }
-
-      if (member.url === url) {
-        console.log(`Member ${member._id} already has URL ${url} - skipping`);
-        result.skipped++;
-        result.skippedIds.push(memberId);
-        continue;
-      }
-
-      membersToUpdate.push({
-        ...member,
-        url: url,
-      });
-    }
-
-    if (membersToUpdate.length === 0) {
-      console.log('No members need updating in this batch');
-      return result;
-    }
-
-    console.log(
-      `Started updating ${membersToUpdate.length} members with URLs in chunk ${chunkIndex}`
-    );
-
-    try {
-      // keep bulk save as comment for now, since we are just testing the query and update logic
-      // await bulkSaveMembers(membersToUpdate);
-      result.successful += membersToUpdate.length;
-      console.log(`✅ Successfully updated ${membersToUpdate.length} members`);
-    } catch (error) {
-      console.error(`❌ Error bulk saving members:`, error);
-      result.failed += membersToUpdate.length;
-      // Add all member IDs to failedIds
-      result.failedIds.push(...membersToUpdate.map(m => m.memberId));
-      result.errors.push({
-        error: error.message,
-        memberCount: membersToUpdate.length,
-      });
-    }
-
-    console.log(
-      `Chunk ${chunkIndex + 1} complete: ${result.successful} success, ${result.failed} failed, ${result.skipped} skipped`
-    );
-
-    // Log failed and skipped IDs if any
-    if (result.failedIds.length > 0) {
-      console.log(`❌ Failed memberIds (${result.failedIds.length}):`, result.failedIds);
-    }
-    if (result.skippedIds.length > 0) {
-      console.log(`⏭️  Skipped memberIds (${result.skippedIds.length}):`, result.skippedIds);
-    }
-
-    return result;
-  } catch (error) {
-    console.error(`Error processing migration chunk ${chunkIndex}:`, error);
-    throw error;
-  }
-}
-
-/**
- * Step 2: Generate URLs for members without URLs
- * Queries members without URLs and schedules generation tasks
- */
-async function scheduleGenerateMissingUrls() {
-  console.log('=== Scheduling Step 2: Generate Missing URLs ===');
-
-  try {
-    const membersQuery = await wixData.query(COLLECTIONS.MEMBERS_DATA).isEmpty('url');
-    const membersToUpdate = await queryAllItems(membersQuery);
-
-    console.log(`Found ${membersToUpdate.length} members without URLs`);
-
-    if (membersToUpdate.length === 0) {
-      console.log('No members need URL generation');
-      return {
-        success: true,
-        message: 'No members need URL generation',
-        totalMembers: 0,
-        tasksScheduled: 0,
-      };
-    }
-
-    const chunks = chunkArray(membersToUpdate, CHUNK_SIZE);
-
-    for (let i = 0; i < chunks.length; i++) {
-      const chunk = chunks[i];
-      const task = {
-        name: TASKS_NAMES.generateUrlsChunk,
-        data: {
-          memberIds: chunk.map(m => m._id),
-          chunkIndex: i,
-          totalChunks: chunks.length,
-        },
-        type: 'scheduled',
-      };
-      await taskManager().schedule(task);
-      console.log(`Scheduled generation task ${i + 1}/${chunks.length} (${chunk.length} members)`);
-    }
-
-    const result = {
-      success: true,
-      message: `Scheduled ${chunks.length} tasks for ${membersToUpdate.length} members`,
-      totalMembers: membersToUpdate.length,
-      tasksScheduled: chunks.length,
-    };
-
-    console.log('=== Generation Scheduling Complete ===');
-    console.log(JSON.stringify(result, null, 2));
-
-    return result;
-  } catch (error) {
-    console.error('Error scheduling URL generation:', error);
-    throw error;
-  }
-}
-
-/**
- * Process a chunk of URL generation (called by task manager)
- * Fetches members, generates URLs, and bulk saves
- */
-async function generateUrlsChunk(data) {
-  const { memberIds, chunkIndex, totalChunks } = data;
-  console.log(
-    `Processing generation chunk ${chunkIndex + 1}/${totalChunks} (${memberIds.length} members)`
-  );
-
-  const result = {
-    successful: 0,
-    failed: 0,
-    skipped: 0,
-    errors: [],
-    skippedIds: [],
-    failedIds: [],
-  };
-
-  try {
-    // Fetch all members at once using hasSome
-    console.log(`Fetching ${memberIds.length} members from database...`);
-    const members = await queryAllItems(
-      wixData.query(COLLECTIONS.MEMBERS_DATA).hasSome('_id', memberIds)
-    );
-    console.log(`Found ${members.length} members in database`);
-
-    // Create a map of _id -> member for quick lookup
-    const memberMap = new Map();
-    members.forEach(member => {
-      memberMap.set(member._id, member);
-    });
-
-    // Process each member and generate URLs
-    const membersToUpdate = [];
-    for (const memberId of memberIds) {
-      const member = memberMap.get(memberId);
-
-      if (!member) {
-        console.log(`Member ${memberId} not found - skipping`);
-        result.skipped++;
-        result.skippedIds.push(memberId);
-        continue;
-      }
-
-      if (member.url) {
-        console.log(`Member ${memberId} already has URL - skipping`);
-        result.skipped++;
-        result.skippedIds.push(memberId);
-        continue;
-      }
-
-      const name = member.fullName || `${member.firstName || ''} ${member.lastName || ''}`.trim();
-
-      if (!name) {
-        console.error(`Member ${memberId} has no name data - skipping`);
-        result.failed++;
-        result.failedIds.push(memberId);
-        result.errors.push({
-          memberId,
-          error: 'No name data available',
-        });
-        continue;
-      }
-
-      try {
-        const uniqueUrl = await ensureUniqueUrl({
-          url: '',
-          memberId: member._id,
-          fullName: name,
-        });
-
-        console.log(`✅ Generated URL for member ${memberId}: ${uniqueUrl}`);
-        membersToUpdate.push({
-          ...member,
-          url: uniqueUrl,
-        });
-      } catch (error) {
-        console.error(`❌ Failed to generate URL for member ${memberId}:`, error);
-        result.failed++;
-        result.failedIds.push(memberId);
-        result.errors.push({
-          memberId,
-          error: error.message || 'Unknown error',
-        });
-      }
-    }
-
-    if (membersToUpdate.length === 0) {
-      console.log('No members need updating in this batch');
-      return result;
-    }
-
-    console.log(
-      `Started updating ${membersToUpdate.length} members with generated URLs in chunk ${chunkIndex}`
-    );
-
-    try {
-      // keep bulk save as comment for now, since we are just testing the query and update logic
-      // await bulkSaveMembers(membersToUpdate);
-      result.successful += membersToUpdate.length;
-      console.log(`✅ Successfully updated ${membersToUpdate.length} members`);
-    } catch (error) {
-      console.error(`❌ Error bulk saving members:`, error);
-      result.failed += membersToUpdate.length;
-      // Add all member _ids to failedIds
-      result.failedIds.push(...membersToUpdate.map(m => m._id));
-      result.errors.push({
-        error: error.message,
-        memberCount: membersToUpdate.length,
-      });
-    }
-
-    console.log(
-      `Chunk ${chunkIndex + 1} complete: ${result.successful} success, ${result.failed} failed, ${result.skipped} skipped`
-    );
-
-    // Log failed and skipped IDs if any
-    if (result.failedIds.length > 0) {
-      console.log(`❌ Failed memberIds (${result.failedIds.length}):`, result.failedIds);
-    }
-    if (result.skippedIds.length > 0) {
-      console.log(`⏭️  Skipped memberIds (${result.skippedIds.length}):`, result.skippedIds);
-    }
-
-    return result;
-  } catch (error) {
-    console.error(`Error processing generation chunk ${chunkIndex}:`, error);
-    throw error;
-  }
-}
-
-module.exports = {
-  scheduleMigrateExistingUrls,
-  migrateUrlsChunk,
-  scheduleGenerateMissingUrls,
-  generateUrlsChunk,
-};