abmp-npm 2.0.21 → 2.0.23

package/backend/contacts-methods.js

@@ -3,7 +3,33 @@ const { auth } = require('@wix/essentials');
 
 const elevatedGetContact = auth.elevate(contacts.getContact);
 const elevatedUpdateContact = auth.elevate(contacts.updateContact);
+const elevatedCreateContact = auth.elevate(contacts.createContact);
 
+/**
+ * Create a contact in Wix CRM
+ * @param {Object} contactData - Contact data
+ * @param {boolean} allowDuplicates - Allow duplicates if contact with same email already exists, will be true only when handling existing members, after that should be removed
+ * @returns {Promise<Object>} - Contact data
+ */
+async function createSiteContact(contactData, allowDuplicates = false) {
+  if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
+    throw new Error('Contact data is required');
+  }
+  const phones =
+    Array.isArray(contactData.phones) && contactData.phones.length > 0 ? contactData.phones : [];
+  const contactInfo = {
+    name: {
+      first: contactData.firstName,
+      last: contactData.lastName,
+    },
+    emails: {
+      items: [{ email: contactData.contactFormEmail || contactData.email, primary: true }],
+    },
+    phones: { items: phones.map(phone => ({ phone })) },
+  };
+  const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
+  return createContactResponse.contact._id;
+}
 /**
  * Generic contact update helper function
  * @param {string} contactId - The contact ID in Wix CRM
@@ -55,27 +81,27 @@ async function updateContactEmail(contactId, newEmail) {
 }
 
 /**
- * Updates contact names in Wix CRM
- * @param {string} contactId - The contact ID in Wix CRM
- * @param {string} firstName - The new first name
- * @param {string} lastName - The new last name
+ * Updates contact names in Wix CRM for both contact and member
+ * @param {Object} params - Parameters object
+ * @param {string} params.wixContactId - The contact ID in Wix CRM
+ * @param {string} params.wixMemberId - The member ID in Wix CRM
+ * @param {string} params.firstName - The new first name
+ * @param {string} params.lastName - The new last name
  */
-async function updateContactNames(contactId, firstName, lastName) {
+async function updateContactNames({ wixContactId, firstName, lastName }) {
   if (!firstName && !lastName) {
-    throw new Error('At least one name field is required');
+    throw new Error('First name or last name is required');
   }
 
-  return await updateContactInfo(
-    contactId,
-    currentInfo => ({
-      ...currentInfo,
-      name: {
-        first: firstName || currentInfo?.name?.first || '',
-        last: lastName || currentInfo?.name?.last || '',
-      },
-    }),
-    'update contact names'
-  );
+  const createNameUpdate = currentInfo => ({
+    ...currentInfo,
+    name: {
+      first: firstName || currentInfo?.name?.first || '',
+      last: lastName || currentInfo?.name?.last || '',
+    },
+  });
+
+  return await updateContactInfo(wixContactId, createNameUpdate, 'update contact names');
 }
 
 /**
@@ -97,18 +123,20 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
  * @param {Object} existingMemberData - Existing member data
  */
 const updateMemberContactInfo = async (data, existingMemberData) => {
-  const { contactId } = existingMemberData;
-
+  const { wixContactId } = existingMemberData;
+  if (!wixContactId) {
+    throw new Error('Wix Contact ID is required');
+  }
   const updateConfig = [
     {
       fields: ['contactFormEmail'],
       updater: updateContactEmail,
-      args: ([email]) => [contactId, email],
+      args: ([email]) => [wixContactId, email],
     },
     {
       fields: ['firstName', 'lastName'],
       updater: updateContactNames,
-      args: ([firstName, lastName]) => [contactId, firstName, lastName],
+      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId }],
     },
   ];
 
@@ -125,4 +153,5 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
 
 module.exports = {
   updateMemberContactInfo,
+  createSiteContact,
 };

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

@@ -168,7 +168,7 @@ const bulkProcessAndSaveMemberData = async ({
     const toChangeWixMembersEmails = [];
     const toSaveMembersData = uniqueUrlsMembersData.map(member => {
       const { isLoginEmailChanged, isNewToDb: _isNewToDb, ...restMemberData } = member;
-      if (member.contactId && isLoginEmailChanged) {
+      if (member.wixMemberId && isLoginEmailChanged) {
         toChangeWixMembersEmails.push(member);
       }
       return restMemberData; //we don't want to store the isLoginEmailChanged in the database, it's just a flag to know if we need to change the login email in Members area

package/backend/dev-only-methods.js

@@ -1,3 +1,5 @@
+const { COLLECTIONS } = require('../public/consts');
+
 const { ensureUniqueUrlsInBatch } = require('./daily-pull/bulk-process-methods');
 const { wixData } = require('./elevated-modules');
 const { bulkSaveMembers } = require('./members-data-methods');
@@ -15,4 +17,14 @@ async function deduplicateURls(collectionName, duplicateUrlsList) {
   return await bulkSaveMembers(membersWithUniqueUrls, collectionName);
 }
 
-module.exports = { deduplicateURls };
+async function copyContactIdToWixMemberId() {
+  const query = wixData.query(COLLECTIONS.MEMBERS_DATA).isNotEmpty('contactId');
+  const members = await queryAllItems(query);
+  const updatedMembers = members.map(member => ({
+    ...member,
+    wixMemberId: member.contactId,
+  }));
+  return await bulkSaveMembers(updatedMembers, COLLECTIONS.MEMBERS_DATA);
+}
+
+module.exports = { deduplicateURls, copyContactIdToWixMemberId };

package/backend/forms-methods.js

@@ -16,7 +16,7 @@ const contactSubmission = async (data, memberDataId) => {
     console.log('Member contact form is not enabled for user, skipping contact submission!');
     return;
   }
-  let memberContactId = memberData.contactId;
+  let memberContactId = memberData.wixContactId;
   if (!memberContactId) {
     /**
      * Create a member contact here since some members may have never logged in
@@ -27,7 +27,7 @@ const contactSubmission = async (data, memberDataId) => {
      */
     console.info('Member contact id not found for user, creating new contact!');
     const member = await createContactAndMemberIfNew(memberData);
-    memberContactId = member.contactId;
+    memberContactId = member.wixContactId;
   }
   console.log('memberContactId', memberContactId);
   const emailTriggered = await triggerAutomation(automationEmailTriggerId, {
@@ -40,7 +40,7 @@ const contactSubmission = async (data, memberDataId) => {
   data = {
     ...data,
     phone: Number(data.phone),
-    memberContactId: memberContactId,
+    memberContactId,
     memberEmail: memberData.contactFormEmail,
   };
   await wixData.insert(COLLECTIONS.CONTACT_US_SUBMISSIONS, data);

package/backend/jobs.js

@@ -33,6 +33,20 @@ async function scheduleDailyPullTask(backupDate = null) {
   }
 }
 
+async function scheduleCreateContactsFromMembersTask() {
+  try {
+    console.log('scheduleCreateContactsFromMembers started!');
+    return await taskManager().schedule({
+      name: TASKS_NAMES.scheduleCreateContactsFromMembers,
+      data: {},
+      type: 'scheduled',
+    });
+  } catch (error) {
+    console.error(`Failed to scheduleCreateContactsFromMembers: ${error.message}`);
+    throw new Error(`Failed to scheduleCreateContactsFromMembers: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -45,4 +59,9 @@ async function updateSiteMapS3() {
   }
 }
 
-module.exports = { runScheduledTasks, scheduleDailyPullTask, updateSiteMapS3 };
+module.exports = {
+  runScheduledTasks,
+  scheduleDailyPullTask,
+  updateSiteMapS3,
+  scheduleCreateContactsFromMembersTask,
+};

package/backend/login/qa-login-methods.js

@@ -1,4 +1,4 @@
-const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
+const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
 const { getSecret } = require('../utils');
 
 const validateQAUser = async userEmail => {
@@ -20,27 +20,23 @@ const validateQAUser = async userEmail => {
  */
 const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
-    const userValidation = await validateQAUser(userEmail);
+    const [userValidation, qaSecret] = await Promise.all([
+      validateQAUser(userEmail),
+      getSecret('ABMP_QA_SECRET'),
+    ]);
     if (userValidation.error) {
       return { success: false, error: userValidation.error };
     }
-
-    const qaSecret = await getSecret('ABMP_QA_SECRET');
     if (secret !== qaSecret) {
       return { success: false, error: 'Invalid secret' };
     }
 
-    const token = await generateSessionToken(userValidation.email, qaSecret);
-
-    const result = await getMemberCMSId(userEmail);
-    if (!result.success) {
-      return { success: false, error: result.error };
-    }
-
+    const memberData = await prepareMemberForQALogin(userValidation.email);
+    const token = await generateSessionToken(memberData.email, qaSecret);
     return {
       success: true,
       token,
-      memberCMSId: result.memberCMSId,
+      memberCMSId: memberData._id,
     };
   } catch (error) {
     console.error('QA login error:', error);
@@ -48,25 +44,6 @@ const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   }
 };
 
-async function getMemberCMSId(userEmail) {
-  try {
-    const userValidation = await validateQAUser(userEmail);
-    if (userValidation.error) {
-      return { success: false, error: userValidation.error };
-    }
-
-    const member = await getMemberByEmail(userEmail);
-
-    if (!member) {
-      return { success: false, error: `No Member found in DB matching email: ${userEmail}` };
-    }
-    return { success: true, memberCMSId: member._id };
-  } catch (error) {
-    console.error('Error getting member CMS ID:', error);
-    return { success: false, error: 'Failed to retrieve member data' };
-  }
-}
-
 module.exports = {
   loginQAMember,
 };

package/backend/login/sso-methods.js

@@ -5,7 +5,7 @@ const { decode } = require('jwt-js-decode');
 const { CONFIG_KEYS, SSO_TOKEN_AUTH_API_URL } = require('../consts');
 const { MEMBER_ACTIONS } = require('../daily-pull/consts');
 const { getCurrentMember } = require('../members-area-methods');
-const { getMemberByContactId, getSiteMemberId } = require('../members-data-methods');
+const { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -37,12 +37,12 @@ async function validateMemberToken(memberIdInput) {
     }
 
     const [dbMember, siteConfigs] = await Promise.all([
-      getMemberByContactId(member._id),
+      getCMSMemberByWixMemberId(member._id),
       getSiteConfigs(),
     ]);
     const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
     const membersExternalPortalUrl = siteConfigs[CONFIG_KEYS.MEMBERS_EXTERNAL_PORTAL_URL];
-    console.log('dbMember by contact id is:', dbMember);
+    console.log('dbMember by wix member id is:', dbMember);
     console.log('member._id', member._id);
 
     if (!dbMember?._id) {
@@ -133,12 +133,12 @@ const authenticateSSOToken = async ({ token }, generateSessionToken) => {
   if (isValidToken) {
     const jwt = decode(responseToken);
     const payload = jwt.payload;
-    const membersData = await getSiteMemberId(payload);
-    console.log('membersDataCollectionId', membersData._id);
-    const sessionToken = await generateSessionToken(membersData.email);
+    const memberData = await prepareMemberForSSOLogin(payload);
+    console.log('memberDataCollectionId', memberData._id);
+    const sessionToken = await generateSessionToken(memberData.email);
     const authObj = {
       type: 'success',
-      memberId: membersData._id,
+      memberId: memberData._id,
       sessionToken,
     };
     return authObj;

package/backend/members-area-methods.js

@@ -1,16 +1,11 @@
 const { auth } = require('@wix/essentials');
 const { members, authentication } = require('@wix/members');
 const elevatedCreateMember = auth.elevate(members.createMember);
+const elevatedChangeLoginEmail = auth.elevate(authentication.changeLoginEmail);
 
-function prepareContactData(partner) {
-  const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
+function prepareMemberData(partner) {
   const options = {
     member: {
-      contact: {
-        ...partner,
-        phones,
-        emails: [partner.contactFormEmail || partner.email],
-      },
       loginEmail: partner.email,
     },
   };
@@ -22,9 +17,8 @@ async function createMemberFunction(member) {
 }
 const createSiteMember = async memberDetails => {
   try {
-    const options = prepareContactData(memberDetails);
-    const contactId = await createMemberFunction(options);
-    return contactId;
+    const options = prepareMemberData(memberDetails);
+    return await createMemberFunction(options);
   } catch (error) {
     console.error(`Error in createSiteMember ${error.message}`);
     throw error;
@@ -37,22 +31,22 @@ const getCurrentMember = async () => {
 };
 
 /**
- * Updates Wix member login email if the member has a contactId (registered Wix member)
- * @param {Object} member - Member object with contactId and email
+ * Updates Wix member login email if the member has a wixMemberId (registered Wix member)
+ * @param {Object} member - Member object with wixMemberId and email
  * @param {Object} result - Result object to track Wix member updates
  */
 async function updateWixMemberLoginEmail(member, result = {}) {
-  if (!member.contactId) {
-    console.log(`Member ${member.memberId} has no contactId - skipping Wix login email update`);
+  if (!member.wixMemberId) {
+    console.log(`Member ${member.memberId} has no wixMemberId - skipping Wix login email update`);
     return;
   }
 
   try {
     console.log(
-      `Updating Wix login email for member ${member.memberId} (contactId: ${member.contactId})`
+      `Updating Wix login email for member ${member.memberId} (wixMemberId: ${member.wixMemberId})`
     );
 
-    const updatedWixMember = await authentication.changeLoginEmail(member.contactId, member.email);
+    const updatedWixMember = await elevatedChangeLoginEmail(member.wixMemberId, member.email);
 
     console.log(
       `✅ Successfully updated Wix login email for member ${member.memberId}: ${updatedWixMember.loginEmail}`
@@ -75,7 +69,7 @@ async function updateWixMemberLoginEmail(member, result = {}) {
     }
     result.wixMemberErrors.push({
       memberId: member.memberId,
-      contactId: member.contactId,
+      wixMemberId: member.wixMemberId,
       email: member.email,
       error: error.message,
     });

package/backend/members-data-methods.js

@@ -2,7 +2,7 @@ const { COLLECTIONS } = require('../public/consts');
 const { isWixHostedImage } = require('../public/Utils/sharedUtils');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo } = require('./contacts-methods');
+const { updateMemberContactInfo, createSiteContact } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
@@ -43,10 +43,16 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const contactId = await createSiteMember(toCreateMemberData);
+    const needsWixMember = !memberData.wixMemberId;
+    const needsWixContact = !memberData.wixContactId;
+    const [newWixMemberId, newWixContactId] = await Promise.all([
+      needsWixMember ? createSiteMember(toCreateMemberData) : Promise.resolve(null),
+      needsWixContact ? createSiteContact(toCreateMemberData) : Promise.resolve(null),
+    ]);
     let memberDataWithContactId = {
       ...memberData,
-      contactId,
+      wixMemberId: newWixMemberId || memberData.wixMemberId,
+      wixContactId: newWixContactId || memberData.wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -94,10 +100,16 @@ async function findMemberById(memberId) {
     const queryResult = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
       .eq('memberId', memberId)
+      .limit(2)
       .find();
-
-    return queryResult.items.length > 0 ? queryResult.items[0] : null;
+    if (queryResult.items.length > 1) {
+      throw new Error(
+        `Multiple members found with memberId ${memberId} members _ids are : [${queryResult.items.map(member => member._id).join(', ')}]`
+      );
+    }
+    return queryResult.items.length === 1 ? queryResult.items[0] : null;
   } catch (error) {
+    console.error('Error finding member by ID:', error);
     throw new Error(`Failed to retrieve member data: ${error.message}`);
   }
 }
@@ -159,31 +171,32 @@ async function getMemberBySlug({
     }
     return matchingMembers[0] || null;
   } catch (error) {
-    console.error('Error getting member by slug:', error);
-    throw error;
+    const errorMessage = `Error getting member by slug: ${slug} : ${error.message}`;
+    console.error(errorMessage);
+    throw new Error(errorMessage);
   }
 }
 
-async function getMemberByContactId(contactId) {
-  if (!contactId) {
-    throw new Error('Contact ID is required');
+async function getCMSMemberByWixMemberId(wixMemberId) {
+  if (!wixMemberId) {
+    throw new Error('Wix Member ID is required');
   }
   try {
     const members = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('contactId', contactId)
+      .eq('wixMemberId', wixMemberId)
       .limit(2)
       .find()
       .then(res => res.items);
     if (members.length > 1) {
       throw new Error(
-        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+        `[getCMSMemberByWixMemberId] Multiple members found with wixMemberId ${wixMemberId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
       );
     }
     return members[0] || null;
   } catch (error) {
     throw new Error(
-      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
+      `[getCMSMemberByWixMemberId] Failed to retrieve member by wixMemberId ${wixMemberId} data: ${error.message}`
     );
   }
 }
@@ -218,8 +231,8 @@ async function updateMember(memberToUpdate) {
   }
 }
 /**
- * Saves member registration data
- * @param {Object} data - Member data to save
+ * Saves member registration data (supports partial updates)
+ * @param {Object} data - Member data to save (can be partial - only fields being updated)
  * @param {string} id - Member ID
  * @returns {Promise<Object>} Result object with type and data/error
  */
@@ -240,15 +253,29 @@ async function saveRegistrationData(data, id) {
       }
     }
 
-    if (data.addresses && Array.isArray(data.addresses)) {
-      data.locHash = generateGeoHash(data.addresses);
+    // Fetch existing data to merge with partial update
+    const existingMemberData = await findMemberByWixDataId(id);
+
+    if (!existingMemberData) {
+      return {
+        type: 'error',
+        error: 'Member not found',
+      };
     }
 
-    const existingMemberData = await findMemberByWixDataId(id);
+    // Merge partial data with existing data (incoming data takes precedence)
+    const mergedData = {
+      ...existingMemberData,
+      ...data,
+    };
 
-    await updateMemberContactInfo(data, existingMemberData);
+    if (data.addresses && Array.isArray(data.addresses)) {
+      mergedData.locHash = generateGeoHash(data.addresses);
+    }
 
-    const saveData = await updateMember(data);
+    await updateMemberContactInfo(mergedData, existingMemberData);
+
+    const saveData = await updateMember(mergedData);
     return {
       type: 'success',
       saveData,
@@ -442,41 +469,57 @@ const getQAUsers = async () => {
     throw new Error(`Failed to get QA users: ${error.message}`);
   }
 };
-async function getSiteMemberId(data) {
+/**
+ * Ensures member has a contact - creates one if missing
+ * @param {Object} memberData - Member data from DB
+ * @returns {Promise<Object>} - Member data with contact and member IDs
+ */
+async function ensureWixMemberAndContactExist(memberData) {
+  if (!memberData) {
+    throw new Error('Member data is required');
+  }
+  if (!memberData.wixContactId || !memberData.wixMemberId) {
+    const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
+    return memberDataWithContactId;
+  }
+  return memberData;
+}
+async function prepareMemberForSSOLogin(data) {
   try {
     console.log('data', data);
     const memberId = data?.pac?.cst_recno;
     if (!memberId) {
-      const errorMessage = `Member ID is missing in passed data ${JSON.stringify(data)}`;
-      console.error(errorMessage);
-      throw new Error(errorMessage);
+      throw new Error(`Member ID is missing in passed data ${JSON.stringify(data)}`);
     }
-    const queryMemberResult = await wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('memberId', Number(memberId))
-      .find()
-      .then(res => res.items);
-    if (!queryMemberResult.length || queryMemberResult.length > 1) {
-      throw new Error(
-        `Invalid Members count found in DB for email ${data.email} members count is : [${
-          queryMemberResult.length
-        }] membersIds are : [${queryMemberResult.map(member => member.memberId).join(', ')}]`
-      );
+    const memberData = await findMemberById(Number(memberId));
+    if (!memberData) {
+      throw new Error(`Member data not found for memberId ${memberId}`);
     }
-    let memberData = queryMemberResult[0];
     console.log('memberData', memberData);
-    const isNewUser = !memberData.contactId;
-    if (isNewUser) {
-      const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
-      console.log('memberDataWithContactId', memberDataWithContactId);
-      memberData = memberDataWithContactId;
-    }
-    return memberData;
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
-    console.error('Error in getSiteMemberId', error.message);
+    console.error(`Error in prepareMemberForSSOLogin: ${error.message}`);
     throw error;
   }
 }
+async function prepareMemberForQALogin(email) {
+  try {
+    console.log('qa email:', email);
+    if (!email) {
+      throw new Error(`Email is missing in passed data ${email}`);
+    }
+    const memberData = await getMemberByEmail(email);
+    if (!memberData) {
+      throw new Error(`Member data not found for email ${email}`);
+    }
+    console.log('memberData', memberData);
+    return await ensureWixMemberAndContactExist(memberData);
+  } catch (error) {
+    const errMsg = `[prepareMemberForQALogin] QA Login failed with error: ${error.message} for email: ${email}`;
+    console.error(errMsg);
+    throw new Error(errMsg);
+  }
+}
 
 /**
  * Tracks a button click with member and location info.
@@ -493,11 +536,11 @@ async function trackButtonClick({ pageName, buttonName }) {
     return null;
   }
 
-  const dbMember = await getMemberByContactId(wixMember._id);
+  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
 
   if (!dbMember) {
     console.warn(
-      `[trackButtonClick]: Member not found in MembersDataLatest for contactId: ${wixMember._id}`
+      `[trackButtonClick]: Member not found in MembersDataLatest for wixMemberId: ${wixMember._id}`
     );
     return null;
   }
@@ -523,14 +566,20 @@ async function trackButtonClick({ pageName, buttonName }) {
   }
 }
 
+async function getAllMembersWithWixMemberId() {
+  const membersQuery = wixData.query(COLLECTIONS.MEMBERS_DATA).isNotEmpty('wixMemberId');
+  return await queryAllItems(membersQuery);
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
+  getAllMembersWithWixMemberId,
   saveRegistrationData,
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,
-  getMemberByContactId,
+  getCMSMemberByWixMemberId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,
@@ -540,7 +589,8 @@ module.exports = {
   getMembersByIds,
   getMemberByEmail,
   getQAUsers,
-  getSiteMemberId,
+  prepareMemberForSSOLogin,
+  prepareMemberForQALogin,
   checkUrlUniqueness,
   trackButtonClick,
 };

package/backend/routers/methods.js

@@ -126,9 +126,16 @@ const createRoutersHandlers = wixRouterMethods => {
         };
         return ok('profile', { ...profileData, defaultProfileImage }, seoData);
       }
+      console.log(
+        `[profileRouter] Profile not found returning 404 for: ${JSON.stringify({
+          slug,
+          profileData,
+          showWixUrl: profileData?.showWixUrl,
+        })}`
+      );
       return notFound();
     } catch (error) {
-      console.error(error);
+      console.error(`Error in profileRouter for slug: ${slug} : ${error.message}`);
       return sendStatus('500', 'Internal Server Error');
     }
   }

package/backend/routers/utils.js

@@ -104,13 +104,15 @@ const getMemberProfileData = async (slug, siteAssociation) => {
     });
 
     if (!member) {
+      console.log(`[getMemberProfileData] Member not found for slug: ${slug}`);
       return null;
     }
 
     return transformMemberToProfileData(member, siteAssociation);
   } catch (error) {
-    console.error(error);
-    throw error;
+    const errorMessage = `Error in getMemberProfileData for slug: ${slug} : ${error.message}`;
+    console.error(errorMessage);
+    throw new Error(errorMessage);
   }
 };
 

package/backend/tasks/consts.js

@@ -16,6 +16,8 @@ const TASKS_NAMES = {
   migrateUrlsChunk: 'migrateUrlsChunk',
   scheduleGenerateMissingUrls: 'scheduleGenerateMissingUrls',
   generateUrlsChunk: 'generateUrlsChunk',
+  scheduleCreateContactsFromMembers: 'scheduleCreateContactsFromMembers',
+  createContactsFromMembers: 'createContactsFromMembers',
 };
 
 module.exports = {

package/backend/tasks/tasks-configs.js

@@ -16,6 +16,8 @@ const {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
+  scheduleCreateContactsFromMembers,
+  createContactsFromMembers,
 } = require('./tasks-process-methods');
 const {
   scheduleMigrateExistingUrls,
@@ -153,6 +155,20 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.scheduleCreateContactsFromMembers]: {
+    name: TASKS_NAMES.scheduleCreateContactsFromMembers,
+    getIdentifier: () => 'SHOULD_NEVER_SKIP',
+    process: scheduleCreateContactsFromMembers,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
+  [TASKS_NAMES.createContactsFromMembers]: {
+    name: TASKS_NAMES.createContactsFromMembers,
+    getIdentifier: task => task.data,
+    process: createContactsFromMembers,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
 };
 
 module.exports = { TASKS };

package/backend/tasks/tasks-process-methods.js

@@ -13,6 +13,8 @@ const {
   bulkSaveMembers,
   getAllUpdatedLoginEmails,
   getMembersByIds,
+  createContactAndMemberIfNew,
+  getAllMembersWithWixMemberId,
 } = require('../members-data-methods');
 const {
   getCompleteStateList,
@@ -530,6 +532,46 @@ const syncMemberLoginEmails = async data => {
     throw new Error(errorMessage);
   }
 };
+/**
+ * Schedules tasks to create contacts from members
+ * dev-only task, run only once by the developers
+ */
+const scheduleCreateContactsFromMembers = async () => {
+  const members = await getAllMembersWithWixMemberId();
+  console.log(
+    `Starting to schedule create contacts from members tasks for ${members.length} members in chunks of 500 members`
+  );
+  const membersChunks = chunkArray(members, 500);
+  for (let chunkIndex = 0; chunkIndex < membersChunks.length; chunkIndex++) {
+    const chunk = membersChunks[chunkIndex];
+    const toScheduleTask = {
+      name: TASKS_NAMES.createContactsFromMembers,
+      data: { chunk, chunkIndex },
+    };
+    await taskManager().schedule(toScheduleTask);
+    console.log(`Scheduled task for chunk ${chunkIndex} with ${chunk.length} members`);
+  }
+  console.log(`Successfully scheduled ${membersChunks.length} tasks for ${members.length} members`);
+};
+
+/**
+ * Creates contacts from members
+ * dev-only task, run only once by the developers
+ */
+const createContactsFromMembers = async data => {
+  const { chunk, chunkIndex } = data;
+  console.log(`Creating contacts from ${chunk.length} members in chunk ${chunkIndex}`);
+  const createPromises = chunk.map(member => createContactAndMemberIfNew(member));
+  const createResults = await Promise.all(createPromises);
+  console.log(
+    `Created ${createResults.length} contacts from ${chunk.length} members in chunk ${chunkIndex}`
+  );
+  const saveResult = await bulkSaveMembers(createResults);
+  console.log(
+    `Successfully saved ${saveResult.totalSaved} contacts from ${chunk.length} members in chunk ${chunkIndex}`
+  );
+  return saveResult;
+};
 
 module.exports = {
   scheduleTaskForEmptyAboutYouMembers,
@@ -542,4 +584,6 @@ module.exports = {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
+  scheduleCreateContactsFromMembers, // run only once by the developers
+  createContactsFromMembers,
 };

package/package.json

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

package/pages/personalDetails.js

@@ -1087,8 +1087,10 @@ async function personalDetailsOnReady({
     const personalChanges = getPersonalData();
     const originalUrl = beforeData.url;
 
+    // Only send personal fields + required identifiers (partial update)
     const formData = {
-      ...itemMemberObj,
+      _id: itemMemberObj._id,
+      memberId: itemMemberObj.memberId,
       ...personalChanges,
     };
 
@@ -1096,7 +1098,7 @@ async function personalDetailsOnReady({
     console.group('Personal Details Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', personalChanges);
-    console.log('Final Form Data:', formData);
+    console.log('Final Form Data (partial):', formData);
     console.groupEnd();
 
     const result = await saveData(formData);
@@ -1128,8 +1130,10 @@ async function personalDetailsOnReady({
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const businessChanges = getBusinessAndServicesData();
 
+    // Only send business fields + required identifiers (partial update)
     const formData = {
-      ...itemMemberObj,
+      _id: itemMemberObj._id,
+      memberId: itemMemberObj.memberId,
       ...businessChanges,
     };
 
@@ -1137,7 +1141,7 @@ async function personalDetailsOnReady({
     console.group('Business Services Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', businessChanges);
-    console.log('Final Form Data:', formData);
+    console.log('Final Form Data (partial):', formData);
     console.log('Image Changes:', {
       profileImage: uploadedImages.profileImage,
       logoImage: uploadedImages.logoImage,
@@ -1959,8 +1963,10 @@ async function personalDetailsOnReady({
     const beforeData = JSON.parse(JSON.stringify(itemMemberObj));
     const contactChanges = getContactAndBookingData();
 
+    // Only send contact fields + required identifiers (partial update)
     const formData = {
-      ...itemMemberObj,
+      _id: itemMemberObj._id,
+      memberId: itemMemberObj.memberId,
       ...contactChanges,
     };
 
@@ -1968,7 +1974,7 @@ async function personalDetailsOnReady({
     console.group('Contact & Booking Save Attempt');
     console.log('Current Data:', beforeData);
     console.log('Changes Being Applied:', contactChanges);
-    console.log('Final Form Data:', formData);
+    console.log('Final Form Data (partial):', formData);
     console.log('Address Changes:', {
       addressCount: contactChanges.addresses?.length || 0,
       addressDisplayOptions: contactChanges.addressDisplayOption,
@@ -2032,8 +2038,10 @@ async function personalDetailsOnReady({
   }
 
   async function saveGalleryToCMS() {
+    // Only send gallery field + required identifiers (partial update)
     const formData = {
-      ...itemMemberObj,
+      _id: itemMemberObj._id,
+      memberId: itemMemberObj.memberId,
       gallery: itemMemberObj.gallery,
     };
 

package/public/Utils/homePage.js

@@ -120,9 +120,11 @@ const createHomepageUtils = (_$w, filterProfiles) => {
   });
   async function handlePagination({ delta, pagination, searchResults, filter }) {
     const newPage = pagination.currentPage + delta;
-    if (newPage < 0 || newPage > 9) return;
+    const maxPage = pagination.totalPages ? pagination.totalPages - 1 : 0;
+    if (newPage < 0 || newPage > maxPage) return;
+
     newPage === 0 ? _$w('#previousPage').disable() : _$w('#previousPage').enable();
-    newPage === 9 ? _$w('#nextPage').disable() : _$w('#nextPage').enable();
+    newPage === maxPage ? _$w('#nextPage').disable() : _$w('#nextPage').enable();
     pagination.currentPage = newPage;
 
     paginateSearchResults(searchResults, pagination);
@@ -466,22 +468,21 @@ const createHomepageUtils = (_$w, filterProfiles) => {
         currentPageButtonIterator.collapse();
       }
     }
-    if (noOfPages === 0 || noOfPages === 1) {
+    if (totalPages === 0 || totalPages === 1) {
       _$w('#previousPage').disable();
       _$w('#nextPage').disable();
       return;
     }
     if (currentPage === 0) {
       _$w('#previousPage').disable();
-      return;
+    } else {
+      _$w('#previousPage').enable();
     }
-    if (currentPage === noOfPages - 1) {
+    if (currentPage >= totalPages - 1) {
       _$w('#nextPage').disable();
-      return;
+    } else {
+      _$w('#nextPage').enable();
     }
-
-    _$w('#previousPage').enable();
-    _$w('#nextPage').enable();
   }
   function paginateSearchResults(searchResults, pagination) {
     updatePaginationUI(pagination);