abmp-npm 1.8.43 → 1.8.45

package/backend/members-data-methods.js

@@ -1,16 +1,14 @@
 const { COLLECTIONS } = require('../public/consts');
 
+const { MEMBERSHIPS_TYPES } = require('./consts');
 const { updateMemberContactInfo } = require('./contacts-methods');
-const { MEMBER_ACTIONS } = require('./daily-pull');
+const { MEMBER_ACTIONS } = require('./daily-pull/consts');
 const { wixData } = require('./elevated-modules');
-const { createSiteMember, getCurrentMember } = require('./members-area-methods');
+const { createSiteMember } = require('./members-area-methods');
 const {
-  createBatches,
+  chunkArray,
   normalizeUrlForComparison,
   queryAllItems,
-  formatDateToMonthYear,
-  getAddressDisplayOptions,
-  isStudent,
   generateGeoHash,
 } = require('./utils');
 
@@ -48,7 +46,7 @@ async function createContactAndMemberIfNew(memberData) {
       ...memberData,
       contactId,
     };
-    const updatedResult = await wixData.update(COLLECTIONS.MEMBERS_DATA, memberDataWithContactId);
+    const updatedResult = await updateMember(memberDataWithContactId);
     memberDataWithContactId = {
       ...memberDataWithContactId,
       ...updatedResult,
@@ -60,79 +58,6 @@ async function createContactAndMemberIfNew(memberData) {
   }
 }
 
-/**
- * Validates member token and retrieves member data
- * @param {string} memberIdInput - The member ID to validate
- * @returns {Promise<{memberData: Object|null, isValid: boolean}>} Validation result with member data
- */
-async function validateMemberToken(memberIdInput) {
-  const invalidTokenResponse = { memberData: null, isValid: false };
-
-  if (!memberIdInput) {
-    return invalidTokenResponse;
-  }
-
-  try {
-    const member = await getCurrentMember();
-    if (!member || !member._id) {
-      console.log(
-        'member not found from members.getCurrentMember() for memberIdInput',
-        memberIdInput
-      );
-      return invalidTokenResponse;
-    }
-
-    // Query member data using elevated permissions (suppressAuth equivalent)
-    const { items } = await wixData
-      .query(COLLECTIONS.MEMBERS_DATA)
-      .eq('contactId', member._id)
-      .find();
-
-    console.log('items', items[0]);
-    console.log('member._id', member._id);
-
-    if (!items[0]?._id) {
-      const errorMessage = `No record found in DB for logged in Member [Corrupted Data - Duplicate Members? ] - There is no match in DB for currentMember: ${JSON.stringify(
-        { memberIdInput, currentMemberId: member._id }
-      )}`;
-      console.error(errorMessage);
-      throw new Error('CORRUPTED_MEMBER_DATA');
-    }
-
-    console.log(`Id found in DB for memberIdInput :${memberIdInput} is ${items[0]?._id}`);
-
-    const memberData = items[0];
-
-    // Format membership dates
-    memberData.memberships = memberData.memberships.map(membership => ({
-      ...membership,
-      membersince: formatDateToMonthYear(membership.membersince),
-    }));
-
-    const savedMemberId = memberData?._id;
-    const isValid = savedMemberId === memberIdInput;
-
-    if (!savedMemberId || !isValid) {
-      return invalidTokenResponse;
-    }
-
-    // Check if member is dropped
-    if (memberData.action === MEMBER_ACTIONS.DROP) {
-      return invalidTokenResponse;
-    }
-
-    // Add computed properties
-    memberData.addressDisplayOption = getAddressDisplayOptions(memberData);
-    console.log('memberData', memberData);
-    memberData.isStudent = isStudent(memberData);
-
-    return { memberData, isValid };
-  } catch (error) {
-    console.error('Error in validateMemberToken:', error);
-    throw error;
-  }
-}
-
 /** Performs bulk save operation for member data
  * @param { Array } memberDataList - Array of member data objects to save
  * @returns { Promise < Object >} - Bulk save operation result
@@ -144,7 +69,7 @@ async function bulkSaveMembers(memberDataList) {
 
   try {
     // bulkSave all with batches of 1000 items as this is the Velo limit for bulkSave
-    const batches = createBatches(memberDataList, 1000);
+    const batches = chunkArray(memberDataList, 1000);
     return await Promise.all(
       batches.map(batch => wixData.bulkSave(COLLECTIONS.MEMBERS_DATA, batch))
     );
@@ -183,7 +108,7 @@ async function findMemberById(memberId) {
  * @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)
+ * @param {boolean} [options.normalizeSlugForComparison=false] - Whether to normalize the slug for comparison (default: false)
  * @returns {Promise<Object|null>} - Member data or null if not found
  */
 async function getMemberBySlug({
@@ -191,7 +116,7 @@ async function getMemberBySlug({
   excludeDropped = true,
   excludeSearchedMember = false,
   memberId = null,
-  queryAllMatches = false,
+  normalizeSlugForComparison = false,
 }) {
   if (!slug) return null;
 
@@ -205,17 +130,12 @@ async function getMemberBySlug({
     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);
-    }
+    query = query.limit(1000);
+    const membersList = await queryAllItems(query);
     let matchingMembers = membersList.filter(
       item => item.url && item.url.toLowerCase() === slug.toLowerCase()
     );
-    if (queryAllMatches) {
+    if (normalizeSlugForComparison) {
       matchingMembers = membersList
         .filter(
           //remove trailing "-1", "-2", etc.
@@ -227,7 +147,7 @@ async function getMemberBySlug({
       const queryResultMsg = `Multiple members found with same slug ${slug} membersIds are : [${matchingMembers
         .map(member => member.memberId)
         .join(', ')}]`;
-      if (!queryAllMatches) {
+      if (!normalizeSlugForComparison) {
         throw new Error(queryResultMsg);
       } else {
         console.log(queryResultMsg);
@@ -240,6 +160,59 @@ async function getMemberBySlug({
   }
 }
 
+async function getMemberByContactId(contactId) {
+  if (!contactId) {
+    throw new Error('Contact ID is required');
+  }
+  try {
+    const members = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .eq('contactId', contactId)
+      .limit(2)
+      .find()
+      .then(res => res.items);
+    if (members.length > 1) {
+      throw new Error(
+        `[getMemberByContactId] Multiple members found with contactId ${contactId} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+      );
+    }
+    return members[0] || null;
+  } catch (error) {
+    throw new Error(
+      `[getMemberByContactId] Failed to retrieve member by contactId ${contactId} data: ${error.message}`
+    );
+  }
+}
+/**
+ * Gets all members with aboutyoustatus as null
+ * @returns {Promise<import('wix-data').WixDataQueryResult>} - WixDataQueryResult of member data
+ */
+const getAllEmptyAboutYouMembers = async () => {
+  try {
+    const membersQuery = wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .isEmpty('aboutYourSelf')
+      .isNotEmpty('aboutYouHtml');
+    return await queryAllItems(membersQuery);
+  } catch (error) {
+    console.error('Error getting empty about you members:', error);
+    throw new Error(`Failed to get empty about you members: ${error.message}`);
+  }
+};
+
+/**
+ * updates member data
+ * @param {Object} memberToUpdate - The member data to update
+ * @returns {Promise<Object|null>} - Member data or null if not found
+ */
+async function updateMember(memberToUpdate) {
+  try {
+    const updatedMember = await wixData.update(COLLECTIONS.MEMBERS_DATA, memberToUpdate);
+    return updatedMember;
+  } catch (error) {
+    throw new Error(`Failed to update member data: ${error.message}`);
+  }
+}
 /**
  * Saves member registration data
  * @param {Object} data - Member data to save
@@ -271,7 +244,7 @@ async function saveRegistrationData(data, id) {
 
     await updateMemberContactInfo(data, existingMemberData);
 
-    const saveData = await wixData.update(COLLECTIONS.MEMBERS_DATA, data);
+    const saveData = await updateMember(data);
     return {
       type: 'success',
       saveData,
@@ -318,12 +291,216 @@ async function urlExists(url, excludeMemberId) {
   }
 }
 
+/**
+ * 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');
+  }
+
+  try {
+    const trimmedUrl = url.trim();
+    const exists = await urlExists(trimmedUrl, memberId);
+
+    return { isUnique: !exists };
+  } catch (error) {
+    console.error('Error checking URL uniqueness:', error);
+    throw new Error(`Failed to check URL uniqueness: ${error.message}`);
+  }
+}
+/**
+ * Get all members with external profile images
+ * @returns {Promise<Array>} - Array of member IDs
+ */
+async function getAllMembersWithExternalImages() {
+  try {
+    const membersQuery = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .isNotEmpty('profileImage')
+      .ne('profileImage', null);
+
+    const allItems = await queryAllItems(membersQuery);
+
+    // Filter for external images (not starting with 'wix:')
+    const membersWithExternalImages = allItems.filter(
+      member => member.profileImage && !member.profileImage.startsWith('wix:')
+    );
+
+    return membersWithExternalImages;
+  } catch (error) {
+    console.error('Error getting members with external images:', error);
+    return [];
+  }
+}
+
+async function getMembersWithWixUrl() {
+  const membersQuery = wixData
+    .query(COLLECTIONS.MEMBERS_DATA)
+    .eq('isVisible', true)
+    .eq('showWixUrl', true)
+    .ne('action', MEMBER_ACTIONS.DROP)
+    .ne('memberships.membertype', MEMBERSHIPS_TYPES.PAC_STAFF)
+    .isNotEmpty('url')
+    .limit(1000);
+  let currentResults = await membersQuery.find();
+  let i = 0;
+  const allItems = currentResults.items;
+  while (currentResults.hasNext()) {
+    if (i % 50 === 0) console.log(`page ${i}`);
+    currentResults = await currentResults.next();
+    allItems.push(...currentResults.items);
+    i++;
+  }
+  console.log('i is ', i);
+  const filtered = allItems.filter(item => typeof item.url === 'string' && !item.url.includes('/'));
+  console.log('filtered is ', filtered.length);
+  return filtered;
+}
+
+/**
+ * Gets all members who need contactFormEmail migration (missing contactFormEmail field)
+ * @returns {Promise<Array>} - Array of member data
+ */
+const getAllMembersWithoutContactFormEmail = async () => {
+  try {
+    const membersQuery = wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .isEmpty('contactFormEmail')
+      .isNotEmpty('email')
+      .limit(1000);
+
+    const allItems = await queryAllItems(membersQuery);
+    return allItems;
+  } catch (error) {
+    console.error('Error getting members without contactFormEmail:', error);
+    throw new Error(`Failed to get members without contactFormEmail: ${error.message}`);
+  }
+};
+
+/* Gets all updated login emails from the updated emails database
+ * @returns {Promise<Array>} - Array of updated email data
+ */
+const getAllUpdatedLoginEmails = async () => {
+  try {
+    const updatedEmailsQuery = await wixData
+      .query(COLLECTIONS.UPDATED_LOGIN_EMAILS)
+      .isNotEmpty('memberId')
+      .isNotEmpty('loginEmail')
+      .limit(1000);
+    return await queryAllItems(updatedEmailsQuery);
+  } catch (error) {
+    console.error('Error getting updated login emails:', error);
+    throw new Error(`Failed to get updated login emails: ${error.message}`);
+  }
+};
+/**
+ * Gets members by their member IDs for email sync
+ * @param {Array} memberIds - Array of member IDs to fetch
+ * @returns {Promise<Array>} - Array of member data
+ */
+const getMembersByIds = async memberIds => {
+  try {
+    const membersQuery = wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .hasSome('memberId', memberIds)
+      .limit(1000);
+
+    return await queryAllItems(membersQuery);
+  } catch (error) {
+    console.error('Error getting members by IDs:', error);
+    throw new Error(`Failed to get members by IDs: ${error.message}`);
+  }
+};
+
+const getMemberByEmail = async email => {
+  try {
+    const members = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .eq('email', email)
+      .limit(2)
+      .find()
+      .then(res => res.items);
+    if (members.length > 1) {
+      throw new Error(
+        `[getMemberByEmail] Multiple members found with email ${email} membersIds are : [${members.map(member => member.memberId).join(', ')}]`
+      );
+    }
+    return members[0] || null;
+  } catch (error) {
+    console.error('Error getting member by email:', error);
+    throw new Error(`Failed to get member by email: ${error.message}`);
+  }
+};
+
+const getQAUsers = async () => {
+  try {
+    return await wixData
+      .query(COLLECTIONS.QA_USERS)
+      .include('member')
+      .find()
+      .then(res => res.items.map(item => item.member));
+  } catch (error) {
+    console.error('Error getting QA users:', error);
+    throw new Error(`Failed to get QA users: ${error.message}`);
+  }
+};
+async function getSiteMemberId(data) {
+  try {
+    console.log('data', data);
+    const memberId = data?.pac?.cst_recno;
+    if (!memberId) {
+      const errorMessage = `Member ID is missing in passed data ${JSON.stringify(data)}`;
+      console.error(errorMessage);
+      throw new Error(errorMessage);
+    }
+    const queryMemberResult = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .eq('memberId', Number(memberId))
+      .find()
+      .then(res => res.items);
+    if (!queryMemberResult.length || queryMemberResult.length > 1) {
+      throw new Error(
+        `Invalid Members count found in DB for email ${data.email} members count is : [${
+          queryMemberResult.length
+        }] membersIds are : [${queryMemberResult.map(member => member.memberId).join(', ')}]`
+      );
+    }
+    let memberData = queryMemberResult[0];
+    console.log('memberData', memberData);
+    const isNewUser = !memberData.contactId;
+    if (isNewUser) {
+      const memberDataWithContactId = await createContactAndMemberIfNew(memberData);
+      console.log('memberDataWithContactId', memberDataWithContactId);
+      memberData = memberDataWithContactId;
+    }
+    return memberData;
+  } catch (error) {
+    console.error('Error in getSiteMemberId', error.message);
+    throw error;
+  }
+}
+
 module.exports = {
   findMemberByWixDataId,
   createContactAndMemberIfNew,
-  validateMemberToken,
   saveRegistrationData,
   bulkSaveMembers,
   findMemberById,
   getMemberBySlug,
+  getMemberByContactId,
+  getAllEmptyAboutYouMembers,
+  updateMember,
+  getAllMembersWithExternalImages,
+  getMembersWithWixUrl,
+  getAllMembersWithoutContactFormEmail,
+  getAllUpdatedLoginEmails,
+  getMembersByIds,
+  getMemberByEmail,
+  getQAUsers,
+  getSiteMemberId,
+  checkUrlUniqueness,
 };

package/backend/pac-api-methods.js

@@ -1,9 +1,8 @@
-const { secrets } = require('@wix/secrets');
-
-const { PAC_API_URL } = require('./daily-pull/consts');
+const { PAC_API_URL } = require('./consts');
+const { getSecret } = require('./utils');
 
 const getHeaders = async () => {
-  const AUTH_TOKEN = await secrets.getSecretValue('members-data-api-key');
+  const AUTH_TOKEN = await getSecret('members-data-api-key');
   const headers = {
     Authorization: `Bearer ${AUTH_TOKEN}`,
   };

package/backend/routers/index.js

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

package/backend/routers/methods.js

@@ -0,0 +1,177 @@
+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; // These dependencies needs to be injected as they do not have an SDK equivalent for now
+
+  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,
+};