abmp-npm 2.0.6 → 2.0.9

package/backend/consts.js

@@ -1,4 +1,5 @@
 const PAC_API_URL = 'https://members.abmp.com/eweb/api/Wix';
+const BACKUP_API_URL = 'https://psdevteamenterpris.wixstudio.com/abmp-backup/_functions';
 const SSO_TOKEN_AUTH_API_URL = 'https://members.professionalassistcorp.com/';
 
 /**
@@ -40,4 +41,5 @@ module.exports = {
   COMPILED_FILTERS_FIELDS,
   MEMBERSHIPS_TYPES,
   SSO_TOKEN_AUTH_API_URL,
+  BACKUP_API_URL,
 };

package/backend/elevated-modules.js

@@ -12,7 +12,7 @@ const wixData = {
   get: auth.elevate(items.get),
   truncate: auth.elevate(items.truncate),
   bulkSave: auth.elevate(items.bulkSave),
+  search: auth.elevate(items.search),
   //TODO: add other methods here as needed
 };
-
 module.exports = { wixData };

package/backend/members-data-methods.js

@@ -10,6 +10,7 @@ const {
   normalizeUrlForComparison,
   queryAllItems,
   generateGeoHash,
+  searchAllItems,
 } = require('./utils');
 
 /**
@@ -121,7 +122,7 @@ async function getMemberBySlug({
   if (!slug) return null;
 
   try {
-    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', slug);
+    let query = wixData.search(COLLECTIONS.MEMBERS_DATA).expression(slug);
 
     if (excludeDropped) {
       query = query.ne('action', 'drop');
@@ -131,7 +132,8 @@ async function getMemberBySlug({
       query = query.ne('memberId', memberId);
     }
     query = query.limit(1000);
-    const membersList = await queryAllItems(query);
+    const searchResult = await searchAllItems(query);
+    const membersList = searchResult.filter(item => item.url && item.url.includes(slug)); //replacement for contains
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );

package/backend/utils.js

@@ -107,18 +107,28 @@ function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
     })
     .filter(Boolean);
 }
-const queryAllItems = async query => {
-  console.log('start query');
-  let oldResults = await query.find();
+const getAllItems = async querySearchResult => {
+  let oldResults = querySearchResult;
   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}`);
+  console.log(`all items count : ${allItems.length}`);
   return allItems;
 };
+const searchAllItems = async searchQuery => {
+  console.log('start search');
+  const searchResults = await searchQuery.run();
+  return getAllItems(searchResults);
+};
+
+const queryAllItems = async query => {
+  console.log('start query');
+  const queryResults = await query.find();
+  return getAllItems(queryResults);
+};
 /**
  * Chunks large arrays into smaller chunks for processing
  * @param {Array} array - Array to chunk
@@ -206,4 +216,5 @@ module.exports = {
   formatDateOnly,
   getAddressesByStatus,
   isPAC_STAFF,
+  searchAllItems,
 };

package/package.json

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