abmp-npm 1.1.87 → 1.1.89

package/backend/cms-data-methods.js

@@ -8,6 +8,7 @@ const {
   GEO_HASH_PRECISION,
   MAX__MEMBERS_SEARCH_RESULTS,
   WIX_QUERY_MAX_LIMIT,
+  MEMBERSHIPS_TYPES,
 } = require('./consts.js');
 const { wixData } = require('./elevated-modules');
 
@@ -31,6 +32,7 @@ function buildMembersSearchQuery(data) {
         .query(COLLECTIONS.MEMBERS_DATA)
         .ne('optOut', true)
         .ne('action', 'drop')
+        .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
         .eq('isVisible', true);
       let filterConfig = [
         {
@@ -105,7 +107,7 @@ function buildMembersSearchQuery(data) {
         query = query.contains('fullName', filter.searchText);
       }
       if (!includeStudents) {
-        query = query.ne('memberships.membertype', 'Student');
+        query = query.ne('memberships.membertype', MEMBERSHIPS_TYPES.STUDENT);
       }
       return query;
     },

package/backend/contacts-methods.js

@@ -14,13 +14,18 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
   if (!contactId) {
     throw new Error('Contact ID is required');
   }
-
+  console.log('updateContactInfo contactId', contactId);
+  console.log('updateContactInfo operationName', operationName);
   try {
     const contact = await elevatedGetContact(contactId);
+    console.log('updateContactInfo contact', contact);
     const currentInfo = contact.info;
+    console.log('updateContactInfo currentInfo', currentInfo);
     const updatedInfo = updateInfoCallback(currentInfo);
-
-    await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
+    console.log('updateContactInfo updatedInfo', updatedInfo);
+    const updatedContact = await elevatedUpdateContact(contactId, updatedInfo, contact.revision);
+    console.log('updateContactInfo updatedContact', updatedContact);
+    return updatedContact;
   } catch (error) {
     console.error(`Error in ${operationName}:`, error);
     throw new Error(`Failed to ${operationName}: ${error.message}`);
@@ -33,6 +38,8 @@ async function updateContactInfo(contactId, updateInfoCallback, operationName) {
  * @param {string} newEmail - The new email address
  */
 async function updateContactEmail(contactId, newEmail) {
+  console.log('updateContactEmail contactId', contactId);
+  console.log('updateContactEmail newEmail', newEmail);
   if (!newEmail) {
     throw new Error('New email is required');
   }
@@ -88,6 +95,7 @@ async function updateContactNames(contactId, firstName, lastName) {
 const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
   const hasChanged = existingValues.some((val, idx) => val !== newValues[idx]);
   if (!hasChanged) return null;
+  console.log('updateIfChanged hasChanged', hasChanged);
   return updater(...argsBuilder(newValues));
 };
 
@@ -98,7 +106,7 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
  */
 const updateMemberContactInfo = async (data, existingMemberData) => {
   const { contactId } = existingMemberData;
-
+  console.log('updateMemberContactInfo contactId', contactId);
   const updateConfig = [
     {
       fields: ['contactFormEmail'],
@@ -120,7 +128,9 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
     })
     .filter(Boolean);
 
-  await Promise.all(updatePromises);
+  const resp = await Promise.all(updatePromises);
+  console.log('updateMemberContactInfo updatePromises', resp);
+  return resp;
 };
 
 module.exports = {

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

@@ -9,7 +9,8 @@ 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
@@ -201,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];
@@ -255,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
@@ -292,7 +307,7 @@ async function generateUrlsChunk(data) {
       try {
         const uniqueUrl = await ensureUniqueUrl({
           url: '',
-          memberId: member._id,
+          memberId: member.memberId,
           fullName: name || '', // Let ensureUniqueUrl handle fallback for empty names
         });
 

package/package.json

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