abmp-npm 1.6.1 → 1.6.3

package/backend/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   ...require('./forms-methods'),
   ...require('./search-filters-methods'),
+  ...require('./personal-details-form-methods'),
 };

package/backend/personal-details-form-methods.js

@@ -0,0 +1,395 @@
+const { auth } = require('@wix/essentials');
+const { items } = require('@wix/data');
+const { members: membersSDK, authentication } = require('@wix/members');
+const { crm } = require('@wix/crm');
+const { encode } = require('ngeohash');
+
+const { COLLECTIONS } = require('../public/consts');
+const { wixData } = require('./elevated-modules');
+const { findMemberByWixDataId } = require('./members-data-methods');
+const { retrieveAllItems } = require('./utils');
+
+// Elevated functions
+const elevatedGetCurrentMember = auth.elevate(authentication.currentMember.getCurrentMember);
+const elevatedUpdateContact = auth.elevate(crm.contacts.updateContact);
+
+// Constants
+const MEMBER_ACTIONS = {
+  DROP: 'drop',
+};
+
+const PRECISION = 3;
+
+/**
+ * Helper functions
+ */
+
+function generateGeoHash(addresses) {
+  const geohash = addresses
+    ?.filter(address => (isNaN(address?.latitude) && isNaN(address?.longitude) ? false : address))
+    ?.map(address => encode(address.latitude, address.longitude, PRECISION));
+  return geohash && geohash.length > 0 ? geohash : [];
+}
+
+function formatDateToMonthYear(dateString) {
+  if (!dateString) return '';
+
+  const date = new Date(dateString);
+  if (isNaN(date.getTime())) return '';
+  const options = { year: 'numeric', month: 'long' };
+  return date.toLocaleDateString(undefined, options);
+}
+
+function hasStudentMembership(member, checkAssociation = false) {
+  const memberships = member?.memberships;
+  if (!Array.isArray(memberships)) return false;
+
+  const SITE_ASSOCIATION = 'ABMP';
+  const MEMBERSHIPS_TYPES = {
+    STUDENT: 'Student',
+  };
+
+  return memberships.some(membership => {
+    const isStudent = membership.membertype === MEMBERSHIPS_TYPES.STUDENT;
+    const hasCorrectAssociation =
+      !checkAssociation || membership.association === SITE_ASSOCIATION;
+    return isStudent && hasCorrectAssociation;
+  });
+}
+
+function isStudent(member) {
+  return hasStudentMembership(member, false);
+}
+
+function getAddressDisplayOptions(member) {
+  const addresses = member.addresses || [];
+  const displayOptions = member.addressDisplayOption || [];
+  if (addresses.length === 1 && addresses[0].key) {
+    return [{ key: addresses[0].key, isMain: true }];
+  }
+  return displayOptions;
+}
+
+/**
+ * Retrieves all interests from the database
+ * @returns {Promise<Array<string>>} Sorted array of interest titles
+ */
+const getInterestAll = async () => {
+  try {
+    const interests = await retrieveAllItems(COLLECTIONS.INTERESTS);
+    const titles = interests.map(x => x.title);
+
+    // Sort the interests alphabetically (case-insensitive)
+    return titles.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+  } catch (e) {
+    console.error('Error in getInterestAll:', e);
+    throw e;
+  }
+};
+
+/**
+ * Get member by slug with various filtering options
+ * @param {Object} options - Query options
+ * @param {string} options.slug - The URL slug to search for
+ * @param {boolean} options.excludeDropped - Whether to exclude dropped members
+ * @param {boolean} options.excludeSearchedMember - Whether to exclude a specific member
+ * @param {string} options.memberId - Member ID to exclude
+ * @returns {Promise<Object|null>} Member data or null
+ */
+async function getMemberBySlug({ slug, excludeDropped = true, excludeSearchedMember = false, memberId = null }) {
+  if (!slug) return null;
+
+  try {
+    let query = wixData.query(COLLECTIONS.MEMBERS_DATA).contains('url', slug);
+
+    if (excludeDropped) {
+      query = query.ne('action', 'drop');
+    }
+
+    if (excludeSearchedMember && memberId) {
+      query = query.ne('memberId', memberId);
+    }
+
+    const result = await query.find();
+    const matchingMembers = result.items.filter(
+      item => item.url && item.url.toLowerCase() === slug.toLowerCase()
+    );
+
+    if (matchingMembers.length > 1) {
+      console.warn(`Multiple members found with same slug ${slug}`);
+    }
+
+    return matchingMembers[0] || null;
+  } catch (error) {
+    console.error('Error getting member by slug:', error);
+    throw error;
+  }
+}
+
+/**
+ * Checks if a URL already exists for a different member
+ * @param {string} url - The URL to check
+ * @param {string} excludeMemberId - Member ID to exclude from check
+ * @returns {Promise<boolean>} True if URL exists for another member
+ */
+async function urlExists(url, excludeMemberId) {
+  if (!url) return false;
+
+  try {
+    const member = await getMemberBySlug({
+      slug: url,
+      excludeDropped: true,
+      excludeSearchedMember: true,
+      memberId: excludeMemberId,
+    });
+
+    return member !== null;
+  } catch (error) {
+    console.error('Error checking URL existence:', error);
+    return false;
+  }
+}
+
+/**
+ * Validates member token and returns member data
+ * @param {string} memberIdInput - The member ID to validate
+ * @returns {Promise<Object>} Object with memberData and isValid flag
+ */
+const validateMemberToken = async memberIdInput => {
+  const invalidTokenResponse = { memberData: null, isValid: false };
+
+  if (!memberIdInput) {
+    return invalidTokenResponse;
+  }
+
+  try {
+    const member = await elevatedGetCurrentMember();
+
+    if (!member || !member.contactId) {
+      console.log('member not found from getCurrentMember for memberIdInput', memberIdInput);
+      return invalidTokenResponse;
+    }
+
+    const result = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .eq('contactId', member.contactId)
+      .find();
+
+    console.log('items', result.items[0]);
+    console.log('member.contactId', member.contactId);
+
+    if (!result.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.contactId })}`;
+      console.error(errorMessage);
+      throw new Error('CORRUPTED_MEMBER_DATA');
+    }
+
+    console.log(`Id found in DB for memberIdInput :${memberIdInput} is ${result.items[0]?._id}`);
+
+    const memberData = result.items[0];
+    memberData.memberships = memberData.memberships.map(membership => ({
+      ...membership,
+      membersince: formatDateToMonthYear(membership.membersince),
+    }));
+
+    const savedMemberId = memberData?._id;
+    const isValid = savedMemberId === memberIdInput;
+
+    if (!savedMemberId || !isValid) {
+      return invalidTokenResponse;
+    }
+
+    if (memberData.action === MEMBER_ACTIONS.DROP) {
+      return invalidTokenResponse;
+    }
+
+    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;
+  }
+};
+
+/**
+ * Checks if URL is unique for the member
+ * @param {string} url - The URL to check
+ * @param {string} memberId - The member ID
+ * @returns {Promise<Object>} Object with isUnique flag
+ */
+const checkUrlUniqueness = async (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}`);
+  }
+};
+
+/**
+ * Updates contact email in Wix CRM
+ * @param {string} contactId - The contact ID
+ * @param {string} newEmail - The new email
+ */
+async function updateContactEmail(contactId, newEmail) {
+  if (!newEmail) {
+    throw new Error('New email is required');
+  }
+
+  try {
+    const contact = await crm.contacts.getContact(contactId);
+    const currentInfo = contact.info || {};
+
+    await elevatedUpdateContact(contactId, {
+      info: {
+        ...currentInfo,
+        emails: {
+          items: [
+            {
+              email: newEmail,
+              primary: true,
+            },
+          ],
+        },
+      },
+    });
+  } catch (error) {
+    console.error('Error updating contact email:', error);
+    throw new Error(`Failed to update contact email: ${error.message}`);
+  }
+}
+
+/**
+ * Updates contact names in Wix CRM
+ * @param {string} contactId - The contact ID
+ * @param {string} firstName - The new first name
+ * @param {string} lastName - The new last name
+ */
+async function updateContactNames(contactId, firstName, lastName) {
+  if (!firstName && !lastName) {
+    throw new Error('At least one name field is required');
+  }
+
+  try {
+    const contact = await crm.contacts.getContact(contactId);
+    const currentInfo = contact.info || {};
+
+    await elevatedUpdateContact(contactId, {
+      info: {
+        ...currentInfo,
+        name: {
+          first: firstName || currentInfo?.name?.first || '',
+          last: lastName || currentInfo?.name?.last || '',
+        },
+      },
+    });
+  } catch (error) {
+    console.error('Error updating contact names:', error);
+    throw new Error(`Failed to update contact names: ${error.message}`);
+  }
+}
+
+/**
+ * Update fields if they have changed
+ */
+const updateIfChanged = (existingValues, newValues, updater, argsBuilder) => {
+  const hasChanged = !existingValues.every((val, idx) => val === newValues[idx]);
+  if (!hasChanged) return null;
+  return updater(...argsBuilder(newValues));
+};
+
+/**
+ * Updates member contact information in CRM if fields have changed
+ * @param {string} id - Member ID
+ * @param {Object} data - New member data
+ */
+const updateMemberContactInfo = async (id, data) => {
+  const existing = await findMemberByWixDataId(id);
+  const { contactId } = existing;
+
+  const updateConfig = [
+    {
+      fields: ['contactFormEmail'],
+      updater: updateContactEmail,
+      args: ([email]) => [contactId, email],
+    },
+    {
+      fields: ['firstName', 'lastName'],
+      updater: updateContactNames,
+      args: ([firstName, lastName]) => [contactId, firstName, lastName],
+    },
+  ];
+
+  const updatePromises = updateConfig
+    .map(({ fields, updater, args }) => {
+      const existingValues = fields.map(field => existing[field]);
+      const newValues = fields.map(field => data[field]);
+      return updateIfChanged(existingValues, newValues, updater, args);
+    })
+    .filter(Boolean);
+
+  await Promise.all(updatePromises);
+};
+
+/**
+ * Saves registration data for a member
+ * @param {Object} data - Member data to save
+ * @param {string} id - Member ID
+ * @returns {Promise<Object>} Result object with type and data
+ */
+const saveRegistrationData = async (data, id) => {
+  try {
+    console.log(' saveRegistrationData data._id', data._id);
+    console.log(' saveRegistrationData id', id);
+
+    if (data._id !== id) return { type: 'notAuthorized' };
+
+    if (data.url) {
+      const isDuplicate = await urlExists(data.url, data.memberId);
+
+      if (isDuplicate) {
+        return {
+          type: 'error',
+          error: 'URL slug is already taken. Please choose a different one.',
+        };
+      }
+    }
+
+    if (data.addresses && Array.isArray(data.addresses)) {
+      data.locHash = generateGeoHash(data.addresses);
+    }
+
+    await updateMemberContactInfo(id, data);
+
+    const saveData = await wixData.update(COLLECTIONS.MEMBERS_DATA, data);
+
+    return {
+      type: 'success',
+      saveData,
+    };
+  } catch (error) {
+    console.error(error);
+    return {
+      type: 'error',
+      error,
+    };
+  }
+};
+
+module.exports = {
+  getInterestAll,
+  validateMemberToken,
+  checkUrlUniqueness,
+  saveRegistrationData,
+};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -34,6 +34,7 @@
     "@wix/site-location": "^1.31.0",
     "@wix/site-storage": "^1.22.0",
     "@wix/site-window": "^1.44.0",
+    "lodash": "^4.17.21",
     "ngeohash": "^0.6.3",
     "phone": "^3.1.67",
     "psdev-utils": "1.1.1"

package/pages/PersonalDetailsForm.js

@@ -1,6 +1,7 @@
 const { location: wixLocation } = require('@wix/site-location');
 const { storage: wixStorage } = require('@wix/site-storage');
 const { window: wixWindow } = require('@wix/site-window');
+const _ = require('lodash');
 
 const {
   ADDRESS_STATUS_TYPES,
@@ -57,7 +58,6 @@ const SLUG_MESSAGES = {
 
 async function personalDetailsFormOnReady({
   $w,
-  _,
   getInterestAll,
   saveRegistrationData,
   validateMemberToken,