abmp-npm 1.1.91 → 1.1.92

package/backend/contacts-methods.js

@@ -11,7 +11,7 @@ const elevatedCreateContact = auth.elevate(contacts.createContact);
  * @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 createContact(contactData, allowDuplicates = false) {
+async function createSiteContact(contactData, allowDuplicates = false) {
   if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
     throw new Error('Contact data is required');
   }
@@ -157,5 +157,5 @@ const updateMemberContactInfo = async (data, existingMemberData) => {
 
 module.exports = {
   updateMemberContactInfo,
-  createContact,
+  createSiteContact,
 };

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/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, prepareMemberForSSOLogin } = 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) {

package/backend/members-data-methods.js

@@ -1,7 +1,7 @@
 const { COLLECTIONS } = require('../public/consts');
 
 const { MEMBERSHIPS_TYPES } = require('./consts');
-const { updateMemberContactInfo, createContact } = 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');
@@ -42,14 +42,17 @@ async function createContactAndMemberIfNew(memberData) {
       phones: memberData.phones,
       contactFormEmail: memberData.contactFormEmail || memberData.email,
     };
-    const [wixMemberId, wixContactId] = await Promise.all([
-      createSiteMember(toCreateMemberData),
-      createContact(toCreateMemberData),
-    ]);
+    const needsWixMember = !memberData.wixMemberId;
+    const needsWixContact = !memberData.wixContactId;
+    const createPromises = [
+      needsWixMember && createSiteMember(toCreateMemberData),
+      needsWixContact && createSiteContact(toCreateMemberData),
+    ].filter(Boolean);
+    const [newWixMemberId, newWixContactId] = await Promise.all(createPromises);
     let memberDataWithContactId = {
       ...memberData,
-      wixMemberId,
-      wixContactId,
+      wixMemberId: newWixMemberId || memberData.wixMemberId,
+      wixContactId: newWixContactId || memberData.wixContactId,
     };
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
@@ -173,26 +176,26 @@ async function getMemberBySlug({
   }
 }
 
-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}`
     );
   }
 }
@@ -456,11 +459,11 @@ const getQAUsers = async () => {
  * @param {Object} memberData - Member data from DB
  * @returns {Promise<Object>} - Member data with contactId
  */
-async function ensureMemberHasContact(memberData) {
+async function ensureWixMemberAndContactExist(memberData) {
   if (!memberData) {
     throw new Error('Member data is required');
   }
-  if (!memberData.contactId) {
+  if (!memberData.wixContactId || !memberData.wixMemberId) {
     const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
     return memberDataWithContactId;
   }
@@ -478,7 +481,7 @@ async function prepareMemberForSSOLogin(data) {
       throw new Error(`Member data not found for memberId ${memberId}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForSSOLogin', error.message);
     throw error;
@@ -495,7 +498,7 @@ async function prepareMemberForQALogin(email) {
       throw new Error(`Member data not found for email ${email}`);
     }
     console.log('memberData', memberData);
-    return await ensureMemberHasContact(memberData);
+    return await ensureWixMemberAndContactExist(memberData);
   } catch (error) {
     console.error('Error in prepareMemberForQALogin', error.message);
     throw error;
@@ -517,7 +520,7 @@ async function trackButtonClick({ pageName, buttonName }) {
     return null;
   }
 
-  const dbMember = await getMemberByContactId(wixMember._id);
+  const dbMember = await getCMSMemberByWixMemberId(wixMember._id);
 
   if (!dbMember) {
     console.warn(
@@ -547,20 +550,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,
-  getMemberByContactId,
+  getCMSMemberByWixMemberId,
   getAllEmptyAboutYouMembers,
   updateMember,
   getAllMembersWithExternalImages,

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,
@@ -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.91",
+  "version": "1.1.92",
   "main": "index.js",
   "scripts": {
     "check-cycles": "madge --circular .",