abmp-npm 1.8.37 → 1.8.39

package/backend/routers-methods.js

@@ -1,182 +1,16 @@
-const { DEFAULT_SEO_DESCRIPTION, ADDRESS_STATUS_TYPES } = require('../public/consts');
+const { DEFAULT_SEO_DESCRIPTION, ABMP_LOGO_URL } = require('../public');
 
 const { getMemberBySlug } = require('./members-data-methods');
-const { formatDateToMonthYear } = require('./utils');
-
-/**
- * Generates SEO title for member profile
- * @param {string} fullName - Member's full name
- * @param {Array<string>} areasOfPractices - Member's areas of practice
- * @returns {string} SEO title
- */
-function generateSEOTitle(fullName, areasOfPractices) {
-  return `${fullName}${
-    areasOfPractices && areasOfPractices.length > 0
-      ? ` | ${areasOfPractices.slice(0, 3).join(', ')}`
-      : ''
-  } | ABMP Member`;
-}
-
-/**
- * Strips HTML tags and decodes HTML entities from a string
- * @param {string} html - HTML string to clean
- * @returns {string} Cleaned text
- */
-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
-}
-
-/**
- * Check if member has student membership
- * @param {Object} member - Member object
- * @param {boolean} checkAssociation - Whether to check for specific association
- * @param {string} siteAssociation - Site association to check for
- * @param {string} studentType - Student membership type
- * @returns {boolean} True if member has student membership
- */
-function hasStudentMembership(member, checkAssociation, siteAssociation, studentType) {
-  const memberships = member?.memberships;
-  if (!Array.isArray(memberships)) return false;
-
-  return memberships.some(membership => {
-    const isStudent = membership.membertype === studentType;
-    const hasCorrectAssociation = !checkAssociation || membership.association === siteAssociation;
-    return isStudent && hasCorrectAssociation;
-  });
-}
-
-/**
- * Check if member should have student badge
- * @param {Object} member - Member object
- * @param {string} siteAssociation - Site association
- * @param {string} studentType - Student membership type
- * @returns {boolean} True if should have badge
- */
-function shouldHaveStudentBadge(member, siteAssociation, studentType) {
-  return hasStudentMembership(member, true, siteAssociation, studentType);
-}
-
-/**
- * Get addresses by status, excluding main address
- * @param {Array} addresses - All addresses
- * @param {Array} addressDisplayOption - Display options
- * @returns {Array} Processed addresses
- */
-function getAddressesByStatus(
-  addresses = [],
-  addressDisplayOption = [],
-  formatAddress,
-  getMainAddress,
-  generateId
-) {
-  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;
-  return visible
-    .filter(addr => addr?.key !== mainKey)
-    .map(addr => {
-      const addressString = formatAddress(addr);
-      return addressString ? { _id: generateId(), address: addressString } : null;
-    })
-    .filter(Boolean);
-}
-
-/**
- * Get member profile data formatted for display
- * @param {Object} member - Member object
- * @param {Object} utils - Utility functions (formatAddress, getMainAddress, generateId)
- * @param {Object} constants - Constants (siteAssociation, studentType, pacStaffType)
- * @returns {Object} Formatted profile data
- */
-function getMemberProfileData(member, utils, constants) {
-  if (!member) {
-    throw new Error('member is required');
-  }
-  const { formatAddress, getMainAddress, generateId } = utils;
-  const { siteAssociation, studentType, pacStaffType } = constants;
-
-  const addresses = member.addresses || [];
-  const licenceNo = member.licenses
-    ?.map(val => val.license)
-    .filter(Boolean)
-    .join(', ');
-  const processedAddresses = getAddressesByStatus(
-    member.addresses,
-    member.addressDisplayOption,
-    formatAddress,
-    getMainAddress,
-    generateId
-  );
-
-  const memberships = member.memberships || [];
-  const abmp = 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,
-        })
-      ) || [];
-
-  const mainAddress = getMainAddress(member.addressDisplayOption, addresses);
-
-  return {
-    mainAddress: mainAddress,
-    testimonials: member.testimonial || [],
-    licenceNo,
-    processedAddresses,
-    memberSince: (member.showABMP && abmp && formatDateToMonthYear(abmp?.membersince)) || '',
-    shouldHaveStudentBadge: shouldHaveStudentBadge(member, siteAssociation, studentType),
-    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,
-    city: mainAddress?.city || '',
-    state: mainAddress?.state || '',
-    isPrivateMember: member.memberships.some(membership => membership.membertype === pacStaffType),
-  };
-}
+const { generateSEOTitle, stripHtmlTags, getMemberProfileData } = require('./routers-utils');
 
 /**
  * Profile router handler
  * @param {Object} request - Router request object
  * @param {Object} dependencies - Dependencies (ok, notFound, redirect, sendStatus)
- * @param {Object} utils - Utility functions
- * @param {Object} constants - Constants
  * @returns {Promise} Router response
  */
-async function profileRouter(request, dependencies, utils, constants) {
+async function profileRouter(request, dependencies) {
   const { ok, notFound, redirect, sendStatus } = dependencies;
-  const { abmpLogoUrl } = constants;
 
   const slug = request.path[0];
   if (!slug) {
@@ -193,10 +27,10 @@ async function profileRouter(request, dependencies, utils, constants) {
       return notFound();
     }
 
-    const profileData = getMemberProfileData(member, utils, constants);
+    const profileData = getMemberProfileData(member);
 
     if (profileData && profileData.showWixUrl) {
-      const ogImage = profileData.profileImage || profileData.logoImage || abmpLogoUrl;
+      const ogImage = profileData.profileImage || profileData.logoImage || ABMP_LOGO_URL;
       const seoTitle = generateSEOTitle(profileData.fullName, profileData.areasOfPractices);
       // Use stripped HTML from aboutService rich text content
       let description = stripHtmlTags(profileData.aboutService) || DEFAULT_SEO_DESCRIPTION;
@@ -345,6 +179,7 @@ function profileSiteMap(_sitemapRequest, _dependencies, _fetchAllItemsInParallel
 module.exports = {
   profileRouter,
   profileSiteMap,
+  // Re-export utilities for backward compatibility
   getMemberProfileData,
   generateSEOTitle,
   stripHtmlTags,

package/backend/routers-utils.js

@@ -0,0 +1,164 @@
+const {
+  ADDRESS_STATUS_TYPES,
+  SITE_ASSOCIATION,
+  MEMBERSHIPS_TYPES,
+  formatAddress,
+  getMainAddress,
+  generateId,
+} = require('../public');
+
+const { formatDateToMonthYear } = require('./utils');
+
+/**
+ * Generates SEO title for member profile
+ * @param {string} fullName - Member's full name
+ * @param {Array<string>} areasOfPractices - Member's areas of practice
+ * @returns {string} SEO title
+ */
+function generateSEOTitle(fullName, areasOfPractices) {
+  return `${fullName}${
+    areasOfPractices && areasOfPractices.length > 0
+      ? ` | ${areasOfPractices.slice(0, 3).join(', ')}`
+      : ''
+  } | ABMP Member`;
+}
+
+/**
+ * Strips HTML tags and decodes HTML entities from a string
+ * @param {string} html - HTML string to clean
+ * @returns {string} Cleaned text
+ */
+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
+}
+
+/**
+ * Check if member has student membership
+ * @param {Object} member - Member object
+ * @param {boolean} checkAssociation - Whether to check for specific association
+ * @returns {boolean} True if member has student membership
+ */
+function hasStudentMembership(member, checkAssociation) {
+  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 === SITE_ASSOCIATION;
+    return isStudent && hasCorrectAssociation;
+  });
+}
+
+/**
+ * Check if member should have student badge
+ * @param {Object} member - Member object
+ * @returns {boolean} True if should have badge
+ */
+function shouldHaveStudentBadge(member) {
+  return hasStudentMembership(member, true);
+}
+
+/**
+ * Get addresses by status, excluding main address
+ * @param {Array} addresses - All addresses
+ * @param {Array} addressDisplayOption - Display options
+ * @returns {Array} Processed addresses
+ */
+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;
+  return visible
+    .filter(addr => addr?.key !== mainKey)
+    .map(addr => {
+      const addressString = formatAddress(addr);
+      return addressString ? { _id: generateId(), address: addressString } : null;
+    })
+    .filter(Boolean);
+}
+
+/**
+ * Get member profile data formatted for display
+ * @param {Object} member - Member object
+ * @returns {Object} Formatted profile data
+ */
+function getMemberProfileData(member) {
+  if (!member) {
+    throw new Error('member is required');
+  }
+
+  const addresses = member.addresses || [];
+  const licenceNo = member.licenses
+    ?.map(val => val.license)
+    .filter(Boolean)
+    .join(', ');
+  const processedAddresses = getAddressesByStatus(member.addresses, member.addressDisplayOption);
+
+  const memberships = member.memberships || [];
+  const abmp = memberships.find(m => m.association === SITE_ASSOCIATION);
+
+  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,
+        })
+      ) || [];
+
+  const mainAddress = getMainAddress(member.addressDisplayOption, addresses);
+
+  return {
+    mainAddress: mainAddress,
+    testimonials: member.testimonial || [],
+    licenceNo,
+    processedAddresses,
+    memberSince: (member.showABMP && abmp && formatDateToMonthYear(abmp?.membersince)) || '',
+    shouldHaveStudentBadge: shouldHaveStudentBadge(member),
+    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,
+    city: mainAddress?.city || '',
+    state: mainAddress?.state || '',
+    isPrivateMember: member.memberships.some(
+      membership => membership.membertype === MEMBERSHIPS_TYPES.PAC_STAFF
+    ),
+  };
+}
+
+module.exports = {
+  generateSEOTitle,
+  stripHtmlTags,
+  hasStudentMembership,
+  shouldHaveStudentBadge,
+  getAddressesByStatus,
+  getMemberProfileData,
+};

package/package.json

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

package/public/consts.js

@@ -94,6 +94,17 @@ const DEFAULT_BUSINESS_NAME_TEXT = 'Business name not provided';
 
 const DEFAULT_PROFILE_IMAGE =
   'https://static.wixstatic.com/media/1d7134_e052e9b1d0a543d0980650e16dd6d374~mv2.jpg';
+
+const ABMP_LOGO_URL =
+  'https://static.wixstatic.com/media/3eb9c9_b7447dc19d1b48cc99348a828cf77278~mv2.png';
+
+const SITE_ASSOCIATION = 'ABMP';
+
+const MEMBERSHIPS_TYPES = {
+  STUDENT: 'Student',
+  PAC_STAFF: 'PAC STAFF',
+};
+
 module.exports = {
   REGEX,
   COLLECTIONS,
@@ -107,4 +118,7 @@ module.exports = {
   FREE_WEBSITE_TEXT_STATES,
   DEFAULT_BUSINESS_NAME_TEXT,
   DEFAULT_PROFILE_IMAGE,
+  ABMP_LOGO_URL,
+  SITE_ASSOCIATION,
+  MEMBERSHIPS_TYPES,
 };

package/public/index.js

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