abmp-npm 2.0.28 → 2.0.30

package/backend/contacts-methods.js

@@ -12,6 +12,7 @@ const elevatedCreateContact = auth.elevate(contacts.createContact);
  * @returns {Promise<Object>} - Contact data
  */
 async function createSiteContact(contactData, allowDuplicates = false) {
+  console.log('[createSiteContact]contactData', JSON.stringify(contactData, null, 2));
   if (!contactData || !(contactData.contactFormEmail || contactData.email)) {
     throw new Error('Contact data is required');
   }
@@ -27,7 +28,12 @@ async function createSiteContact(contactData, allowDuplicates = false) {
     },
     phones: { items: phones.map(phone => ({ phone })) },
   };
+  console.log('[createSiteContact]contactInfo', JSON.stringify(contactInfo, null, 2));
   const createContactResponse = await elevatedCreateContact(contactInfo, { allowDuplicates });
+  console.log(
+    '[createSiteContact]createContactResponse',
+    JSON.stringify(createContactResponse, null, 2)
+  );
   return createContactResponse.contact._id;
 }
 /**

package/backend/daily-pull/sync-to-cms-methods.js

@@ -9,6 +9,22 @@ const { bulkProcessAndSaveMemberData } = require('./bulk-process-methods');
 const { MEMBER_ACTIONS } = require('./consts');
 const { isUpdatedMember, isSiteAssociatedMember } = require('./utils');
 
+const filterLicensesByAssociation = (member, siteAssociation) => {
+  if (!member?.licenses || !Array.isArray(member.licenses)) {
+    return member;
+  }
+  const filteredLicenses = member.licenses.filter(license => {
+    if (!license || !license.association) {
+      return true;
+    }
+    return license.association === siteAssociation;
+  });
+  return {
+    ...member,
+    licenses: filteredLicenses,
+  };
+};
+
 async function syncMembersDataPerAction(taskData) {
   const { action, backupDate, isTestEnvironment, includeNone } = taskData;
   try {
@@ -110,6 +126,9 @@ async function synchronizeSinglePage(taskObject) {
       }
       return isUpdatedMember(member);
     });
+    const toSyncMembersWithFilteredLicenses = toSyncMembers.map(member =>
+      filterLicensesByAssociation(member, siteAssociation)
+    );
     if (toSyncMembers.length === 0) {
       return {
         success: true,
@@ -120,7 +139,7 @@ async function synchronizeSinglePage(taskObject) {
       };
     }
     const result = await bulkProcessAndSaveMemberData({
-      memberDataList: toSyncMembers,
+      memberDataList: toSyncMembersWithFilteredLicenses,
       currentPageNumber: pageNumber,
     });
 

package/backend/members-area-methods.js

@@ -13,9 +13,11 @@ function prepareMemberData(partner) {
 }
 async function createMemberFunction(member) {
   const newMember = await elevatedCreateMember(member);
+  console.log('[createMemberFunction]newMember', JSON.stringify(newMember, null, 2));
   return newMember._id;
 }
 const createSiteMember = async memberDetails => {
+  console.log('createSiteMember memberDetails', memberDetails);
   try {
     const options = prepareMemberData(memberDetails);
     return await createMemberFunction(options);

package/backend/members-data-methods.js

@@ -45,17 +45,23 @@ async function createContactAndMemberIfNew(memberData, allowDuplicates = false)
     };
     const needsWixMember = !memberData.wixMemberId;
     const needsWixContact = !memberData.wixContactId;
+    console.log('needsWixMember', needsWixMember);
+    console.log('needsWixContact', needsWixContact);
     const [newWixMemberId, newWixContactId] = await Promise.all([
       needsWixMember ? createSiteMember(toCreateMemberData) : Promise.resolve(null),
       needsWixContact
         ? createSiteContact(toCreateMemberData, allowDuplicates)
         : Promise.resolve(null),
     ]);
+    console.log('newWixMemberId', newWixMemberId);
+    console.log('newWixContactId', newWixContactId);
     let memberDataWithContactId = {
       ...memberData,
       wixMemberId: newWixMemberId || memberData.wixMemberId,
       wixContactId: newWixContactId || memberData.wixContactId,
     };
+    console.log('latest WixMemberId', memberDataWithContactId.wixMemberId);
+    console.log('latest WixContactId', memberDataWithContactId.wixContactId);
     const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
       ...memberDataWithContactId,
@@ -550,12 +556,14 @@ async function trackButtonClick({ pageName, buttonName, data }) {
 
   const memberName = dbMember.fullName || 'Unknown';
   const memberId = dbMember.memberId;
+  const memberEmail = dbMember.email;
 
   const clickData = {
     memberName,
     memberId,
     pageName,
     buttonName,
+    memberEmail,
     clickedAt: new Date(),
     ...(data && { data }),
   };

package/package.json

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