abmp-npm 1.10.11 → 1.10.13

package/backend/routers/utils.js

@@ -1,7 +1,7 @@
 const { getMainAddress } = require('../../public/Utils/sharedUtils');
 const { getMemberBySlug } = require('../members-data-methods');
 const {
-  getAddressesByStatus,
+  getMoreAddressesToDisplay,
   formatDateToMonthYear,
   hasStudentMembership,
   isPAC_STAFF,
@@ -48,7 +48,10 @@ function transformMemberToProfileData(member, siteAssociation) {
     ?.map(val => val.license)
     .filter(Boolean)
     .join(', ');
-  const processedAddresses = getAddressesByStatus(member.addresses, member.addressDisplayOption);
+  const moreAddressesToDisplay = getMoreAddressesToDisplay(
+    member.addresses,
+    member.addressDisplayOption
+  );
 
   const memberships = member.memberships || [];
   const siteAssociationMembership = memberships.find(m => m.association === siteAssociation);
@@ -67,7 +70,7 @@ function transformMemberToProfileData(member, siteAssociation) {
     mainAddress,
     testimonials: member.testimonial || [],
     licenceNo,
-    processedAddresses,
+    moreAddressesToDisplay,
     memberSince:
       (member.showABMP &&
         siteAssociationMembership &&

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

@@ -3,13 +3,14 @@ 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 { 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
+const CHUNK_SIZE = 5000; // 5k members per task for migration
+const GENERATION_CHUNK_SIZE = 1000; // 1k members per task for URL generation
 
 /**
  * Step 1: Migrate existing URLs from backup collection
@@ -83,10 +84,9 @@ async function scheduleMigrateExistingUrls() {
  */
 async function migrateUrlsChunk(data) {
   const { urlData, chunkIndex, totalChunks } = data;
-  console.log('migrateUrlsChunk data', data);
-  // console.log(
-  //   `Processing migration chunk ${chunkIndex + 1}/${totalChunks} (${urlData.length} members)`
-  // );
+  console.log(
+    `Processing migration chunk ${chunkIndex + 1}/${totalChunks} (${urlData.length} members)`
+  );
 
   const result = {
     successful: 0,
@@ -146,8 +146,7 @@ async function migrateUrlsChunk(data) {
     );
 
     try {
-      // keep bulk save as comment for now, since we are just testing the query and update logic
-      // await bulkSaveMembers(membersToUpdate);
+      await bulkSaveMembers(membersToUpdate);
       result.successful += membersToUpdate.length;
       console.log(`✅ Successfully updated ${membersToUpdate.length} members`);
     } catch (error) {
@@ -203,7 +202,7 @@ async function scheduleGenerateMissingUrls() {
       };
     }
 
-    const chunks = chunkArray(membersToUpdate, CHUNK_SIZE);
+    const chunks = chunkArray(membersToUpdate, GENERATION_CHUNK_SIZE);
 
     for (let i = 0; i < chunks.length; i++) {
       const chunk = chunks[i];
@@ -257,11 +256,25 @@ async function generateUrlsChunk(data) {
   };
 
   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)
+    // Fetch members in smaller batches to avoid cursor size limits
+    // hasSome with too many IDs creates cursors that exceed Wix's 150KB limit
+    const FETCH_BATCH_SIZE = 200;
+    console.log(
+      `Fetching ${memberIds.length} members from database in batches of ${FETCH_BATCH_SIZE}...`
     );
+
+    const members = [];
+    const idBatches = chunkArray(memberIds, FETCH_BATCH_SIZE);
+
+    for (let i = 0; i < idBatches.length; i++) {
+      const idBatch = idBatches[i];
+      const batchMembers = await queryAllItems(
+        wixData.query(COLLECTIONS.MEMBERS_DATA).hasSome('_id', idBatch)
+      );
+      members.push(...batchMembers);
+      console.log(`Fetched batch ${i + 1}/${idBatches.length}: ${batchMembers.length} members`);
+    }
+
     console.log(`Found ${members.length} members in database`);
 
     // Create a map of _id -> member for quick lookup
@@ -291,22 +304,11 @@ async function generateUrlsChunk(data) {
 
       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,
+          fullName: name || '', // Let ensureUniqueUrl handle fallback for empty names
         });
 
         console.log(`✅ Generated URL for member ${memberId}: ${uniqueUrl}`);
@@ -335,8 +337,7 @@ async function generateUrlsChunk(data) {
     );
 
     try {
-      // keep bulk save as comment for now, since we are just testing the query and update logic
-      // await bulkSaveMembers(membersToUpdate);
+      await bulkSaveMembers(membersToUpdate);
       result.successful += membersToUpdate.length;
       console.log(`✅ Successfully updated ${membersToUpdate.length} members`);
     } catch (error) {

package/backend/utils.js

@@ -4,7 +4,7 @@ const { site } = require('@wix/urls');
 const { encode } = require('ngeohash');
 
 const { COLLECTIONS, ADDRESS_STATUS_TYPES } = require('../public/consts');
-const { formatAddress, generateId } = require('../public/Utils/sharedUtils');
+const { formatAddress, generateId, findMainAddress } = require('../public/Utils/sharedUtils');
 
 const { CONFIG_KEYS, GEO_HASH_PRECISION, MEMBERSHIPS_TYPES } = require('./consts');
 const { wixData } = require('./elevated-modules');
@@ -91,16 +91,17 @@ function getAddressDisplayOptions(member) {
   }
   return displayOptions;
 }
-function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
+function getMoreAddressesToDisplay(addresses = [], addressDisplayOption = []) {
   const visible = addresses.filter(addr => addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW);
   if (visible.length < 2) {
     return [];
   }
-  const opts = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
-  const mainOpt = opts.find(o => o.isMain);
-  const mainKey = mainOpt ? mainOpt.key : visible[0].key; // fallback to the first visible if none marked
-  return visible
-    .filter(addr => addr?.key !== mainKey)
+  const mainAddress = findMainAddress(addressDisplayOption, addresses);
+  const remainingAddressesToFormat = mainAddress
+    ? visible.filter(addr => addr?.key !== mainAddress.key)
+    : visible;
+
+  return remainingAddressesToFormat
     .map(addr => {
       const addressString = formatAddress(addr);
       return addressString ? { _id: generateId(), address: addressString } : null;
@@ -111,10 +112,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}`);
@@ -216,7 +215,7 @@ module.exports = {
   getSiteBaseUrl,
   encodeXml,
   formatDateOnly,
-  getAddressesByStatus,
+  getMoreAddressesToDisplay,
   isPAC_STAFF,
   searchAllItems,
 };

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

@@ -1,7 +1,6 @@
 const fs = require('fs');
 const path = require('path');
 
-// eslint-disable-next-line import/no-unresolved
 const csv = require('csv-parser');
 
 /**

package/package.json

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

package/pages/Profile.js

@@ -59,9 +59,9 @@ async function profileOnReady({ $w: _$w }) {
   }
 
   function setupAdditionalAddresses() {
-    _$w('#moreAdressesRepeater').data = profileData.processedAddresses;
+    _$w('#moreAdressesRepeater').data = profileData.moreAddressesToDisplay;
 
-    if (profileData.processedAddresses.length > 0) {
+    if (profileData.moreAddressesToDisplay.length > 0) {
       _$w('#moreLocationButton').expand();
       _$w('#addressTitle').collapse();
     }