abmp-npm 1.1.104 → 1.1.108

package/backend/contacts-methods.js

@@ -3,33 +3,7 @@ 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
@@ -81,32 +55,27 @@ async function updateContactEmail(contactId, newEmail) {
 }
 
 /**
- * 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.firstName - The new first name
- * @param {string} params.lastName - The new last name
+ * 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
  */
-async function updateMemberAndContactNames({ wixContactId, firstName, lastName }) {
-  //TODO: rethink if we should keep all info just in contact, meaning no need to update the member
+async function updateContactNames(contactId, firstName, lastName) {
   if (!firstName && !lastName) {
     throw new Error('At least one name field is required');
   }
 
-  const createNameUpdate = currentInfo => ({
-    ...currentInfo,
-    name: {
-      first: firstName || currentInfo?.name?.first || '',
-      last: lastName || currentInfo?.name?.last || '',
-    },
-  });
-
-  const updatePromises = [
-    wixContactId && updateContactInfo(wixContactId, createNameUpdate, 'update contact names'),
-    // wixMemberId && updateContactInfo(wixMemberId, createNameUpdate, 'update member names'),
-  ].filter(Boolean);
-
-  return await Promise.all(updatePromises);
+  return await updateContactInfo(
+    contactId,
+    currentInfo => ({
+      ...currentInfo,
+      name: {
+        first: firstName || currentInfo?.name?.first || '',
+        last: lastName || currentInfo?.name?.last || '',
+      },
+    }),
+    'update contact names'
+  );
 }
 
 /**
@@ -128,18 +97,18 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
  * @param {Object} existingMemberData - Existing member data
  */
 const updateMemberContactInfo = async (data, existingMemberData) => {
-  const { wixContactId } = existingMemberData;
+  const { contactId } = existingMemberData;
 
   const updateConfig = [
     {
       fields: ['contactFormEmail'],
       updater: updateContactEmail,
-      args: ([email]) => [wixContactId, email],
+      args: ([email]) => [contactId, email],
     },
     {
       fields: ['firstName', 'lastName'],
-      updater: updateMemberAndContactNames,
-      args: ([firstName, lastName]) => [{ firstName, lastName, wixContactId }],
+      updater: updateContactNames,
+      args: ([firstName, lastName]) => [contactId, firstName, lastName],
     },
   ];
 
@@ -156,5 +125,4 @@ 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.wixMemberId && isLoginEmailChanged) {
+      if (member.contactId && 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/daily-pull/sync-to-cms-methods.js

@@ -9,9 +9,10 @@ const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
 const { SITES_WITH_INTERESTS_TO_MIGRATE } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
-async function syncMembersDataPerAction(action) {
+async function syncMembersDataPerAction(taskData) {
+  const { action, backupDate } = taskData;
   try {
-    const firstPageResponse = await fetchPACMembers(1, action);
+    const firstPageResponse = await fetchPACMembers({ page: 1, action, backupDate });
 
     if (
       !firstPageResponse ||
@@ -48,6 +49,7 @@ async function syncMembersDataPerAction(action) {
       data: {
         pageNumber,
         action,
+        ...(backupDate ? { backupDate } : {}),
       },
       type: 'scheduled',
     }));
@@ -74,11 +76,11 @@ async function syncMembersDataPerAction(action) {
  * @returns {Promise<Object>} - Page synchronization result
  */
 async function synchronizeSinglePage(taskObject) {
-  const { pageNumber, action } = taskObject.data;
+  const { pageNumber, action, backupDate } = taskObject.data;
   try {
     const [siteAssociation, memberDataResponse] = await Promise.all([
       getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION),
-      fetchPACMembers(pageNumber, action),
+      fetchPACMembers({ page: pageNumber, action, backupDate }),
     ]);
     const addInterests = SITES_WITH_INTERESTS_TO_MIGRATE.includes(siteAssociation);
     if (

package/backend/dev-only-methods.js

@@ -1,5 +1,3 @@
-const { COLLECTIONS } = require('../public/consts');
-
 const { ensureUniqueUrlsInBatch } = require('./daily-pull/bulk-process-methods');
 const { wixData } = require('./elevated-modules');
 const { bulkSaveMembers } = require('./members-data-methods');
@@ -17,14 +15,4 @@ async function deduplicateURls(collectionName, duplicateUrlsList) {
   return await bulkSaveMembers(membersWithUniqueUrls, collectionName);
 }
 
-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 };
+module.exports = { deduplicateURls };

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.wixContactId;
+  let memberContactId = memberData.contactId;
   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.wixContactId;
+    memberContactId = member.contactId;
   }
   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

@@ -13,12 +13,17 @@ async function runScheduledTasks() {
   }
 }
 
-async function scheduleDailyPullTask() {
+/**
+ * Schedule a daily pull task for the given backup date
+ * @param {string} backupDate - Optional. The date of the backup to pull in format YYYY-MM-DD
+ * @returns {Promise<void>}
+ */
+async function scheduleDailyPullTask(backupDate = null) {
   try {
     console.log('scheduleDailyPullTask started!');
     return await taskManager().schedule({
       name: TASKS_NAMES.ScheduleDailyMembersDataSync,
-      data: {},
+      data: backupDate ? { backupDate } : {}, // keeping it like this so it would be easier to understand which task was backed up which is not while looking into CMS.
       type: 'scheduled',
     });
   } catch (error) {

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

@@ -1,4 +1,4 @@
-const { prepareMemberForQALogin, getQAUsers } = require('../members-data-methods');
+const { getMemberByEmail, getQAUsers } = require('../members-data-methods');
 const { getSecret } = require('../utils');
 
 const validateQAUser = async userEmail => {
@@ -20,23 +20,27 @@ const validateQAUser = async userEmail => {
  */
 const loginQAMember = async ({ userEmail, secret }, generateSessionToken) => {
   try {
-    const [userValidation, qaSecret] = await Promise.all([
-      validateQAUser(userEmail),
-      getSecret('ABMP_QA_SECRET'),
-    ]);
+    const userValidation = await validateQAUser(userEmail);
     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 memberData = await prepareMemberForQALogin(userValidation.email);
-    const token = await generateSessionToken(memberData.email, qaSecret);
+    const token = await generateSessionToken(userValidation.email, qaSecret);
+
+    const result = await getMemberCMSId(userEmail);
+    if (!result.success) {
+      return { success: false, error: result.error };
+    }
+
     return {
       success: true,
       token,
-      memberCMSId: memberData._id,
+      memberCMSId: result.memberCMSId,
     };
   } catch (error) {
     console.error('QA login error:', error);
@@ -44,6 +48,25 @@ 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 { getCMSMemberByWixMemberId, prepareMemberForSSOLogin } = require('../members-data-methods');
+const { getMemberByContactId, getSiteMemberId } = require('../members-data-methods');
 const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
@@ -37,12 +37,12 @@ async function validateMemberToken(memberIdInput) {
     }
 
     const [dbMember, siteConfigs] = await Promise.all([
-      getCMSMemberByWixMemberId(member._id),
+      getMemberByContactId(member._id),
       getSiteConfigs(),
     ]);
     const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
     const membersExternalPortalUrl = siteConfigs[CONFIG_KEYS.MEMBERS_EXTERNAL_PORTAL_URL];
-    console.log('dbMember by wix member id is:', dbMember);
+    console.log('dbMember by contact 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 memberData = await prepareMemberForSSOLogin(payload);
-    console.log('memberDataCollectionId', memberData._id);
-    const sessionToken = await generateSessionToken(memberData.email);
+    const membersData = await getSiteMemberId(payload);
+    console.log('membersDataCollectionId', membersData._id);
+    const sessionToken = await generateSessionToken(membersData.email);
     const authObj = {
       type: 'success',
-      memberId: memberData._id,
+      memberId: membersData._id,
       sessionToken,
     };
     return authObj;

package/backend/members-area-methods.js

@@ -1,18 +1,16 @@
 const { auth } = require('@wix/essentials');
 const { members, authentication } = require('@wix/members');
 const elevatedCreateMember = auth.elevate(members.createMember);
-const eleveatedChangeLoginEmail = auth.elevate(authentication.changeLoginEmail);
 
-function prepareMemberData(partner) {
-  // const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
+function prepareContactData(partner) {
+  const phones = Array.isArray(partner.phones) ? partner.phones : []; //some users don't have phones
   const options = {
     member: {
-      // //Keeping contact creation in member data for future purposes, in case we need to use it later
-      // contact: {
-      //   ...partner,
-      //   phones,
-      //   emails: [partner.contactFormEmail || partner.email],
-      // },
+      contact: {
+        ...partner,
+        phones,
+        emails: [partner.contactFormEmail || partner.email],
+      },
       loginEmail: partner.email,
     },
   };
@@ -24,8 +22,9 @@ async function createMemberFunction(member) {
 }
 const createSiteMember = async memberDetails => {
   try {
-    const options = prepareMemberData(memberDetails);
-    return await createMemberFunction(options);
+    const options = prepareContactData(memberDetails);
+    const contactId = await createMemberFunction(options);
+    return contactId;
   } catch (error) {
     console.error(`Error in createSiteMember ${error.message}`);
     throw error;
@@ -38,22 +37,22 @@ const getCurrentMember = async () => {
 };
 
 /**
- * Updates Wix member login email if the member has a wixMemberId (registered Wix member)
- * @param {Object} member - Member object with wixMemberId and email
+ * Updates Wix member login email if the member has a contactId (registered Wix member)
+ * @param {Object} member - Member object with contactId and email
  * @param {Object} result - Result object to track Wix member updates
  */
 async function updateWixMemberLoginEmail(member, result = {}) {
-  if (!member.wixMemberId) {
-    console.log(`Member ${member.memberId} has no wixMemberId - skipping Wix login email update`);
+  if (!member.contactId) {
+    console.log(`Member ${member.memberId} has no contactId - skipping Wix login email update`);
     return;
   }
 
   try {
     console.log(
-      `Updating Wix login email for member ${member.memberId} (wixMemberId: ${member.wixMemberId})`
+      `Updating Wix login email for member ${member.memberId} (contactId: ${member.contactId})`
     );
 
-    const updatedWixMember = await eleveatedChangeLoginEmail(member.wixMemberId, member.email);
+    const updatedWixMember = await authentication.changeLoginEmail(member.contactId, member.email);
 
     console.log(
       `✅ Successfully updated Wix login email for member ${member.memberId}: ${updatedWixMember.loginEmail}`
@@ -76,7 +75,7 @@ async function updateWixMemberLoginEmail(member, result = {}) {
     }
     result.wixMemberErrors.push({
       memberId: member.memberId,
-      wixMemberId: member.wixMemberId,
+      contactId: member.contactId,
       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, createSiteContact } = require('./contacts-methods');
+const { updateMemberContactInfo } = require('./contacts-methods');
 const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
@@ -43,16 +43,10 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    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),
-    ]);
+    const contactId = await createSiteMember(toCreateMemberData);
     let memberDataWithContactId = {
       ...memberData,
-      wixMemberId: newWixMemberId || memberData.wixMemberId,
-      wixContactId: newWixContactId || memberData.wixContactId,
+      contactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -100,16 +94,10 @@ async function findMemberById(memberId) {
     const queryResult = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
       .eq('memberId', memberId)
-      .limit(2)
       .find();
-    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;
+
+    return queryResult.items.length > 0 ? queryResult.items[0] : null;
   } catch (error) {
-    console.error('Error finding member by ID:', error);
     throw new Error(`Failed to retrieve member data: ${error.message}`);
   }
 }
@@ -176,26 +164,26 @@ async function getMemberBySlug({
   }
 }
 
-async function getCMSMemberByWixMemberId(wixMemberId) {
-  if (!wixMemberId) {
-    throw new Error('Wix Member ID is required');
+async function getMemberByContactId(contactId) {
+  if (!contactId) {
+    throw new Error('Contact ID is required');
   }
   try {
     const members = await wixData
       .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('wixMemberId', wixMemberId)
+      .eq('contactId', contactId)
       .limit(2)
       .find()
       .then(res => res.items);
     if (members.length > 1) {
       throw new Error(
-        `[getCMSMemberByWixMemberId] Multiple members found with wixMemberId ${wixMemberId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
       );
     }
     return members[0] || null;
   } catch (error) {
     throw new Error(
-      `[getCMSMemberByWixMemberId] Failed to retrieve member by wixMemberId ${wixMemberId} data: ${error.message}`
+      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
     );
   }
 }
@@ -454,53 +442,38 @@ const getQAUsers = async () => {
     throw new Error(`Failed to get QA users: ${error.message}`);
   }
 };
-/**
- * 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) {
+async function getSiteMemberId(data) {
   try {
     console.log('data', data);
     const memberId = data?.pac?.cst_recno;
     if (!memberId) {
-      throw new Error(`Member ID is missing in passed data ${JSON.stringify(data)}`);
+      const errorMessage = `Member ID is missing in passed data ${JSON.stringify(data)}`;
+      console.error(errorMessage);
+      throw new Error(errorMessage);
     }
-    const memberData = await findMemberById(Number(memberId));
-    if (!memberData) {
-      throw new Error(`Member data not found for memberId ${memberId}`);
+    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(', ')}]`
+      );
     }
+    let memberData = queryMemberResult[0];
     console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData);
-  } catch (error) {
-    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}`);
+    const isNewUser = !memberData.contactId;
+    if (isNewUser) {
+      const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
+      console.log('memberDataWithContactId', memberDataWithContactId);
+      memberData = memberDataWithContactId;
     }
-    console.log('memberData', memberData);
-    return await ensureWixMemberAndContactExist(memberData);
+    return memberData;
   } catch (error) {
-    console.error('Error in prepareMemberForQALogin', error.message);
+    console.error('Error in getSiteMemberId', error.message);
     throw error;
   }
 }
@@ -520,11 +493,11 @@ async function trackButtonClick({ pageName, buttonName }) {
     return null;
   }
 
-  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
+  const dbMember = await getMemberByContactId(wixMember._id);
 
   if (!dbMember) {
     console.warn(
-      `[trackButtonClick]: Member not found in MembersDataLatest for wixMemberId: ${wixMember._id}`
+      `[trackButtonClick]: Member not found in MembersDataLatest for contactId: ${wixMember._id}`
     );
     return null;
   }
@@ -550,20 +523,14 @@ 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,
-  getCMSMemberByWixMemberId,
+  getMemberByContactId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,
@@ -573,8 +540,7 @@ module.exports = {
   getMembersByIds,
   getMemberByEmail,
   getQAUsers,
-  prepareMemberForSSOLogin,
-  prepareMemberForQALogin,
+  getSiteMemberId,
   checkUrlUniqueness,
   trackButtonClick,
 };

package/backend/pac-api-methods.js

@@ -1,4 +1,4 @@
-const { PAC_API_URL } = require('./consts');
+const { PAC_API_URL, BACKUP_API_URL } = require('./consts');
 const { getSecret } = require('./utils');
 
 const getHeaders = async () => {
@@ -8,8 +8,22 @@ const getHeaders = async () => {
   };
   return headers;
 };
-const fetchPACMembers = async (pageNum, actionFilter) => {
-  const url = `${PAC_API_URL}/Members?page=${pageNum}&actionFilter=${actionFilter}`;
+/**
+ *
+ * @param {*} params
+ * @param {number} params.page - The page number to fetch
+ * @param {string} params.action - The action to fetch
+ * @param {string} [params.backupDate] - Optional. The backup date to fetch in format YYYY-MM-DD, use only to fetch from backup endpoint not from PAC endpoint.
+ * @returns {Promise<Object>} - The response from the API
+ */
+const fetchPACMembers = async ({ page, action, backupDate }) => {
+  const baseUrl = backupDate ? BACKUP_API_URL : PAC_API_URL;
+  const queryParams = { page, actionFilter: action };
+  if (backupDate) {
+    queryParams.date = backupDate;
+  }
+  const url = `${baseUrl}/Members?${new URLSearchParams(queryParams).toString()}`;
+  console.log(`Fetching PAC members from:  ${url}`);
   const headers = await getHeaders();
   const fetchOptions = {
     method: 'get',
@@ -18,14 +32,14 @@ const fetchPACMembers = async (pageNum, actionFilter) => {
   const response = await fetch(url, fetchOptions);
   const responseType = response.headers.get('content-type');
   if (!responseType.includes('application/json')) {
-    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${pageNum} and actionFilter ${actionFilter}`;
+    const errorMessage = `[fetchPACMembers] got invalid responseType: ${responseType} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }
   if (response.ok) {
     return response.json();
   } else {
-    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${pageNum} and actionFilter ${actionFilter}`;
+    const errorMessage = `[fetchPACMembers] failed with status ${response.status} for page ${page} and actionFilter ${action}`;
     console.error(errorMessage);
     throw new Error(errorMessage);
   }

package/backend/tasks/consts.js

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

package/backend/tasks/tasks-configs.js

@@ -16,8 +16,6 @@ const {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
-  scheduleCreateContactsFromMembers,
-  createContactsFromMembers,
 } = require('./tasks-process-methods');
 const {
   scheduleMigrateExistingUrls,
@@ -45,7 +43,7 @@ const TASKS = {
   },
   [TASKS_NAMES.ScheduleMembersDataPerAction]: {
     name: TASKS_NAMES.ScheduleMembersDataPerAction,
-    getIdentifier: task => task.data.action,
+    getIdentifier: task => task.data,
     process: syncMembersDataPerAction,
     shouldSkipCheck: () => false,
     estimatedDurationSec: 6,
@@ -155,20 +153,6 @@ 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,8 +13,6 @@ const {
   bulkSaveMembers,
   getAllUpdatedLoginEmails,
   getMembersByIds,
-  createContactAndMemberIfNew,
-  getAllMembersWithWixMemberId,
 } = require('../members-data-methods');
 const {
   getCompleteStateList,
@@ -532,46 +530,6 @@ 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,
@@ -584,6 +542,4 @@ module.exports = {
   migrateContactFormEmails,
   scheduleEmailSync,
   syncMemberLoginEmails,
-  scheduleCreateContactsFromMembers, // run only once by the developers
-  createContactsFromMembers,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.104",
+  "version": "1.1.108",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",
@@ -50,7 +50,7 @@
     "csv-parser": "^3.0.0",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
-    "psdev-task-manager": "1.1.7",
+    "psdev-task-manager": "1.1.9",
     "psdev-utils": "1.1.1"
   }
 }