abmp-npm 1.1.63 → 1.1.64

package/backend/cms-data-methods.js

@@ -231,9 +231,17 @@ async function getInterestAll() {
     throw e;
   }
 }
+async function clearCollection(collectionName) {
+  try {
+    await wixData.truncate(collectionName);
+  } catch (err) {
+    throw new Error(`Failed to clearCollection ${collectionName} with error: ${err.message}`);
+  }
+}
 
 module.exports = {
   buildMembersSearchQuery,
   fetchAllItemsInParallel,
   getInterestAll,
+  clearCollection,
 };

package/backend/elevated-modules.js

@@ -10,6 +10,7 @@ const wixData = {
   save: auth.elevate(items.save),
   remove: auth.elevate(items.remove),
   get: auth.elevate(items.get),
+  truncate: auth.elevate(items.truncate),
   //TODO: add other methods here as needed
 };
 

package/backend/http-functions/httpFunctions.js

@@ -0,0 +1,72 @@
+const { COLLECTIONS } = require('../../public/consts');
+const { clearCollection } = require('../cms-data-methods');
+const { getSecret } = require('../utils');
+
+const { migrateInterests } = require('./interests');
+
+const createHTTPFunctionsHelpers = wixHTTPFunctionsMethods => {
+  const { created, serverError, forbidden, ok, badRequest } = wixHTTPFunctionsMethods;
+  const responseOptions = {
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  };
+
+  const isRequestAuthenticated = async request => {
+    const AUTH_TOKEN = await getSecret('migrate-api-key');
+    return request.headers.authorization === 'Bearer ' + AUTH_TOKEN;
+  };
+
+  const withAuth = handler => async request => {
+    if (!(await isRequestAuthenticated(request))) {
+      return forbidden({
+        ...responseOptions,
+        body: { error: 'Unauthorized' },
+      });
+    }
+    return handler(request);
+  };
+
+  const migrateInterestsHandler = async _request => {
+    try {
+      const result = await migrateInterests();
+      return created({
+        ...responseOptions,
+        body: {
+          result,
+        },
+      });
+    } catch (error) {
+      console.error('Error migrating interests:', error);
+      return serverError(error);
+    }
+  };
+
+  const clearCollectionHandler = async request => {
+    try {
+      const collectionName = request.query.collectionName;
+      if (!collectionName || !Object.values(COLLECTIONS).includes(collectionName)) {
+        return badRequest({
+          ...responseOptions,
+          body: { error: 'Invalid collection name' },
+        });
+      }
+      const result = await clearCollection(collectionName);
+      return ok({
+        ...responseOptions,
+        body: {
+          result,
+        },
+      });
+    } catch (error) {
+      return serverError(error);
+    }
+  };
+
+  return {
+    post_migrateInterests: withAuth(migrateInterestsHandler),
+    delete_clearCollection: withAuth(clearCollectionHandler),
+  };
+};
+
+module.exports = { createHTTPFunctionsHelpers };

package/backend/http-functions/index.js

@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('./httpFunctions'),
+};

package/backend/http-functions/interests.js

@@ -0,0 +1,37 @@
+const { COLLECTIONS } = require('../../public/consts');
+const { clearCollection } = require('../cms-data-methods');
+const { CONFIG_KEYS } = require('../consts');
+const { wixData } = require('../elevated-modules');
+const { getHeaders } = require('../pac-api-methods');
+const { getSiteConfigs } = require('../utils');
+
+const getInterests = async () => {
+  const [url, headers] = await Promise.all([
+    getSiteConfigs(CONFIG_KEYS.INTERESTS_API_URL),
+    getHeaders(),
+  ]);
+  const fetchOptions = {
+    method: 'get',
+    headers: headers,
+  };
+  try {
+    const response = await fetch(url, fetchOptions);
+    return await response.json();
+  } catch (e) {
+    console.error('Error getting interests:', e);
+    throw e;
+  }
+};
+
+async function migrateInterests() {
+  const [interests, _] = await Promise.all([
+    getInterests(),
+    clearCollection(COLLECTIONS.INTERESTS),
+  ]);
+  const interestData = interests.map(val => ({ title: val.interest }));
+  return await wixData.bulkInsert(COLLECTIONS.INTERESTS, interestData);
+}
+
+module.exports = {
+  migrateInterests,
+};

package/backend/index.js

@@ -9,7 +9,7 @@ module.exports = {
   ...require('./members-area-methods'), //TODO: remove it once we finish NPM movement
   ...require('./members-data-methods'), //TODO: remove it once we finish NPM movement
   ...require('./cms-data-methods'), //TODO: remove it once we finish NPM movement
-  ...require('./routers'),
   ...require('./sso-methods'),
   ...require('./data-hooks'),
+  ...require('./http-functions'),
 };

package/backend/utils.js

@@ -3,17 +3,18 @@ const { secrets } = require('@wix/secrets');
 const { site } = require('@wix/urls');
 const { encode } = require('ngeohash');
 
-const { COLLECTIONS, ADDRESS_STATUS_TYPES } = require('../public/consts');
-const { formatAddress, generateId } = require('../public/Utils/sharedUtils');
+const { COLLECTIONS } = require('../public/consts');
 
-const { CONFIG_KEYS, GEO_HASH_PRECISION, MEMBERSHIPS_TYPES } = require('./consts');
+const { CONFIG_KEYS, GEO_HASH_PRECISION } = require('./consts');
 const { wixData } = require('./elevated-modules');
 const { urlExists } = require('./members-data-methods');
 const elevatedGetSecretValue = elevate(secrets.getSecretValue);
 
 /**
  * Retrieves site configuration values from the database
- * @param {keyof typeof CONFIG_KEYS} [configKey] - The configuration key to retrieve
+ * @param {string} [configKey] - The configuration key to retrieve. Must be one of:
+ *   - 'AUTOMATION_EMAIL_TRIGGER_ID' - Email template ID for triggered emails
+ *   - 'SITE_ASSOCIATION' - Site association configuration
  * @returns {Promise<any>} The configuration value for the specified key, or all configs if no key provided
  * @example
  * // Get specific config
@@ -59,26 +60,18 @@ function formatDateToMonthYear(dateString) {
   return date.toLocaleDateString('en-US', options);
 }
 
-function hasStudentMembership({ member, checkAssociation = false, siteAssociation = null }) {
+/**
+ * Check if member is a student
+ * @param {Object} member - The member object
+ * @returns {boolean} True if member has student membership
+ */
+function isStudent(member) {
   const memberships = member?.memberships;
   if (!Array.isArray(memberships)) return false;
 
-  return memberships.some(membership => {
-    const isStudent = membership.membertype === MEMBERSHIPS_TYPES.STUDENT;
-    const hasCorrectAssociation = !checkAssociation || membership.association === siteAssociation;
-    return isStudent && hasCorrectAssociation;
-  });
-}
-
-function isStudent(member) {
-  return hasStudentMembership({ member, checkAssociation: false });
+  return memberships.some(membership => membership.membertype === 'student');
 }
 
-function isPAC_STAFF(member) {
-  return Boolean(
-    member?.memberships?.some(membership => membership.membertype === MEMBERSHIPS_TYPES.PAC_STAFF)
-  );
-}
 /**
  * Get address display options for member
  * @param {Object} member - The member object
@@ -92,22 +85,7 @@ function getAddressDisplayOptions(member) {
   }
   return displayOptions;
 }
-function getAddressesByStatus(addresses = [], addressDisplayOption = []) {
-  const visible = addresses.filter(addr => addr.addressStatus !== ADDRESS_STATUS_TYPES.DONT_SHOW);
-  if (visible.length < 2) {
-    return [];
-  }
-  const opts = Array.isArray(addressDisplayOption) ? addressDisplayOption : [];
-  const mainOpt = opts.find(o => o.isMain);
-  const mainKey = mainOpt ? mainOpt.key : visible[0].key; // fallback to the first visible if none marked
-  return visible
-    .filter(addr => addr?.key !== mainKey)
-    .map(addr => {
-      const addressString = formatAddress(addr);
-      return addressString ? { _id: generateId(), address: addressString } : null;
-    })
-    .filter(Boolean);
-}
+
 const queryAllItems = async query => {
   console.log('start query');
   let oldResults = await query.find();
@@ -222,12 +200,9 @@ module.exports = {
   checkUrlUniqueness,
   formatDateToMonthYear,
   isStudent,
-  hasStudentMembership,
   getAddressDisplayOptions,
   getSecret,
   getSiteBaseUrl,
   encodeXml,
   formatDateOnly,
-  getAddressesByStatus,
-  isPAC_STAFF,
 };

package/package.json

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

package/public/Utils/sharedUtils.js

@@ -168,5 +168,4 @@ module.exports = {
   calculateDistance,
   toRadians,
   generateId,
-  formatAddress,
 };

package/public/index.js

@@ -1,5 +1,4 @@
 module.exports = {
   ...require('./consts'),
   ...require('./messages'),
-  ...require('./Utils/sharedUtils'),
 };

package/backend/routers/index.js

@@ -1,3 +0,0 @@
-module.exports = {
-  ...require('./methods'),
-};

package/backend/routers/methods.js

@@ -1,177 +0,0 @@
-const { PAGES_PATHS } = require('../../public/consts');
-//const { fetchAllItemsInParallel } = require('../cms-data-methods'); unused at host site
-const { CONFIG_KEYS } = require('../consts');
-const { getSiteConfigs } = require('../utils');
-
-const { generateSEOTitle, stripHtmlTags, getMemberProfileData } = require('./utils');
-
-const createRoutersHandlers = wixRouterMethods => {
-  const {
-    redirect,
-    ok,
-    notFound,
-    sendStatus,
-    WixRouterSitemapEntry: _WixRouterSitemapEntry,
-  } = wixRouterMethods;
-
-  async function profileRouter(request) {
-    const slug = request.path[0];
-    if (!slug) {
-      return redirect(request.baseUrl);
-    }
-    try {
-      const siteConfigs = await getSiteConfigs();
-      const siteAssociation = siteConfigs[CONFIG_KEYS.SITE_ASSOCIATION];
-      const defaultSEODescription = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_SEO_DESCRIPTION];
-      const siteLogoUrl = siteConfigs[CONFIG_KEYS.SITE_LOGO_URL];
-      const defaultProfileImage = siteConfigs[CONFIG_KEYS.DEFAULT_PROFILE_IMAGE];
-      const profileData = await getMemberProfileData(slug, siteAssociation);
-      if (profileData && profileData.showWixUrl) {
-        const ogImage = profileData.profileImage || profileData.logoImage || siteLogoUrl;
-        const seoTitle = generateSEOTitle({
-          fullName: profileData.fullName,
-          areasOfPractices: profileData.areasOfPractices,
-          siteAssociation,
-        });
-        // Use stripped HTML from aboutService rich text content
-        let description = stripHtmlTags(profileData.aboutService) || defaultSEODescription;
-
-        // Limit description to 160 characters for optimal SEO
-        if (description.length > 160) {
-          description = description.substring(0, 157) + '...';
-        }
-        const profileUrl = `${request.baseUrl}/${PAGES_PATHS.PROFILE}/${profileData.url}`;
-        const isPrivateMember = profileData.isPrivateMember;
-        const seoData = {
-          title: seoTitle,
-          description: description,
-          noIndex: isPrivateMember,
-          metaTags: [
-            {
-              name: 'description',
-              content: description,
-            },
-            {
-              name: 'keywords',
-              content:
-                `${profileData.fullName}, ${profileData.areasOfPractices ? profileData.areasOfPractices.slice(0, 3).join(', ') : ''}, ${siteAssociation}, ${profileData.city || ''}, ${profileData.state || ''}`
-                  .replace(/,\s*,/g, ',')
-                  .replace(/^,|,$/g, ''),
-            },
-            {
-              name: 'author',
-              content: profileData.fullName,
-            },
-            {
-              name: 'robots',
-              content: isPrivateMember ? 'noindex, nofollow' : 'index, follow',
-            },
-            // Open Graph tags
-            {
-              property: 'og:type',
-              content: 'profile',
-            },
-            {
-              property: 'og:title',
-              content: seoTitle,
-            },
-            {
-              property: 'og:description',
-              content: description,
-            },
-            {
-              property: 'og:image',
-              content: ogImage,
-            },
-            {
-              property: 'og:url',
-              content: profileUrl,
-            },
-            {
-              property: 'og:site_name',
-              content: `${siteAssociation} Members`,
-            },
-            // Twitter Card tags
-            {
-              name: 'twitter:card',
-              content: 'summary_large_image',
-            },
-            {
-              name: 'twitter:title',
-              content: seoTitle,
-            },
-            {
-              name: 'twitter:description',
-              content: description,
-            },
-            {
-              name: 'twitter:image',
-              content: ogImage,
-            },
-            // Additional SEO tags
-            {
-              name: 'geo.region',
-              content: profileData.state || '',
-            },
-            {
-              name: 'geo.placename',
-              content: profileData.city || '',
-            },
-          ].filter(tag => tag.content && tag.content.trim() !== ''), // Remove empty tags
-        };
-        return ok('profile', { ...profileData, defaultProfileImage }, seoData);
-      }
-      return notFound();
-    } catch (error) {
-      console.error(error);
-      return sendStatus('500', 'Internal Server Error');
-    }
-  }
-  function profileSiteMap(_sitemapRequest) {
-    return [];
-    // Commented out - currently disabled in host site
-    //   try {
-    //     const membersQuery = wixData
-    //       .query(COLLECTIONS.MEMBERS_DATA)
-    //       .eq('showWixUrl', true)
-    //       .isNotEmpty('url')
-    //       .ne('action', 'drop')
-    //       .fields('url', 'fullName');
-
-    //     const allMembers = await fetchAllItemsInParallel(membersQuery);
-
-    //     const batchSize = 1000;
-    //     const sitemapEntries = [];
-    //     const totalItems = allMembers.items.length;
-
-    //     for (let i = 0; i < totalItems; i += batchSize) {
-    //       const batch = allMembers.items.slice(i, i + batchSize);
-    //       const batchEntries = batch.map(member => {
-    //         const entry = new WixRouterSitemapEntry(member.fullName);
-    //         entry.pageName = 'profile';
-    //         entry.url = `${PAGES_PATHS.PROFILE}/${member.url}`;
-    //         entry.title = member.fullName;
-    //         entry.changeFrequency = 'monthly';
-    //         entry.priority = 1.0;
-    //         return entry;
-    //       });
-    //       sitemapEntries.push(...batchEntries);
-    //     }
-
-    //     return sitemapEntries;
-    //   } catch (error) {
-    //     console.error('Error generating profile sitemap:', error);
-    //     return [];
-    //   }
-  }
-  //Add other routers here
-  return {
-    profileRouter,
-    profileSiteMap,
-    //Add other routers here
-  };
-};
-
-module.exports = {
-  createRoutersHandlers,
-};

package/backend/routers/utils.js

@@ -1,118 +0,0 @@
-const { getMainAddress } = require('../../public/Utils/sharedUtils');
-const { getMemberBySlug } = require('../members-data-methods');
-const {
-  getAddressesByStatus,
-  formatDateToMonthYear,
-  hasStudentMembership,
-  isPAC_STAFF,
-} = require('../utils');
-
-function generateSEOTitle({ fullName, areasOfPractices, siteAssociation }) {
-  return `${fullName}${
-    areasOfPractices && areasOfPractices.length > 0
-      ? ` | ${areasOfPractices.slice(0, 3).join(', ')}`
-      : ''
-  } | ${siteAssociation} Member`;
-}
-
-function stripHtmlTags(html) {
-  if (!html) return '';
-  // Remove HTML tags and decode HTML entities
-  return html
-    .replace(/<[^>]*>/g, '') // Remove HTML tags
-    .replace(/&nbsp;/g, ' ') // Replace non-breaking spaces
-    .replace(/&amp;/g, '&') // Replace encoded ampersands
-    .replace(/&lt;/g, '<') // Replace encoded less than
-    .replace(/&gt;/g, '>') // Replace encoded greater than
-    .replace(/&quot;/g, '"') // Replace encoded quotes
-    .replace(/&#39;/g, "'") // Replace encoded apostrophes
-    .replace(/\s+/g, ' ') // Replace multiple whitespace with single space
-    .trim(); // Remove leading/trailing whitespace
-}
-
-function shouldHaveStudentBadge(member, siteAssociation) {
-  return hasStudentMembership({
-    member,
-    checkAssociation: true,
-    siteAssociation,
-  });
-}
-
-function transformMemberToProfileData(member, siteAssociation) {
-  if (!member) {
-    throw new Error('member is required');
-  }
-  const addresses = member.addresses || [];
-  const mainAddress = getMainAddress(member.addressDisplayOption, addresses);
-  const licenceNo = member.licenses
-    ?.map(val => val.license)
-    .filter(Boolean)
-    .join(', ');
-  const processedAddresses = getAddressesByStatus(member.addresses, member.addressDisplayOption);
-
-  const memberships = member.memberships || [];
-  const siteAssociationMembership = memberships.find(m => m.association === siteAssociation);
-
-  const areasOfPractices =
-    member.areasOfPractices
-      ?.filter(item => typeof item === 'string' && item.trim().length > 0)
-      .map(item => item.trim())
-      .sort((a, b) =>
-        a.localeCompare(b, undefined, {
-          sensitivity: 'base',
-          numeric: true,
-        })
-      ) || [];
-  return {
-    mainAddress,
-    testimonials: member.testimonial || [],
-    licenceNo,
-    processedAddresses,
-    memberSince:
-      (member.showABMP &&
-        siteAssociationMembership &&
-        formatDateToMonthYear(siteAssociationMembership?.membersince)) ||
-      '',
-    shouldHaveStudentBadge: shouldHaveStudentBadge(member, siteAssociation),
-    logoImage: member.logoImage,
-    fullName: member.fullName,
-    profileImage: member.profileImage,
-    showContactForm: member.showContactForm,
-    bookingUrl: member.bookingUrl,
-    aboutService: member.aboutService,
-    businessName: (member.showBusinessName && member.businessName) || '',
-    phone: member.toShowPhone || '',
-    areasOfPractices,
-    gallery: member.gallery,
-    bannerImages: member.bannerImages,
-    showWixUrl: member.showWixUrl,
-    _id: member._id,
-    url: member.url,
-    isPrivateMember: isPAC_STAFF(member),
-  };
-}
-
-const getMemberProfileData = async (slug, siteAssociation) => {
-  try {
-    const member = await getMemberBySlug({
-      slug,
-      excludeDropped: true,
-      excludeSearchedMember: false,
-    });
-
-    if (!member) {
-      return null;
-    }
-
-    return transformMemberToProfileData(member, siteAssociation);
-  } catch (error) {
-    console.error(error);
-    throw error;
-  }
-};
-
-module.exports = {
-  generateSEOTitle,
-  stripHtmlTags,
-  getMemberProfileData,
-};