abmp-npm 1.8.32 → 1.8.34

package/backend/consts.js

@@ -11,18 +11,6 @@ const CONFIG_KEYS = {
 const MAX__MEMBERS_SEARCH_RESULTS = 120;
 const WIX_QUERY_MAX_LIMIT = 1000;
 
-/**
- * Member action types
- * @readonly
- * @enum {string}
- */
-const MEMBER_ACTIONS = {
-  UPDATE: 'update',
-  NEW: 'new',
-  DROP: 'drop',
-  NONE: 'none',
-};
-
 const TASKS_NAMES = {
   ScheduleDailyMembersDataSync: 'ScheduleDailyMembersDataSync',
   ScheduleMembersDataPerAction: 'ScheduleMembersDataPerAction',
@@ -35,7 +23,6 @@ module.exports = {
   CONFIG_KEYS,
   MAX__MEMBERS_SEARCH_RESULTS,
   WIX_QUERY_MAX_LIMIT,
-  MEMBER_ACTIONS,
   TASKS_NAMES,
   GEO_HASH_PRECISION,
 };

package/backend/contacts-methods.js

@@ -1,10 +1,9 @@
 const { contacts } = require('@wix/crm');
 const { auth } = require('@wix/essentials');
+
 const elevatedGetContact = auth.elevate(contacts.getContact);
 const elevatedUpdateContact = auth.elevate(contacts.updateContact);
 
-const { findMemberByWixDataId } = require('./members-data-methods');
-
 /**
  * Generic contact update helper function
  * @param {string} contactId - The contact ID in Wix CRM
@@ -94,12 +93,11 @@ const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
 
 /**
  * Updates member contact information in CRM if fields have changed
- * @param {string} id - Member ID
  * @param {Object} data - New member data
+ * @param {Object} existingMemberData - Existing member data
  */
-const updateMemberContactInfo = async (id, data) => {
-  const existing = await findMemberByWixDataId(id);
-  const { contactId } = existing;
+const updateMemberContactInfo = async (data, existingMemberData) => {
+  const { contactId } = existingMemberData;
 
   const updateConfig = [
     {
@@ -116,7 +114,7 @@ const updateMemberContactInfo = async (id, data) => {
 
   const updatePromises = updateConfig
     .map(({ fields, updater, args }) => {
-      const existingValues = fields.map(field => existing[field]);
+      const existingValues = fields.map(field => existingMemberData[field]);
       const newValues = fields.map(field => data[field]);
       return updateIfChanged(existingValues, newValues, updater, args);
     })

package/backend/members-data-methods.js

@@ -1,7 +1,7 @@
 const { COLLECTIONS } = require('../public/consts');
 
-const { MEMBER_ACTIONS } = require('./consts');
 const { updateMemberContactInfo } = require('./contacts-methods');
+const { MEMBER_ACTIONS } = require('./daily-pull');
 const { wixData } = require('./elevated-modules');
 const { createSiteMember, getCurrentMember } = require('./members-area-methods');
 const {
@@ -11,9 +11,9 @@ const {
   formatDateToMonthYear,
   getAddressDisplayOptions,
   isStudent,
-  urlExists,
   generateGeoHash,
 } = require('./utils');
+
 /**
  * Retrieves member data by member ID
  * @param {string} memberId - The member ID to search for
@@ -267,7 +267,9 @@ async function saveRegistrationData(data, id) {
       data.locHash = generateGeoHash(data.addresses);
     }
 
-    await updateMemberContactInfo(id, data);
+    const existingMemberData = await findMemberByWixDataId(id);
+
+    await updateMemberContactInfo(data, existingMemberData);
 
     const saveData = await wixData.update(COLLECTIONS.MEMBERS_DATA, data);
     return {
@@ -283,6 +285,39 @@ async function saveRegistrationData(data, id) {
   }
 }
 
+/**
+ * Checks if a URL already exists in the database for a different member (case-insensitive)
+ * @param {string} url - The URL to check
+ * @param {string|number} excludeMemberId - Member ID to exclude from the check
+ * @returns {Promise<boolean>} - True if URL exists for another member
+ */
+async function urlExists(url, excludeMemberId) {
+  if (!url) return false;
+
+  try {
+    let query = wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .contains('url', url)
+      .ne('action', MEMBER_ACTIONS.DROP);
+
+    if (excludeMemberId) {
+      query = query.ne('memberId', excludeMemberId);
+    }
+
+    const { items } = await query.find();
+
+    // Case-insensitive comparison
+    const matchingMembers = items.filter(
+      item => item.url && item.url.toLowerCase() === url.toLowerCase()
+    );
+
+    return matchingMembers.length > 0;
+  } catch (error) {
+    console.error('Error checking URL existence:', error);
+    return false;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,

package/backend/utils.js

@@ -4,6 +4,7 @@ const { COLLECTIONS } = require('../public/consts');
 
 const { CONFIG_KEYS, GEO_HASH_PRECISION } = require('./consts');
 const { wixData } = require('./elevated-modules');
+const { urlExists } = require('./members-data-methods');
 
 /**
  * Retrieves site configuration values from the database
@@ -81,35 +82,6 @@ function getAddressDisplayOptions(member) {
   return displayOptions;
 }
 
-/**
- * Checks if a URL already exists in the database for a different member (case-insensitive)
- * @param {string} url - The URL to check
- * @param {string|number} excludeMemberId - Member ID to exclude from the check
- * @returns {Promise<boolean>} - True if URL exists for another member
- */
-async function urlExists(url, excludeMemberId) {
-  if (!url) return false;
-
-  try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', url).ne('action', 'drop');
-
-    if (excludeMemberId) {
-      query = query.ne('memberId', excludeMemberId);
-    }
-
-    const { items } = await query.find();
-
-    // Case-insensitive comparison
-    const matchingMembers = items.filter(
-      item => item.url && item.url.toLowerCase() === url.toLowerCase()
-    );
-
-    return matchingMembers.length > 0;
-  } catch (error) {
-    console.error('Error checking URL existence:', error);
-    return false;
-  }
-}
 const queryAllItems = async query => {
   console.log('start query');
   let oldResults = await query.find();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.8.32",
+  "version": "1.8.34",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",