abmp-npm 1.8.31 → 1.8.33

package/backend/utils.js

@@ -2,8 +2,9 @@ const { encode } = require('ngeohash');
 
 const { COLLECTIONS } = require('../public/consts');
 
-const { CONFIG_KEYS, PRECISION } = require('./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,80 +82,84 @@ function getAddressDisplayOptions(member) {
   return displayOptions;
 }
 
+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;
+};
 /**
- * Get all interests from the database
- * @returns {Promise<Array<string>>} Array of interest titles sorted alphabetically
+ * 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
  */
-async function getInterestAll() {
-  try {
-    let res = await wixData.query('interests').limit(1000).find();
-
-    let interests = res.items.map(x => x.title);
-
-    while (res.hasNext()) {
-      res = await res.next();
-      interests.push(...res.items.map(x => x.title));
-    }
-
-    // Sort the interests alphabetically (case-insensitive)
-    interests = interests.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
-
-    return interests;
-  } catch (e) {
-    console.error('Error in getInterestAll:', e);
-    throw e;
+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;
+};
 
-/**
- * Generate geohash from addresses
- * @param {Array} addresses - Array of address objects with latitude and longitude
- * @returns {Array} Array of geohash strings
- */
-function generateGeoHash(addresses) {
+const generateGeoHash = addresses => {
   const geohash = addresses
     ?.filter(address => (isNaN(address?.latitude) && isNaN(address?.longitude) ? false : address))
-    ?.map(address => encode(address.latitude, address.longitude, PRECISION));
+    ?.map(address => encode(address.latitude, address.longitude, GEO_HASH_PRECISION));
   return geohash && geohash.length > 0 ? geohash : [];
-}
+};
 
 /**
- * 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
+ * Validates if input is a non-empty array
+ * @param {*} input - Input to validate
+ * @returns {boolean} - True if input is a non-empty array
  */
-async function urlExists(url, excludeMemberId) {
-  if (!url) return false;
-
-  try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', url).ne('action', 'drop');
+const isValidArray = input => Array.isArray(input) && input.length > 0;
 
-    if (excludeMemberId) {
-      query = query.ne('memberId', excludeMemberId);
-    }
+const normalizeUrlForComparison = url => {
+  if (!url) return url;
+  // Remove trailing pattern like "-1", "-2", etc.
+  return url.toLowerCase().replace(/-\d+$/, '');
+};
 
-    const { items } = await query.find();
+/**
+ * Checks URL uniqueness for a member
+ * @param {string} url - The URL to check
+ * @param {string} memberId - The member ID to exclude from the check
+ * @returns {Promise<Object>} Result object with isUnique boolean
+ */
+async function checkUrlUniqueness(url, memberId) {
+  if (!url || !memberId) {
+    throw new Error('Missing required parameters: url and memberId are required');
+  }
 
-    // Case-insensitive comparison
-    const matchingMembers = items.filter(
-      item => item.url && item.url.toLowerCase() === url.toLowerCase()
-    );
+  try {
+    const trimmedUrl = url.trim();
+    const exists = await urlExists(trimmedUrl, memberId);
 
-    return matchingMembers.length > 0;
+    return { isUnique: !exists };
   } catch (error) {
-    console.error('Error checking URL existence:', error);
-    return false;
+    console.error('Error checking URL uniqueness:', error);
+    throw new Error(`Failed to check URL uniqueness: ${error.message}`);
   }
 }
 
 module.exports = {
   getSiteConfigs,
   retrieveAllItems,
+  createBatches,
+  generateGeoHash,
+  isValidArray,
+  normalizeUrlForComparison,
+  queryAllItems,
+  checkUrlUniqueness,
   formatDateToMonthYear,
   isStudent,
   getAddressDisplayOptions,
-  getInterestAll,
-  generateGeoHash,
-  urlExists,
 };

package/eslint.config.js

@@ -31,7 +31,7 @@ module.exports = [
       // Error prevention
       'no-var': 'error',
       'no-unused-vars': ['error', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
-      'no-console': ['warn', { allow: ['warn', 'error', 'log', 'info'] }],
+      'no-console': ['warn', { allow: ['warn', 'error', 'log', 'info', 'group', 'groupEnd'] }],
       'no-debugger': 'warn',
       'no-duplicate-imports': 'error',
       'no-unused-expressions': ['error', { allowShortCircuit: true, allowTernary: true }],

package/package.json

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