abmp-npm 2.0.72 → 2.0.73

package/backend/jobs.js

@@ -97,6 +97,24 @@ async function scheduleNormalizeMemberEmailsTask() {
   }
 }
 
+/**
+ * Schedules setting ALL addresses for ALL members that have any address to STATE_CITY_ZIP
+ * (show city/state/zip, hide the street). Manually triggered one-off maintenance task.
+ */
+async function scheduleSetAddressesToCityStateTask() {
+  try {
+    console.log('scheduleSetAddressesToCityState started!');
+    return await taskManager().schedule({
+      name: TASKS_NAMES.scheduleSetAddressesToCityState,
+      data: {},
+      type: 'scheduled',
+    });
+  } catch (error) {
+    console.error(`Failed to scheduleSetAddressesToCityState: ${error.message}`);
+    throw new Error(`Failed to scheduleSetAddressesToCityState: ${error.message}`);
+  }
+}
+
 /**
  * Runs the daily pull execution check (watchdog).
  * @param {Object} [options]
@@ -135,5 +153,6 @@ module.exports = {
   scheduleFixPrimaryAddressForMembersTask,
   scheduleFixUrlsWithSpacesTask,
   scheduleNormalizeMemberEmailsTask,
+  scheduleSetAddressesToCityStateTask,
   runDailyPullExecutionCheck,
 };

package/backend/tasks/address-visibility-methods.js

@@ -0,0 +1,160 @@
+const { taskManager } = require('psdev-task-manager');
+
+const { COLLECTIONS, ADDRESS_STATUS_TYPES } = require('../../public/consts');
+const { wixData } = require('../elevated-modules');
+const { bulkSaveMembers, getMembersByIds } = require('../members-data-methods');
+const { chunkArray, queryAllItems } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const CHUNK_SIZE = 1000;
+
+// Target visibility for every address: show city / state / zip, hide the street address.
+const TARGET_STATUS = ADDRESS_STATUS_TYPES.STATE_CITY_ZIP;
+
+const getMemberAddresses = member => (Array.isArray(member.addresses) ? member.addresses : []);
+
+/**
+ * Whether a member has at least one address not already at the target status.
+ * @param {Object} member
+ * @returns {boolean}
+ */
+const needsCityStateUpdate = member =>
+  getMemberAddresses(member).some(address => address && address.addressStatus !== TARGET_STATUS);
+
+/**
+ * Sets every address on a member to STATE_CITY_ZIP (other address fields are preserved).
+ * @param {Object} member
+ * @returns {Array} the member's addresses with addressStatus set to STATE_CITY_ZIP
+ */
+const setAddressesToCityState = member =>
+  getMemberAddresses(member).map(address => ({
+    ...address,
+    addressStatus: TARGET_STATUS,
+  }));
+
+/**
+ * Schedules tasks to set ALL addresses for ALL members to STATE_CITY_ZIP (show city/state/zip,
+ * hide the street). Manually triggered (not cron-wired).
+ */
+async function scheduleSetAddressesToCityState() {
+  console.log('=== Scheduling Set Addresses To City/State Tasks ===');
+
+  try {
+    const membersQuery = await wixData
+      .query(COLLECTIONS.MEMBERS_DATA)
+      .isNotEmpty('addresses')
+      .limit(1000);
+    const members = await queryAllItems(membersQuery);
+    console.log(`Fetched ${members.length} members with addresses`);
+
+    // Only members that still have an address not at the target status need updating.
+    const memberIds = [
+      ...new Set(
+        members
+          .filter(needsCityStateUpdate)
+          .map(member => Number(member.memberId))
+          .filter(memberId => Number.isFinite(memberId) && memberId > 0)
+      ),
+    ];
+    console.log(`Members needing a city/state update: ${memberIds.length}`);
+
+    if (memberIds.length === 0) {
+      console.log('No members need their addresses set to city/state');
+      return {
+        success: true,
+        message: 'No members need their addresses set to city/state',
+        totalMembers: 0,
+        tasksScheduled: 0,
+      };
+    }
+
+    const chunks = chunkArray(memberIds, CHUNK_SIZE);
+    for (let i = 0; i < chunks.length; i++) {
+      const chunk = chunks[i];
+      await taskManager().schedule({
+        name: TASKS_NAMES.setAddressesToCityStateChunk,
+        data: {
+          memberIds: chunk,
+          chunkIndex: i,
+          totalChunks: chunks.length,
+        },
+        type: 'scheduled',
+      });
+      console.log(`Scheduled task ${i + 1}/${chunks.length} (${chunk.length} members)`);
+    }
+
+    const result = {
+      success: true,
+      message: `Scheduled ${chunks.length} tasks for ${memberIds.length} members`,
+      totalMembers: memberIds.length,
+      tasksScheduled: chunks.length,
+    };
+    console.log('=== Scheduling Complete ===');
+    console.log(JSON.stringify(result, null, 2));
+    return result;
+  } catch (error) {
+    console.error('Error scheduling set-addresses-to-city-state:', error);
+    throw error;
+  }
+}
+
+/**
+ * Processes a chunk of members and sets every address to STATE_CITY_ZIP.
+ * @param {Object} data
+ * @param {Array<number|string>} data.memberIds
+ * @param {number} data.chunkIndex
+ * @param {number} data.totalChunks
+ */
+async function setAddressesToCityStateChunk(data) {
+  const { memberIds, chunkIndex, totalChunks } = data;
+  console.log(
+    `Processing set-city-state chunk ${chunkIndex + 1}/${totalChunks} (${memberIds.length} members)`
+  );
+
+  const result = { successful: 0, failed: 0, skipped: 0, errors: [], failedIds: [] };
+
+  try {
+    const members = await getMembersByIds(memberIds);
+    console.log(`Loaded ${members.length} members for this chunk`);
+
+    const membersToUpdate = [];
+    members.forEach(member => {
+      // Skip members that have no address or are already all at the target status.
+      if (!needsCityStateUpdate(member)) {
+        result.skipped++;
+        return;
+      }
+      membersToUpdate.push({
+        ...member,
+        addresses: setAddressesToCityState(member),
+      });
+    });
+
+    if (membersToUpdate.length === 0) {
+      console.log('No members need updating in this batch');
+      return result;
+    }
+
+    try {
+      await bulkSaveMembers(membersToUpdate);
+      result.successful += membersToUpdate.length;
+      console.log(`✅ Set addresses to city/state for ${membersToUpdate.length} members`);
+    } catch (error) {
+      console.error('❌ Error bulk saving members:', error);
+      result.failed += membersToUpdate.length;
+      result.failedIds.push(...membersToUpdate.map(member => member.memberId));
+      result.errors.push({ error: error.message, memberCount: membersToUpdate.length });
+    }
+
+    return result;
+  } catch (error) {
+    console.error(`Error processing set-city-state chunk ${chunkIndex}:`, error);
+    throw error;
+  }
+}
+
+module.exports = {
+  scheduleSetAddressesToCityState,
+  setAddressesToCityStateChunk,
+};

package/backend/tasks/consts.js

@@ -22,6 +22,8 @@ const TASKS_NAMES = {
   fixPrimaryAddressChunk: 'fixPrimaryAddressChunk',
   scheduleFixUrlsWithSpaces: 'scheduleFixUrlsWithSpaces',
   fixUrlsWithSpacesChunk: 'fixUrlsWithSpacesChunk',
+  scheduleSetAddressesToCityState: 'scheduleSetAddressesToCityState',
+  setAddressesToCityStateChunk: 'setAddressesToCityStateChunk',
   scheduleNormalizeMemberEmails: 'scheduleNormalizeMemberEmails',
   normalizeMemberEmailsChunk: 'normalizeMemberEmailsChunk',
   dailyPullExecutionCheck: 'dailyPullExecutionCheck',

package/backend/tasks/tasks-configs.js

@@ -8,6 +8,10 @@ const {
   scheduleFixPrimaryAddressForMembers,
   fixPrimaryAddressChunk,
 } = require('./address-primary-methods');
+const {
+  scheduleSetAddressesToCityState,
+  setAddressesToCityStateChunk,
+} = require('./address-visibility-methods');
 const { TASKS_NAMES } = require('./consts');
 const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
@@ -207,6 +211,20 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.scheduleSetAddressesToCityState]: {
+    name: TASKS_NAMES.scheduleSetAddressesToCityState,
+    getIdentifier: () => 'SHOULD_NEVER_SKIP',
+    process: scheduleSetAddressesToCityState,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
+  [TASKS_NAMES.setAddressesToCityStateChunk]: {
+    name: TASKS_NAMES.setAddressesToCityStateChunk,
+    getIdentifier: task => task.data,
+    process: setAddressesToCityStateChunk,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 80,
+  },
   [TASKS_NAMES.scheduleNormalizeMemberEmails]: {
     name: TASKS_NAMES.scheduleNormalizeMemberEmails,
     getIdentifier: () => 'SHOULD_NEVER_SKIP',

package/package.json

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

package/pages/personalDetails.js

@@ -975,31 +975,18 @@ async function personalDetailsOnReady({
     });
   }
 
-  async function handleItemDelete(event, getTextSelector, arrayRef, matchField, renderFn) {
-    const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
-
-    if (result && result.toDelete) {
-      const $clickedItem = _$w.at(event.context);
-      const textToRemove = $clickedItem(getTextSelector).text;
-
-      arrayRef.splice(
-        0,
-        arrayRef.length,
-        ...arrayRef.filter(item =>
-          typeof item === 'string' ? item !== textToRemove : item[matchField] !== textToRemove
-        )
-      );
-
-      renderFn();
-      checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
-    }
-  }
-
   async function setInterestData() {
     const interestsData = await getInterestAll();
 
-    _$w('#removeServiceButton').onClick(event => {
-      handleItemDelete(event, '#serviceNameText', selectedServices, 'label', renderServices);
+    _$w('#removeServiceButton').onClick(async event => {
+      const itemId = event.context.itemId;
+      const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
+
+      if (result && result.toDelete) {
+        selectedServices = selectedServices.filter(service => service._id !== itemId);
+        renderServices();
+        checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
+      }
     });
 
     if (Array.isArray(interestsData) && interestsData.length > 0) {
@@ -1077,7 +1064,7 @@ async function personalDetailsOnReady({
   }
 
   function renderServices() {
-    setupRepeater('#servicesRepeater', selectedServices);
+    setupRepeater('#servicesRepeater', [...selectedServices]);
   }
 
   function setupRepeater(repeaterId, data) {
@@ -1339,14 +1326,21 @@ async function personalDetailsOnReady({
     const addTestimonialButton = _$w('#addTestimonialButton');
 
     addTestimonialButton.onClick(handleAddTestimonial);
-    _$w('#deleteTestimonialButton').onClick(event => {
-      handleItemDelete(
-        event,
-        '#testimonialText',
-        itemMemberObj.testimonial,
-        null,
-        renderTestimonials
-      );
+    _$w('#deleteTestimonialButton').onClick(async event => {
+      const data = _$w('#testimonialRepeater').data || [];
+      const clickedIndex = data.findIndex(item => item._id === event.context.itemId);
+      const result = await wixWindow.openLightbox(LIGHTBOX_NAMES.DELETE_CONFIRM);
+
+      if (
+        result &&
+        result.toDelete &&
+        clickedIndex > 0 &&
+        Array.isArray(itemMemberObj.testimonial)
+      ) {
+        itemMemberObj.testimonial.splice(clickedIndex - 1, 1);
+        renderTestimonials();
+        checkFormChanges(FORM_SECTION_HANDLER_MAP.BUSINESS_SERVICES);
+      }
     });
 
     renderTestimonials();