abmp-npm 2.0.80 → 2.0.82

package/backend/association-expiry.js

@@ -0,0 +1,132 @@
+// The per-association expiry rule, shared by the sync, the backfill and the read paths so they
+// cannot drift on what "expired" means. Deliberately free of Wix imports.
+
+const ASSOCIATION_EXPIRATION_FIELD = 'associationExpiration';
+const ASSOCIATION_TIME_ZONE = 'America/Denver';
+
+const EXPIRATION_DATE_PATTERN = /^(\d{4})-(\d{2})-(\d{2})/;
+
+const EXPIRATION_OUTCOMES = {
+  RESOLVED: 'resolved',
+  NO_SITE_ASSOCIATION: 'noSiteAssociation',
+  NO_MEMBERSHIP_FOR_ASSOCIATION: 'noMembershipForAssociation',
+  MISSING_EXPIRATION: 'missingExpiration',
+  UNREADABLE_EXPIRATION: 'unreadableExpiration',
+};
+
+// PAC sends zoneless ISO strings, which `new Date()` would read as local time - the same feed
+// would then mean different days depending on where it ran.
+const parseExpirationToUtcDate = expiration => {
+  if (typeof expiration !== 'string') return null;
+
+  const match = EXPIRATION_DATE_PATTERN.exec(expiration.trim());
+  if (!match) return null;
+
+  const [, year, month, day] = match.map(Number);
+  const parsed = new Date(Date.UTC(year, month - 1, day));
+
+  // Date.UTC rolls 2026-02-31 forward to 3 March rather than rejecting it.
+  const isRealDate =
+    parsed.getUTCFullYear() === year &&
+    parsed.getUTCMonth() === month - 1 &&
+    parsed.getUTCDate() === day;
+
+  return isRealDate ? parsed : null;
+};
+
+// outcome explains a null date for the backfill report: no entry for this association is a very
+// different thing from a malformed one.
+const classifyAssociationExpiration = (member, siteAssociation) => {
+  if (!siteAssociation) {
+    return { date: null, outcome: EXPIRATION_OUTCOMES.NO_SITE_ASSOCIATION };
+  }
+
+  const memberships = Array.isArray(member?.memberships) ? member.memberships : [];
+  const membership = memberships.find(entry => entry?.association === siteAssociation);
+
+  if (!membership) {
+    return { date: null, outcome: EXPIRATION_OUTCOMES.NO_MEMBERSHIP_FOR_ASSOCIATION };
+  }
+
+  const raw = membership.expiration;
+  if (raw === null || raw === undefined || (typeof raw === 'string' && !raw.trim())) {
+    return { date: null, outcome: EXPIRATION_OUTCOMES.MISSING_EXPIRATION };
+  }
+
+  const date = parseExpirationToUtcDate(raw);
+
+  return date
+    ? { date, outcome: EXPIRATION_OUTCOMES.RESOLVED }
+    : { date: null, outcome: EXPIRATION_OUTCOMES.UNREADABLE_EXPIRATION };
+};
+
+const resolveAssociationExpiration = (member, siteAssociation) =>
+  classifyAssociationExpiration(member, siteAssociation).date;
+
+const summarizeExpirationOutcomes = (members = [], siteAssociation) => {
+  const counts = Object.values(EXPIRATION_OUTCOMES).reduce(
+    (acc, outcome) => ({ ...acc, [outcome]: 0 }),
+    {}
+  );
+
+  (Array.isArray(members) ? members : []).forEach(member => {
+    counts[classifyAssociationExpiration(member, siteAssociation).outcome] += 1;
+  });
+
+  return counts;
+};
+
+/** Keeps the backfill idempotent. Accepts a Date or the ISO string the CMS may return. */
+const memberNeedsAssociationExpirationBackfill = (member, siteAssociation) => {
+  const resolved = resolveAssociationExpiration(member, siteAssociation);
+  const stored = member?.[ASSOCIATION_EXPIRATION_FIELD];
+
+  const storedTime =
+    stored instanceof Date ? stored.getTime() : stored ? new Date(stored).getTime() : null;
+  const resolvedTime = resolved ? resolved.getTime() : null;
+
+  if (storedTime === null && resolvedTime === null) return false;
+  if (storedTime === null || resolvedTime === null) return true;
+
+  return storedTime !== resolvedTime;
+};
+
+// Today in Denver, where PAC operates. UTC rolls over first, so a UTC-derived today would hide
+// everyone expiring that day up to seven hours early, every evening.
+const getTodayInAssociationTimeZone = (now = new Date()) => {
+  try {
+    const parts = new Intl.DateTimeFormat('en-US', {
+      timeZone: ASSOCIATION_TIME_ZONE,
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+    }).formatToParts(now);
+
+    const valueOf = type => Number(parts.find(part => part.type === type)?.value);
+    const [year, month, day] = [valueOf('year'), valueOf('month'), valueOf('day')];
+
+    if (![year, month, day].every(Number.isFinite)) {
+      throw new Error('incomplete date parts');
+    }
+
+    return new Date(Date.UTC(year, month - 1, day));
+  } catch (error) {
+    // Hiding people a few hours early beats throwing on every search.
+    console.error(
+      `[associationExpiry] cannot resolve ${ASSOCIATION_TIME_ZONE}, using the UTC date instead. Members may be hidden up to 7 hours early. ${error.message}`
+    );
+    return new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
+  }
+};
+
+module.exports = {
+  parseExpirationToUtcDate,
+  classifyAssociationExpiration,
+  resolveAssociationExpiration,
+  summarizeExpirationOutcomes,
+  memberNeedsAssociationExpirationBackfill,
+  getTodayInAssociationTimeZone,
+  ASSOCIATION_EXPIRATION_FIELD,
+  ASSOCIATION_TIME_ZONE,
+  EXPIRATION_OUTCOMES,
+};

package/backend/jobs.js

@@ -133,6 +133,27 @@ async function runDailyPullExecutionCheck(options = {}) {
   }
 }
 
+/**
+ * One-off backfill of associationExpiration. Run with `{ dryRun: true }` first: it counts the
+ * members that resolve to no date, and would therefore be hidden, without writing anything.
+ * @param {Object} [options]
+ * @param {boolean} [options.dryRun]
+ */
+async function scheduleAssociationExpiryBackfillTask(options = {}) {
+  try {
+    const { dryRun = false } = options || {};
+    console.log(`scheduleAssociationExpiryBackfill started! dryRun=${dryRun}`);
+    return await taskManager().schedule({
+      name: TASKS_NAMES.scheduleAssociationExpiryBackfill,
+      data: { dryRun },
+      type: 'scheduled',
+    });
+  } catch (error) {
+    console.error(`Failed to scheduleAssociationExpiryBackfill: ${error.message}`);
+    throw new Error(`Failed to scheduleAssociationExpiryBackfill: ${error.message}`);
+  }
+}
+
 async function updateSiteMapS3() {
   try {
     return await taskManager().schedule({
@@ -154,5 +175,6 @@ module.exports = {
   scheduleFixUrlsWithSpacesTask,
   scheduleNormalizeMemberEmailsTask,
   scheduleSetAddressesToCityStateTask,
+  scheduleAssociationExpiryBackfillTask,
   runDailyPullExecutionCheck,
 };

package/backend/members-data-methods.js

@@ -560,6 +560,22 @@ const getAllMembersWithoutContactFormEmail = async () => {
   }
 };
 
+/**
+ * Every member, unfiltered. Filtering would hide the very records the expiry backfill's report
+ * exists to surface - the ones with no readable expiration.
+ * @returns {Promise<Array>} - Array of member data
+ */
+const getAllMembers = async () => {
+  try {
+    const membersQuery = wixData.query(COLLECTIONS.MEMBERS_DATA).limit(1000);
+
+    return await queryAllItems(membersQuery);
+  } catch (error) {
+    console.error('Error getting all members:', error);
+    throw new Error(`Failed to get all members: ${error.message}`);
+  }
+};
+
 /**
  * Gets all members whose email or contactFormEmail is stored with non-canonical casing
  * (or surrounding whitespace) and therefore needs the normalization backfill.
@@ -775,6 +791,7 @@ module.exports = {
   getAllMembersWithExternalImages,
   getMembersWithWixUrl,
   getAllMembersWithoutContactFormEmail,
+  getAllMembers,
   getAllMembersNeedingEmailNormalization,
   memberNeedsEmailNormalization,
   getAllUpdatedLoginEmails,

package/backend/tasks/association-expiry-backfill-methods.js

@@ -0,0 +1,178 @@
+const { taskManager } = require('psdev-task-manager');
+
+const {
+  memberNeedsAssociationExpirationBackfill,
+  resolveAssociationExpiration,
+  summarizeExpirationOutcomes,
+  ASSOCIATION_EXPIRATION_FIELD,
+  EXPIRATION_OUTCOMES,
+} = require('../association-expiry');
+const { CONFIG_KEYS } = require('../consts');
+const { bulkSaveMembers, getMembersByIds, getAllMembers } = require('../members-data-methods');
+const { chunkArray, getSiteConfigs } = require('../utils');
+
+const { TASKS_NAMES } = require('./consts');
+
+const CHUNK_SIZE = 1000;
+
+/**
+ * One-off backfill of associationExpiration for members the daily sync will not touch.
+ * @param {Object} [data]
+ * @param {boolean} [data.dryRun] count without writing
+ */
+async function scheduleAssociationExpiryBackfill(data = {}) {
+  // process() receives whatever getIdentifier returns. A sentinel string there would read as
+  // dryRun: false and write to every member instead of counting them.
+  if (data === null || typeof data !== 'object') {
+    throw new Error(
+      `scheduleAssociationExpiryBackfill expected its task data object but received ${typeof data}. ` +
+        'Check getIdentifier for this task in tasks-configs.js: it must be `task => task.data`.'
+    );
+  }
+
+  const dryRun = data.dryRun === true;
+  console.log(`=== Scheduling Association Expiry Backfill${dryRun ? ' (DRY RUN)' : ''} ===`);
+
+  try {
+    const siteAssociation = await getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION);
+    if (!siteAssociation) {
+      // Every member would resolve to null, i.e. hidden.
+      throw new Error('SITE_ASSOCIATION is not configured; refusing to run the backfill');
+    }
+
+    const members = await getAllMembers();
+    console.log(`Fetched ${members.length} members for association '${siteAssociation}'`);
+
+    // Over every member, not just those needing a write, so a re-run still reports the true total.
+    const outcomes = summarizeExpirationOutcomes(members, siteAssociation);
+    const hiddenByThisChange =
+      outcomes[EXPIRATION_OUTCOMES.NO_MEMBERSHIP_FOR_ASSOCIATION] +
+      outcomes[EXPIRATION_OUTCOMES.MISSING_EXPIRATION] +
+      outcomes[EXPIRATION_OUTCOMES.UNREADABLE_EXPIRATION];
+
+    console.log(`Outcome breakdown: ${JSON.stringify(outcomes)}`);
+    console.log(
+      `Will resolve to no date, so hidden once the query gates on it: ${hiddenByThisChange} of ${members.length}`
+    );
+
+    const memberIds = [
+      ...new Set(
+        members
+          .filter(member => memberNeedsAssociationExpirationBackfill(member, siteAssociation))
+          .map(member => Number(member.memberId))
+          .filter(memberId => Number.isFinite(memberId) && memberId > 0)
+      ),
+    ];
+    console.log(`Members whose stored value is out of date: ${memberIds.length}`);
+
+    const summary = {
+      success: true,
+      dryRun,
+      siteAssociation,
+      totalMembers: members.length,
+      outcomes,
+      hiddenByThisChange,
+      membersNeedingUpdate: memberIds.length,
+      tasksScheduled: 0,
+    };
+
+    if (dryRun) {
+      summary.message = `Dry run: nothing written. ${hiddenByThisChange} of ${members.length} members resolve to no date`;
+      console.log('=== Dry Run Complete, nothing written ===');
+      console.log(JSON.stringify(summary, null, 2));
+      return summary;
+    }
+
+    if (memberIds.length === 0) {
+      summary.message = 'Every member already has the correct associationExpiration';
+      console.log(summary.message);
+      return summary;
+    }
+
+    const chunks = chunkArray(memberIds, CHUNK_SIZE);
+    for (let i = 0; i < chunks.length; i++) {
+      await taskManager().schedule({
+        name: TASKS_NAMES.associationExpiryBackfillChunk,
+        data: { memberIds: chunks[i], chunkIndex: i, totalChunks: chunks.length },
+        type: 'scheduled',
+      });
+      console.log(`Scheduled task ${i + 1}/${chunks.length} (${chunks[i].length} members)`);
+    }
+
+    summary.tasksScheduled = chunks.length;
+    summary.message = `Scheduled ${chunks.length} tasks for ${memberIds.length} members`;
+
+    console.log('=== Scheduling Complete ===');
+    console.log(JSON.stringify(summary, null, 2));
+
+    return summary;
+  } catch (error) {
+    console.error('Error scheduling association expiry backfill:', error);
+    throw error;
+  }
+}
+
+/**
+ * Members are reloaded and re-resolved rather than trusting the queued data: a chunk can run long
+ * after it was scheduled, and the daily sync may have rewritten the record in between.
+ */
+async function associationExpiryBackfillChunk(data) {
+  const { memberIds, chunkIndex, totalChunks } = data;
+  console.log(
+    `Processing association expiry chunk ${chunkIndex + 1}/${totalChunks} (${memberIds.length} members)`
+  );
+
+  const result = {
+    successful: 0,
+    failed: 0,
+    skipped: 0,
+    errors: [],
+    failedIds: [],
+  };
+
+  try {
+    const siteAssociation = await getSiteConfigs(CONFIG_KEYS.SITE_ASSOCIATION);
+    if (!siteAssociation) {
+      throw new Error('SITE_ASSOCIATION is not configured; refusing to write');
+    }
+
+    const members = await getMembersByIds(memberIds);
+    console.log(`Loaded ${members.length} members for this chunk`);
+
+    const membersToUpdate = members
+      .filter(member => memberNeedsAssociationExpirationBackfill(member, siteAssociation))
+      .map(member => ({
+        ...member,
+        [ASSOCIATION_EXPIRATION_FIELD]: resolveAssociationExpiration(member, siteAssociation),
+      }));
+
+    result.skipped = members.length - membersToUpdate.length;
+    result.outcomes = summarizeExpirationOutcomes(members, siteAssociation);
+
+    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(`✅ Successfully backfilled ${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 association expiry chunk ${chunkIndex}:`, error);
+    throw error;
+  }
+}
+
+module.exports = {
+  scheduleAssociationExpiryBackfill,
+  associationExpiryBackfillChunk,
+};

package/backend/tasks/consts.js

@@ -27,6 +27,8 @@ const TASKS_NAMES = {
   scheduleNormalizeMemberEmails: 'scheduleNormalizeMemberEmails',
   normalizeMemberEmailsChunk: 'normalizeMemberEmailsChunk',
   dailyPullExecutionCheck: 'dailyPullExecutionCheck',
+  scheduleAssociationExpiryBackfill: 'scheduleAssociationExpiryBackfill',
+  associationExpiryBackfillChunk: 'associationExpiryBackfillChunk',
 };
 
 module.exports = {

package/backend/tasks/index.js

@@ -7,4 +7,5 @@ module.exports = {
   ...require('./address-primary-methods'),
   ...require('./url-space-fix-methods'),
   ...require('./daily-pull-check-methods'),
+  ...require('./association-expiry-backfill-methods'),
 };

package/backend/tasks/tasks-configs.js

@@ -12,6 +12,10 @@ const {
   scheduleSetAddressesToCityState,
   setAddressesToCityStateChunk,
 } = require('./address-visibility-methods');
+const {
+  scheduleAssociationExpiryBackfill,
+  associationExpiryBackfillChunk,
+} = require('./association-expiry-backfill-methods');
 const { TASKS_NAMES } = require('./consts');
 const { dailyPullExecutionCheck } = require('./daily-pull-check-methods');
 const {
@@ -239,6 +243,23 @@ const TASKS = {
     shouldSkipCheck: () => false,
     estimatedDurationSec: 80,
   },
+  [TASKS_NAMES.scheduleAssociationExpiryBackfill]: {
+    name: TASKS_NAMES.scheduleAssociationExpiryBackfill,
+    // Must pass task.data through - process() receives this, and the backfill needs its dryRun.
+    getIdentifier: task => task.data,
+    process: scheduleAssociationExpiryBackfill,
+    shouldSkipCheck: () => false,
+    estimatedDurationSec: 120,
+  },
+  [TASKS_NAMES.associationExpiryBackfillChunk]: {
+    name: TASKS_NAMES.associationExpiryBackfillChunk,
+    getIdentifier: task => task.data,
+    process: associationExpiryBackfillChunk,
+    shouldSkipCheck: () => false,
+    // A packing budget, not a timeout: the manager fills each 240s tick with tasks costing
+    // estimate x 1.5. Chunks measured at ~6.5s, so 10 gives 16 per tick with room to spare.
+    estimatedDurationSec: 10,
+  },
   [TASKS_NAMES.dailyPullExecutionCheck]: {
     name: TASKS_NAMES.dailyPullExecutionCheck,
     getIdentifier: task => task.data,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "abmp-npm",
-  "version": "2.0.80",
+  "version": "2.0.82",
   "main": "index.js",
   "files": [
     "index.js",

package/pages/Home.js

@@ -7,11 +7,10 @@ const { DEFAULT_FILTER, DROPDOWN_OPTIONS } = require('../public/consts.js');
 const { createHomepageUtils } = require('../public/Utils/homePage.js');
 const {
   getMainAddress,
-  findMainAddress,
   formatPracticeAreasForDisplay,
   isWixHostedImage,
   normalizeExternalUrl,
-  buildMapLink,
+  buildDirectionsLink,
 } = require('../public/Utils/sharedUtils.js');
 
 let filter = JSON.parse(JSON.stringify(DEFAULT_FILTER));
@@ -226,24 +225,13 @@ const homePageOnReady = async ({
         $item('#milesAwayText').text = '';
       }
 
-      // 7) "Show maps" button - directions to whatever address the member displays.
+      // 7) "Show maps" button - only for members who selected "Show Full Address".
       //
-      // Uses the same address as the location text above, so the button always
-      // matches what the member is showing. Members displaying city/state/ZIP get
-      // directions to that, rather than no button at all: their NetForum
-      // coordinates can be miles off (see Monday 12596102059), and the text they
-      // publish is the reliable value.
-      //
-      // Privacy is enforced in buildMapLink, not here - it delegates to
-      // formatAddress, which prints the street line only for full_address, and
-      // returns '' outright for dont_show. findMainAddress also excludes
-      // dont_show. A hidden street address can never reach a maps URL.
-      //
-      // Gate on the link rather than the address: buildMapLink returns '' when it
-      // can build neither an address nor a coordinate link, and handles being
-      // passed '' or undefined, so the button is never shown linking nowhere.
-      const mapAddress = findMainAddress(itemData.addressDisplayOption, addresses);
-      const mapLink = buildMapLink(mapAddress);
+      // buildDirectionsLink owns the rule and returns '' when the button should be
+      // hidden: city/state/ZIP and hidden members get nothing, and a full-address
+      // member gets a link built from their address text rather than their NetForum
+      // coordinates, which are unreliable (Monday 12596102059).
+      const mapLink = buildDirectionsLink(itemData.addressDisplayOption, addresses);
 
       if (mapLink) {
         $item('#showMaps').enable();

package/public/Utils/sharedUtils.js

@@ -155,6 +155,40 @@ function buildMapLink(address) {
   return '';
 }
 
+/**
+ * Builds the directions-button link for a member, or '' when no button should show.
+ *
+ * PAC's rule (Monday 12596102059, confirmed by Richard Visser): directions appear
+ * only for members who selected "Show Full Address". Members displaying
+ * city/state/ZIP, and members who hid their address, get no button at all. An
+ * earlier pass relaxed this to city-level members and had to be reverted, so the
+ * rule lives here with tests around it rather than inline in the page code.
+ *
+ * The address is resolved with findMainAddress, so the button is always tied to
+ * the same address as the location text rendered beside it. A member whose
+ * displayed address is city-level gets no button even when a fuller address exists
+ * elsewhere on their record - the button must not point somewhere other than what
+ * is on screen.
+ *
+ * Coordinates are deliberately not required: buildMapLink navigates from the
+ * address text, so a member with missing or wrong NetForum coordinates still gets
+ * a working button where previously they got none. Distance ranking and the
+ * "XX miles away" figure keep using the coordinates and are unaffected.
+ *
+ * @param {Array} addressDisplayOption
+ * @param {Array} addresses
+ * @returns {string} map URL, or '' when the button should be hidden
+ */
+function buildDirectionsLink(addressDisplayOption = [], addresses = []) {
+  const address = findMainAddress(addressDisplayOption, addresses);
+
+  if (address?.addressStatus !== ADDRESS_STATUS_TYPES.FULL_ADDRESS) {
+    return '';
+  }
+
+  return buildMapLink(address);
+}
+
 /**
  * @param {Array} addressDisplayOption
  * @param {Array} addresses
@@ -266,6 +300,7 @@ module.exports = {
   generateId,
   formatAddress,
   buildMapLink,
+  buildDirectionsLink,
   isWixHostedImage,
   normalizeExternalUrl,
   normalizeEmail,