abmp-npm 1.1.51 → 1.6.0

package/backend/cms-data-methods.js

@@ -4,11 +4,7 @@ const { COLLECTIONS, MEMBERS_FIELDS } = require('../public/consts.js');
 const { findMainAddress } = require('../public/Utils/sharedUtils.js');
 const { calculateDistance, shuffleArray } = require('../public/Utils/sharedUtils.js');
 
-const {
-  GEO_HASH_PRECISION,
-  MAX__MEMBERS_SEARCH_RESULTS,
-  WIX_QUERY_MAX_LIMIT,
-} = require('./consts.js');
+const { PRECISION, MAX__MEMBERS_SEARCH_RESULTS, WIX_QUERY_MAX_LIMIT } = require('./consts.js');
 const { wixData } = require('./elevated-modules');
 
 function buildMembersSearchQuery(data) {
@@ -96,7 +92,7 @@ function buildMembersSearchQuery(data) {
         query = applyFilterToQuery(query, config, filter);
       });
       if (isUserLocationEnabled && isSearchingNearby) {
-        const userGeohash = geohash.encode(filter.latitude, filter.longitude, GEO_HASH_PRECISION);
+        const userGeohash = geohash.encode(filter.latitude, filter.longitude, PRECISION);
         const neighborGeohashes = geohash.neighbors(userGeohash);
         const geohashList = [userGeohash, ...neighborGeohashes];
         query = query.hasSome('locHash', geohashList);

package/backend/consts.js

@@ -8,21 +8,13 @@ const CONFIG_KEYS = {
   SITE_ASSOCIATION: 'SITE_ASSOCIATION',
 };
 
+const PRECISION = 3;
 const MAX__MEMBERS_SEARCH_RESULTS = 120;
 const WIX_QUERY_MAX_LIMIT = 1000;
 
-const TASKS_NAMES = {
-  ScheduleDailyMembersDataSync: 'ScheduleDailyMembersDataSync',
-  ScheduleMembersDataPerAction: 'ScheduleMembersDataPerAction',
-  SyncMembers: 'SyncMembers',
-};
-
-const GEO_HASH_PRECISION = 3;
-
 module.exports = {
   CONFIG_KEYS,
+  PRECISION,
   MAX__MEMBERS_SEARCH_RESULTS,
   WIX_QUERY_MAX_LIMIT,
-  TASKS_NAMES,
-  GEO_HASH_PRECISION,
 };

package/backend/index.js

@@ -1,10 +1,4 @@
 module.exports = {
   ...require('./forms-methods'),
   ...require('./search-filters-methods'),
-  ...require('./jobs'),
-  ...require('./utils'), //TODO: remove it once we finish NPM movement
-  ...require('./daily-pull'), //TODO: remove it once we finish NPM movement
-  ...require('./pac-api-methods'), //TODO: remove it once we finish NPM movement
-  ...require('./members-area-methods'), //TODO: remove it once we finish NPM movement
-  ...require('./members-data-methods'), //TODO: remove it once we finish NPM movement
 };

package/backend/members-area-methods.js

@@ -1,5 +1,5 @@
 const { auth } = require('@wix/essentials');
-const { members, authentication } = require('@wix/members');
+const { members } = require('@wix/members');
 const elevatedCreateMember = auth.elevate(members.createMember);
 
 function prepareContactData(partner) {
@@ -31,53 +31,6 @@ const createSiteMember = async memberDetails => {
   }
 };
 
-/**
- * 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.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} (contactId: ${member.contactId})`
-    );
-
-    const updatedWixMember = await authentication.changeLoginEmail(member.contactId, member.email);
-
-    console.log(
-      `✅ Successfully updated Wix login email for member ${member.memberId}: ${updatedWixMember.loginEmail}`
-    );
-
-    if (!result.wixMemberUpdates) {
-      result.wixMemberUpdates = { successful: 0, failed: 0 };
-    }
-    result.wixMemberUpdates.successful++;
-  } catch (error) {
-    console.error(`❌ Failed to update Wix login email for member ${member.memberId}:`, error);
-
-    if (!result.wixMemberUpdates) {
-      result.wixMemberUpdates = { successful: 0, failed: 0 };
-    }
-    result.wixMemberUpdates.failed++;
-
-    if (!result.wixMemberErrors) {
-      result.wixMemberErrors = [];
-    }
-    result.wixMemberErrors.push({
-      memberId: member.memberId,
-      contactId: member.contactId,
-      email: member.email,
-      error: error.message,
-    });
-  }
-}
-
 module.exports = {
   createSiteMember,
-  updateWixMemberLoginEmail,
 };

package/backend/members-data-methods.js

@@ -2,7 +2,6 @@ const { COLLECTIONS } = require('../public/consts');
 
 const { wixData } = require('./elevated-modules');
 const { createSiteMember } = require('./members-area-methods');
-const { createBatches, normalizeUrlForComparison, queryAllItems } = require('./utils');
 
 /**
  * Retrieves member data by member ID
@@ -50,117 +49,7 @@ async function createContactAndMemberIfNew(memberData) {
   }
 }
 
-/**
- * Performs bulk save operation for member data
- * @param {Array} memberDataList - Array of member data objects to save
- * @returns {Promise<Object>} - Bulk save operation result
- */
-async function bulkSaveMembers(memberDataList) {
-  if (!Array.isArray(memberDataList) || memberDataList.length === 0) {
-    throw new Error('Invalid member data list provided for bulk save');
-  }
-
-  try {
-    // bulkSave all with batches of 1000 items as this is the Velo limit for bulkSave
-    const batches = createBatches(memberDataList, 1000);
-    return await Promise.all(
-      batches.map(batch => wixData.bulkSave(COLLECTIONS.MEMBERS_DATA, batch))
-    );
-  } catch (error) {
-    console.error('Error bulk saving members:', error);
-    throw new Error(`Bulk save failed: ${error.message}`);
-  }
-}
-/**
- * Retrieves member data by member ID
- * @param {string} memberId - The member ID to search for
- * @returns {Promise<Object|null>} - Member data or null if not found
- */
-async function findMemberById(memberId) {
-  if (!memberId) {
-    throw new Error('Member ID is required');
-  }
-
-  try {
-    const queryResult = await wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('memberId', memberId)
-      .find();
-
-    return queryResult.items.length > 0 ? queryResult.items[0] : null;
-  } catch (error) {
-    throw new Error(`Failed to retrieve member data: ${error.message}`);
-  }
-}
-
-/**
- * Method to get member by slug with flexible filtering options
- * @param {Object} options - Query options
- * @param {string} options.slug - The slug to search for
- * @param {boolean} options.excludeDropped - Whether to exclude dropped members (default: true)
- * @param {boolean} options.excludeSearchedMember - Whether to exclude a specific member (default: false)
- * @param {string|number} [options.memberId] - Member ID to exclude when excludeSearchedMember is true (optional)
- * @param {boolean} [options.queryAllMatches=false] - Whether to query all matches or just the first one (default: false)
- * @returns {Promise<Object|null>} - Member data or null if not found
- */
-async function getMemberBySlug({
-  slug,
-  excludeDropped = true,
-  excludeSearchedMember = false,
-  memberId = null,
-  queryAllMatches = false,
-}) {
-  if (!slug) return null;
-
-  try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', slug);
-
-    if (excludeDropped) {
-      query = query.ne('action', 'drop');
-    }
-
-    if (excludeSearchedMember && memberId) {
-      query = query.ne('memberId', memberId);
-    }
-    let membersList;
-    if (queryAllMatches) {
-      query = query.limit(1000);
-      membersList = await queryAllItems(query);
-    } else {
-      membersList = await query.find().then(res => res.items);
-    }
-    let matchingMembers = membersList.filter(
-      item => item.url && item.url.toLowerCase() === slug.toLowerCase()
-    );
-    if (queryAllMatches) {
-      matchingMembers = membersList
-        .filter(
-          //remove trailing "-1", "-2", etc.
-          item => item.url && normalizeUrlForComparison(item.url) === slug.toLowerCase()
-        )
-        .sort((a, b) => b.url.toLowerCase().localeCompare(a.url.toLowerCase()));
-    }
-    if (matchingMembers.length > 1) {
-      const queryResultMsg = `Multiple members found with same slug ${slug} membersIds are : [${matchingMembers
-        .map(member => member.memberId)
-        .join(', ')}]`;
-      if (!queryAllMatches) {
-        throw new Error(queryResultMsg);
-      } else {
-        console.log(queryResultMsg);
-      }
-    }
-    return matchingMembers[0] || null;
-  } catch (error) {
-    console.error('Error getting member by slug:', error);
-    throw error;
-  }
-}
-
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
-  bulkSaveMembers,
-  findMemberById,
-  getMemberBySlug,
 };

package/backend/utils.js

@@ -1,8 +1,6 @@
-const { encode } = require('ngeohash');
-
 const { COLLECTIONS } = require('../public/consts');
 
-const { CONFIG_KEYS, GEO_HASH_PRECISION } = require('./consts');
+const { CONFIG_KEYS } = require('./consts');
 const { wixData } = require('./elevated-modules');
 
 /**
@@ -41,58 +39,7 @@ const retrieveAllItems = async collectionName => {
   return allItems;
 };
 
-const queryAllItems = async query => {
-  console.log('start query');
-  let oldResults = await query.find();
-  console.log(`found items: ${oldResults.items.length}`);
-  const allItems = oldResults.items;
-  while (oldResults.hasNext()) {
-    oldResults = await oldResults.next();
-    allItems.push(...oldResults.items);
-  }
-  console.log(`all items: ${allItems.length}`);
-  return allItems;
-};
-/**
- * Batches large arrays into smaller chunks for processing
- * @param {Array} array - Array to batch
- * @param {number} batchSize - Size of each batch
- * @returns {Array} - Array of batches
- */
-const createBatches = (array, batchSize = 50) => {
-  const batches = [];
-  for (let i = 0; i < array.length; i += batchSize) {
-    batches.push(array.slice(i, i + batchSize));
-  }
-  return batches;
-};
-
-const generateGeoHash = addresses => {
-  const geohash = addresses
-    ?.filter(address => (isNaN(address?.latitude) && isNaN(address?.longitude) ? false : address))
-    ?.map(address => encode(address.latitude, address.longitude, GEO_HASH_PRECISION));
-  return geohash && geohash.length > 0 ? geohash : [];
-};
-
-/**
- * Validates if input is a non-empty array
- * @param {*} input - Input to validate
- * @returns {boolean} - True if input is a non-empty array
- */
-const isValidArray = input => Array.isArray(input) && input.length > 0;
-
-const normalizeUrlForComparison = url => {
-  if (!url) return url;
-  // Remove trailing pattern like "-1", "-2", etc.
-  return url.toLowerCase().replace(/-\d+$/, '');
-};
-
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
-  createBatches,
-  generateGeoHash,
-  isValidArray,
-  normalizeUrlForComparison,
-  queryAllItems,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.1.51",
+  "version": "1.6.0",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -30,13 +30,11 @@
     "@wix/crm": "^1.0.1061",
     "@wix/data": "^1.0.303",
     "@wix/essentials": "^0.1.28",
-    "@wix/members": "^1.0.365",
-    "@wix/secrets": "^1.0.62",
+    "@wix/members": "^1.0.330",
     "@wix/site-location": "^1.31.0",
     "@wix/site-window": "^1.44.0",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
-    "psdev-task-manager": "1.1.7",
     "psdev-utils": "1.1.1"
   }
 }