@justair/justair-library 7.6.0-alpha.2ec581a → 7.6.0-alpha.4ff5aae

package/dist/constants/deviceTypes.d.ts

@@ -5,7 +5,6 @@ export const DEVICE_TYPES: Readonly<{
 }>;
 export const DEVICE_TYPE_VALUES: readonly ("monitor" | "sample-site" | "linked-device")[];
 export function isAqiCapableDeviceType(deviceType: any): boolean;
-export const AQI_CAPABLE_DEVICE_TYPES: readonly ("monitor" | "sample-site" | "linked-device")[];
 /**
  * The device-type vocabulary as a type, so consumers get autocomplete and a
  * compile error on a mis-cased value like "sampleSite" — the exact bug the

package/dist/constants/deviceTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deviceTypes.d.ts","sourceRoot":"","sources":["../../src/constants/deviceTypes.js"],"names":[],"mappings":"AA0BA;;;;GAIG;AAEH,0FAA6E;AAiBtE,iEAEoC;AAiB3C,gGAEE;;;;;;yBA/BW,CAAA,OAAO,YAAY,EAAC,MAAM,OAAO,YAAY,CAAC"}
+{"version":3,"file":"deviceTypes.d.ts","sourceRoot":"","sources":["../../src/constants/deviceTypes.js"],"names":[],"mappings":"AA0BA;;;;GAIG;AAEH,0FAA6E;AAiBtE,iEAEoC;;;;;;yBAZ9B,CAAA,OAAO,YAAY,EAAC,MAAM,OAAO,YAAY,CAAC"}

package/dist/index.d.ts

@@ -106,9 +106,8 @@ import { getAlertWeight } from "./constants/alertLevels.js";
 import { DEVICE_TYPES } from "./constants/deviceTypes.js";
 import { DEVICE_TYPE_VALUES } from "./constants/deviceTypes.js";
 import { isAqiCapableDeviceType } from "./constants/deviceTypes.js";
-import { AQI_CAPABLE_DEVICE_TYPES } from "./constants/deviceTypes.js";
 import { projectSubscribedMonitors } from "./utils/subscribedDevices.js";
-import { resolveSubscribedMonitorIdsByUser } from "./utils/subscribedDevices.js";
+import { resolveMonitorIdsByUser } from "./utils/subscribedDevices.js";
 import { VISIBLE_SITE_MONITOR_FILTER } from "./utils/subscribedDevices.js";
 import { SUBSCRIBED_DEVICES_ERRORS } from "./utils/subscribedDevices.js";
 import { splitName } from "./utils/splitName.js";
@@ -121,5 +120,5 @@ import { validateQuietHours } from "./utils/quietHours.js";
 import { getZoneMinutes } from "./utils/quietHours.js";
 import { isInQuietWindow } from "./utils/quietHours.js";
 import { resolveQuietHours } from "./utils/quietHours.js";
-export { Database, adminSchema, Admin, configurationsSchema, Configurations, measurementsSchema, Measurements, monitorRequestsSchema, MonitorRequests, monitorsSchema, Monitors, organizationsSchema, Organizations, usersSchema, Users, COOKIE_CONSENT_CATEGORIES, COOKIE_CONSENT_VALUES, validateCookieConsent, eventsSchema, Events, lightMonitorSchema, LightMonitors, monitorSuppliersSchema, MonitorSuppliers, contextsSchema, Contexts, parametersSchema, Parameters, announcementSchema, Announcements, jobsSchema, Jobs, apiKeySchema, ApiKey, UsageMetrics, usageMetricsSchema, Audit, auditSchema, EventsAudit, eventsAuditSchema, MonitorAudit, monitorAuditSchema, parametersEnum, deploymentTypesEnum, AlertsAudit, Alerts, alertsSchema, alertsAuditSchema, Features, featuresSchema, dataCompletenessSchema, DataCompleteness, networkMetricsSchema, NetworkMetrics, rateOfChangeSchema, RateOfChange, changeStreamCheckpointsSchema, ChangeStreamCheckpoints, sitesSchema, Sites, sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum, samplesSchema, Samples, samplesAuditSchema, SamplesAudit, sampleParameterReferenceConcentrations, passwordResetTokenSchema, PasswordResetToken, monitorEpisodesSchema, MonitorEpisode, userNotificationsSchema, UserNotification, AqiAlertNotification, DeviceOfflineNotification, WeeklyDigestNotification, AccountNotification, NOTIFICATION_KINDS, NOTIFICATION_CHANNELS, DELIVERY_STATUSES, DATA_DOWNLOAD_TYPES, dataDownloadSchema, DataDownloads, AqiDataDownload, SampleDataDownload, DATA_DOWNLOAD_MAX_RANGE_DAYS, DATA_DOWNLOAD_ERRORS, validateDataDownloadDateOrder, validateDataDownloadMaxDateRange, validateDataDownloadEmail, normalizeDataDownloadEmail, validateDataDownloadTimezone, normalizeDataDownloadTimezone, PARAMETERS, HEAVY_METALS, ALERT_LEVEL_WEIGHTS, getAlertWeight, DEVICE_TYPES, DEVICE_TYPE_VALUES, isAqiCapableDeviceType, AQI_CAPABLE_DEVICE_TYPES, projectSubscribedMonitors, resolveSubscribedMonitorIdsByUser, VISIBLE_SITE_MONITOR_FILTER, SUBSCRIBED_DEVICES_ERRORS, splitName, DEFAULT_QUIET_HOURS, DEFAULT_TIMEZONE, QUIET_HOURS_ERRORS, isValidTimeString, isValidIANATimezone, validateQuietHours, getZoneMinutes, isInQuietWindow, resolveQuietHours };
+export { Database, adminSchema, Admin, configurationsSchema, Configurations, measurementsSchema, Measurements, monitorRequestsSchema, MonitorRequests, monitorsSchema, Monitors, organizationsSchema, Organizations, usersSchema, Users, COOKIE_CONSENT_CATEGORIES, COOKIE_CONSENT_VALUES, validateCookieConsent, eventsSchema, Events, lightMonitorSchema, LightMonitors, monitorSuppliersSchema, MonitorSuppliers, contextsSchema, Contexts, parametersSchema, Parameters, announcementSchema, Announcements, jobsSchema, Jobs, apiKeySchema, ApiKey, UsageMetrics, usageMetricsSchema, Audit, auditSchema, EventsAudit, eventsAuditSchema, MonitorAudit, monitorAuditSchema, parametersEnum, deploymentTypesEnum, AlertsAudit, Alerts, alertsSchema, alertsAuditSchema, Features, featuresSchema, dataCompletenessSchema, DataCompleteness, networkMetricsSchema, NetworkMetrics, rateOfChangeSchema, RateOfChange, changeStreamCheckpointsSchema, ChangeStreamCheckpoints, sitesSchema, Sites, sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum, samplesSchema, Samples, samplesAuditSchema, SamplesAudit, sampleParameterReferenceConcentrations, passwordResetTokenSchema, PasswordResetToken, monitorEpisodesSchema, MonitorEpisode, userNotificationsSchema, UserNotification, AqiAlertNotification, DeviceOfflineNotification, WeeklyDigestNotification, AccountNotification, NOTIFICATION_KINDS, NOTIFICATION_CHANNELS, DELIVERY_STATUSES, DATA_DOWNLOAD_TYPES, dataDownloadSchema, DataDownloads, AqiDataDownload, SampleDataDownload, DATA_DOWNLOAD_MAX_RANGE_DAYS, DATA_DOWNLOAD_ERRORS, validateDataDownloadDateOrder, validateDataDownloadMaxDateRange, validateDataDownloadEmail, normalizeDataDownloadEmail, validateDataDownloadTimezone, normalizeDataDownloadTimezone, PARAMETERS, HEAVY_METALS, ALERT_LEVEL_WEIGHTS, getAlertWeight, DEVICE_TYPES, DEVICE_TYPE_VALUES, isAqiCapableDeviceType, projectSubscribedMonitors, resolveMonitorIdsByUser, VISIBLE_SITE_MONITOR_FILTER, SUBSCRIBED_DEVICES_ERRORS, splitName, DEFAULT_QUIET_HOURS, DEFAULT_TIMEZONE, QUIET_HOURS_ERRORS, isValidTimeString, isValidIANATimezone, validateQuietHours, getZoneMinutes, isInQuietWindow, resolveQuietHours };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAyKA;;;iBAEC;yBAtGwB,oBAAoB;qBADxB,gBAAgB;4BApEF,mBAAmB;sBAAnB,mBAAmB;qCAI/C,4BAA4B;+BAA5B,4BAA4B;mCAM5B,0BAA0B;6BAA1B,0BAA0B;sCAI1B,6BAA6B;gCAA7B,6BAA6B;+BAQ7B,sBAAsB;yBAAtB,sBAAsB;oCACsB,2BAA2B;8BAA3B,2BAA2B;4BAcvE,mBAAmB;sBAAnB,mBAAmB;0CAAnB,mBAAmB;sCAAnB,mBAAmB;sCAAnB,mBAAmB;6BAMnB,oBAAoB;uBAApB,oBAAoB;mCAnBuB,2BAA2B;8BAA3B,2BAA2B;uCAItE,8BAA8B;iCAA9B,8BAA8B;+BACI,sBAAsB;yBAAtB,sBAAsB;iCAClB,wBAAwB;2BAAxB,wBAAwB;mCAcnB,2BAA2B;8BAA3B,2BAA2B;2BAC5C,kBAAkB;qBAAlB,kBAAkB;6BACd,oBAAoB;uBAApB,oBAAoB;6BACR,0BAA0B;mCAA1B,0BAA0B;sBArCpE,0BAA0B;4BAA1B,0BAA0B;4BAiC1B,oBAAoB;kCAApB,oBAAoB;6BArBpB,sBAAsB;mCAAtB,sBAAsB;+BAAtB,sBAAsB;oCAAtB,sBAAsB;4BA+BtB,oBAAoB;uBAApB,oBAAoB;6BAApB,oBAAoB;kCAApB,oBAAoB;yBACc,sBAAsB;+BAAtB,sBAAsB;uCAIxD,8BAA8B;iCAA9B,8BAA8B;qCAI9B,4BAA4B;+BAA5B,4BAA4B;mCACc,0BAA0B;6BAA1B,0BAA0B;8CAIpE,qCAAqC;wCAArC,qCAAqC;4BAkDT,mBAAmB;sBAAnB,mBAAmB;kCAS/C,yBAAyB;4BAAzB,yBAAyB;sCAAzB,yBAAyB;gCAAzB,yBAAyB;qCAAzB,yBAAyB;8BASzB,qBAAqB;wBAArB,qBAAqB;mCAArB,qBAAqB;6BAArB,qBAAqB;uDAArB,qBAAqB;yCAIrB,gCAAgC;mCAAhC,gCAAgC;sCArDhC,6BAA6B;+BAA7B,6BAA6B;wCAW7B,+BAA+B;iCAA/B,+BAA+B;qCAA/B,+BAA+B;0CAA/B,+BAA+B;yCAA/B,+BAA+B;oCAA/B,+BAA+B;mCAA/B,+BAA+B;sCAA/B,+BAA+B;kCAA/B,+BAA+B;oCArBF,8BAA8B;mCAqE3D,2BAA2B;8BAA3B,2BAA2B;gCAA3B,2BAA2B;mCAA3B,2BAA2B;+DAsB3B,mCAAmC;qCAAnC,mCAAmC;mEAAnC,mCAAmC;yEAAnC,mCAAmC;mEAAnC,mCAAmC;qEAAnC,mCAAmC;yEAAnC,mCAAmC;2EAAnC,mCAAmC;2BAjGD,2BAA2B;6BAA3B,2BAA2B;oCAI7D,4BAA4B;+BAA5B,4BAA4B;6BAQ5B,4BAA4B;mCAA5B,4BAA4B;uCAA5B,4BAA4B;yCAA5B,4BAA4B;0CAgC5B,8BAA8B;kDAA9B,8BAA8B;4CAA9B,8BAA8B;0CAA9B,8BAA8B;0BAhBX,sBAAsB;oCASzC,uBAAuB;iCAhCG,0BAA0B;mCAgCpD,uBAAuB;kCAAvB,uBAAuB;oCACM,qBAAqB;mCADlD,uBAAuB;+BAAvB,uBAAuB;gCAAvB,uBAAuB;kCAAvB,uBAAuB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA+JA;;;iBAEC;yBA/FwB,oBAAoB;qBADxB,gBAAgB;4BAjEF,mBAAmB;sBAAnB,mBAAmB;qCAI/C,4BAA4B;+BAA5B,4BAA4B;mCAM5B,0BAA0B;6BAA1B,0BAA0B;sCAI1B,6BAA6B;gCAA7B,6BAA6B;+BAQ7B,sBAAsB;yBAAtB,sBAAsB;oCACsB,2BAA2B;8BAA3B,2BAA2B;4BAcvE,mBAAmB;sBAAnB,mBAAmB;0CAAnB,mBAAmB;sCAAnB,mBAAmB;sCAAnB,mBAAmB;6BAMnB,oBAAoB;uBAApB,oBAAoB;mCAnBuB,2BAA2B;8BAA3B,2BAA2B;uCAItE,8BAA8B;iCAA9B,8BAA8B;+BACI,sBAAsB;yBAAtB,sBAAsB;iCAClB,wBAAwB;2BAAxB,wBAAwB;mCAcnB,2BAA2B;8BAA3B,2BAA2B;2BAC5C,kBAAkB;qBAAlB,kBAAkB;6BACd,oBAAoB;uBAApB,oBAAoB;6BACR,0BAA0B;mCAA1B,0BAA0B;sBArCpE,0BAA0B;4BAA1B,0BAA0B;4BAiC1B,oBAAoB;kCAApB,oBAAoB;6BArBpB,sBAAsB;mCAAtB,sBAAsB;+BAAtB,sBAAsB;oCAAtB,sBAAsB;4BA+BtB,oBAAoB;uBAApB,oBAAoB;6BAApB,oBAAoB;kCAApB,oBAAoB;yBACc,sBAAsB;+BAAtB,sBAAsB;uCAIxD,8BAA8B;iCAA9B,8BAA8B;qCACgB,4BAA4B;+BAA5B,4BAA4B;mCAChC,0BAA0B;6BAA1B,0BAA0B;8CAIpE,qCAAqC;wCAArC,qCAAqC;4BA8CT,mBAAmB;sBAAnB,mBAAmB;kCAS/C,yBAAyB;4BAAzB,yBAAyB;sCAAzB,yBAAyB;gCAAzB,yBAAyB;qCAAzB,yBAAyB;8BASzB,qBAAqB;wBAArB,qBAAqB;mCAArB,qBAAqB;6BAArB,qBAAqB;uDAArB,qBAAqB;yCACiC,gCAAgC;mCAAhC,gCAAgC;sCAlDtF,6BAA6B;+BAA7B,6BAA6B;wCAW7B,+BAA+B;iCAA/B,+BAA+B;qCAA/B,+BAA+B;0CAA/B,+BAA+B;yCAA/B,+BAA+B;oCAA/B,+BAA+B;mCAA/B,+BAA+B;sCAA/B,+BAA+B;kCAA/B,+BAA+B;oCApBF,8BAA8B;mCAiE3D,2BAA2B;8BAA3B,2BAA2B;gCAA3B,2BAA2B;mCAA3B,2BAA2B;+DAsB3B,mCAAmC;qCAAnC,mCAAmC;mEAAnC,mCAAmC;yEAAnC,mCAAmC;mEAAnC,mCAAmC;qEAAnC,mCAAmC;yEAAnC,mCAAmC;2EAAnC,mCAAmC;2BA1FD,2BAA2B;6BAA3B,2BAA2B;oCAChB,4BAA4B;+BAA5B,4BAA4B;6BAOzE,4BAA4B;mCAA5B,4BAA4B;uCAA5B,4BAA4B;0CAgC5B,8BAA8B;wCAA9B,8BAA8B;4CAA9B,8BAA8B;0CAA9B,8BAA8B;0BAhBX,sBAAsB;oCASzC,uBAAuB;iCA/BG,0BAA0B;mCA+BpD,uBAAuB;kCAAvB,uBAAuB;oCACM,qBAAqB;mCADlD,uBAAuB;+BAAvB,uBAAuB;gCAAvB,uBAAuB;kCAAvB,uBAAuB"}

package/dist/models/users.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/models/users.js"],"names":[],"mappings":"AA6FA,8BA0GE;AAiCF,wBAAmD;AA/NnD,iDAA4D;AAC5D,6CAAmD;AAUnD,4DA0BC"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/models/users.js"],"names":[],"mappings":"AAyFA,8BAgGE;AAiCF,wBAAmD;AAjNnD,iDAA4D;AAC5D,6CAAmD;AAUnD,4DAsBC"}

package/dist/utils/subscribedDevices.d.ts

@@ -8,9 +8,9 @@ export const SUBSCRIBED_DEVICES_ERRORS: Readonly<{
     COHORT_USER_MISSING_ID: "cohort_user_missing_id";
 }>;
 export const VISIBLE_SITE_MONITOR_FILTER: Readonly<{
-    isPrivate: Readonly<{
-        $ne: true;
-    }>;
+    isPrivate: {
+        $ne: boolean;
+    };
     isActive: true;
 }>;
 export function projectSubscribedMonitors(subscribedDevices?: Array<{
@@ -19,7 +19,7 @@ export function projectSubscribedMonitors(subscribedDevices?: Array<{
 }>, { resolveSiteMonitorIds }?: {
     resolveSiteMonitorIds?: (siteIds: import("mongoose").Types.ObjectId[]) => Promise<Array<import("mongoose").Types.ObjectId | null | undefined>>;
 }): Promise<import("mongoose").Types.ObjectId[]>;
-export function resolveSubscribedMonitorIdsByUser(users?: Array<{
+export function resolveMonitorIdsByUser(users?: Array<{
     _id: any;
     subscribedDevices?: Array<{
         deviceId: import("mongoose").Types.ObjectId;

package/dist/utils/subscribedDevices.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"subscribedDevices.d.ts","sourceRoot":"","sources":["../../src/utils/subscribedDevices.js"],"names":[],"mappings":"AA0FA;;;;;;;;GASG;AA+CH;;;;;GAGG;AA6LI,8DANI,KAAK,CAAC;IAAE,QAAQ,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1D,UAAU,EAAE,OAAO,6BAA6B,EAAE,UAAU,CAAA;CAAE,CAAC,8BACzD;IAAE,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,KAC7E,OAAO,CAAC,KAAK,CAAC,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAA;CAAE,GAC9D,OAAO,CAAC,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CA0BxD;AA0EM,0DAPI,KAAK,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAClD,QAAQ,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC;QAC5C,UAAU,EAAE,OAAO,6BAA6B,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,mCAC5D;IAAE,0BAA0B,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,KAClF,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;CAAE,GACnD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAmErE"}
+{"version":3,"file":"subscribedDevices.d.ts","sourceRoot":"","sources":["../../src/utils/subscribedDevices.js"],"names":[],"mappings":"AAmEA;;;;;;;;GASG;AAyBH;;;;;GAGG;AAiLI,8DANI,KAAK,CAAC;IAAE,QAAQ,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC1D,UAAU,EAAE,OAAO,6BAA6B,EAAE,UAAU,CAAA;CAAE,CAAC,8BACzD;IAAE,qBAAqB,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,KAC7E,OAAO,CAAC,KAAK,CAAC,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAA;CAAE,GAC9D,OAAO,CAAC,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CA0BxD;AAkEM,gDAPI,KAAK,CAAC;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC;QAClD,QAAQ,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC;QAC5C,UAAU,EAAE,OAAO,6BAA6B,EAAE,UAAU,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,mCAC5D;IAAE,0BAA0B,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,KAClF,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;CAAE,GACnD,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,UAAU,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CA2DrE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "7.6.0-alpha.2ec581a",
+  "version": "7.6.0-alpha.4ff5aae",
   "description": "JustAir Internal Library",
   "main": "src/index.js",
   "type": "module",

package/src/constants/deviceTypes.js

@@ -50,22 +50,3 @@ export const DEVICE_TYPE_VALUES = Object.freeze(Object.values(DEVICE_TYPES));
 export const isAqiCapableDeviceType = (deviceType) =>
   deviceType === DEVICE_TYPES.MONITOR ||
   deviceType === DEVICE_TYPES.LINKED_DEVICE;
-
-// The same predicate in the shape a Mongo query wants, so a cohort read can
-// leave out rows that could never alert instead of loading and discarding
-// them:
-//
-//   { "subscribedDevices.deviceType": { $in: AQI_CAPABLE_DEVICE_TYPES } }
-//
-// Derived from isAqiCapableDeviceType's own answer rather than hand-listed, so
-// the two cannot disagree if a fourth device type ever arrives. Frozen for the
-// same reason DEVICE_TYPE_VALUES is: every importer in a process shares this
-// instance, and one `.push()` would silently widen the audience for all of
-// them.
-//
-// Carries the same asymmetry the predicate does: `linked-device` being in this
-// list is necessary and NOT sufficient — a Site only actually alerts when it
-// links at least one monitor, which no query on deviceType can tell you.
-export const AQI_CAPABLE_DEVICE_TYPES = Object.freeze(
-  DEVICE_TYPE_VALUES.filter(isAqiCapableDeviceType),
-);

package/src/constants/tests/deviceTypes.test.js

@@ -8,14 +8,12 @@ import {
   DEVICE_TYPES,
   DEVICE_TYPE_VALUES,
   isAqiCapableDeviceType,
-  AQI_CAPABLE_DEVICE_TYPES,
 } from '../deviceTypes.js';
 
 test('barrel exports the device-type constants', () => {
   expect(barrel.DEVICE_TYPES).toBe(DEVICE_TYPES);
   expect(barrel.DEVICE_TYPE_VALUES).toBe(DEVICE_TYPE_VALUES);
   expect(barrel.isAqiCapableDeviceType).toBe(isAqiCapableDeviceType);
-  expect(barrel.AQI_CAPABLE_DEVICE_TYPES).toBe(AQI_CAPABLE_DEVICE_TYPES);
 });
 
 test('DEVICE_TYPES values match the strings the devices API emits', () => {
@@ -53,23 +51,3 @@ describe('isAqiCapableDeviceType', () => {
     expect(isAqiCapableDeviceType('')).toBe(false);
   });
 });
-
-describe('AQI_CAPABLE_DEVICE_TYPES', () => {
-  test('is the $in form of isAqiCapableDeviceType, in vocabulary order', () => {
-    expect(AQI_CAPABLE_DEVICE_TYPES).toEqual(['monitor', 'linked-device']);
-  });
-
-  test('agrees with the predicate for every device type', () => {
-    // Derived from the predicate rather than hand-listed, so this pins that
-    // the derivation stays wired up if a fourth device type is added.
-    DEVICE_TYPE_VALUES.forEach((deviceType) => {
-      expect(AQI_CAPABLE_DEVICE_TYPES.includes(deviceType)).toBe(
-        isAqiCapableDeviceType(deviceType),
-      );
-    });
-  });
-
-  test('is frozen — every importer shares this instance', () => {
-    expect(Object.isFrozen(AQI_CAPABLE_DEVICE_TYPES)).toBe(true);
-  });
-});

package/src/index.js

@@ -57,10 +57,7 @@ import {
   DataCompleteness,
   dataCompletenessSchema,
 } from "./models/dataCompleteness.js";
-import {
-  NetworkMetrics,
-  networkMetricsSchema,
-} from "./models/networkMetrics.js";
+import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js";
 import { RateOfChange, rateOfChangeSchema } from "./models/rateOfChange.js";
 import {
   ChangeStreamCheckpoints,
@@ -69,17 +66,13 @@ import {
 import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 import { PARAMETERS, HEAVY_METALS } from "./constants/pollutants.js";
-import {
-  ALERT_LEVEL_WEIGHTS,
-  getAlertWeight,
-} from "./constants/alertLevels.js";
+import { ALERT_LEVEL_WEIGHTS, getAlertWeight } from "./constants/alertLevels.js";
 import { DEFAULT_TIMEZONE } from "./constants/timezones.js";
 import { DATA_DOWNLOAD_TYPES } from "./constants/dataDownloads.js";
 import {
   DEVICE_TYPES,
   DEVICE_TYPE_VALUES,
   isAqiCapableDeviceType,
-  AQI_CAPABLE_DEVICE_TYPES,
 } from "./constants/deviceTypes.js";
 import {
   monitorEpisodesSchema,
@@ -109,7 +102,7 @@ import {
 import { isValidIANATimezone } from "./utils/timezone.js";
 import {
   projectSubscribedMonitors,
-  resolveSubscribedMonitorIdsByUser,
+  resolveMonitorIdsByUser,
   VISIBLE_SITE_MONITOR_FILTER,
   SUBSCRIBED_DEVICES_ERRORS,
 } from "./utils/subscribedDevices.js";
@@ -134,10 +127,7 @@ import {
   SamplesAudit,
   sampleParameterReferenceConcentrations,
 } from "./models/samples.js";
-import {
-  passwordResetTokenSchema,
-  PasswordResetToken,
-} from "./models/passwordResetToken.js";
+import { passwordResetTokenSchema, PasswordResetToken } from "./models/passwordResetToken.js";
 import {
   dataDownloadSchema,
   DataDownloads,
@@ -284,22 +274,14 @@ export {
   DEVICE_TYPES,
   DEVICE_TYPE_VALUES,
   isAqiCapableDeviceType,
-  // The query form of isAqiCapableDeviceType, for narrowing a Users read to
-  // rows that could actually alert:
-  //   { "subscribedDevices.deviceType": { $in: AQI_CAPABLE_DEVICE_TYPES } }
-  AQI_CAPABLE_DEVICE_TYPES,
   // subscribedDevices → monitor ids, resolved at READ time (JA-3110 / JA-3335).
   // Users.subscribedDevices is the source of truth; Users.subscribedMonitors is
   // being retired rather than kept in step with it. Nothing should store this
   // result — see the module header for the five bugs a stored copy caused.
   //
-  // Both resolvers are only correct for users whose subscribedDevices has been
-  // backfilled from subscribedMonitors — read the PRECONDITION block in the
-  // module header before pointing a service at either of them.
-  //
-  //   resolveSubscribedMonitorIdsByUser — the batch form. One Sites lookup for
-  //                              a whole cohort. What alert runs, org pages and
-  //                              session responses should call.
+  //   resolveMonitorIdsByUser  — the batch form. One Sites lookup for a whole
+  //                              cohort. What alert runs, org pages and session
+  //                              responses should call.
   //   projectSubscribedMonitors — the single-user rule the batch form is built
   //                              on. Named after the field being retired; it
   //                              gets renamed when that field is dropped.
@@ -310,7 +292,7 @@ export {
   //   SUBSCRIBED_DEVICES_ERRORS — stable `err.code` vocabulary; consumers
   //                              branch on it, never on message wording.
   projectSubscribedMonitors,
-  resolveSubscribedMonitorIdsByUser,
+  resolveMonitorIdsByUser,
   VISIBLE_SITE_MONITOR_FILTER,
   SUBSCRIBED_DEVICES_ERRORS,
   // Utilities

package/src/models/users.js

@@ -15,15 +15,11 @@ const cookieConsentSchemaDefinition = COOKIE_CONSENT_CATEGORIES.reduce(
     definition[category] = { type: String, enum: COOKIE_CONSENT_VALUES };
     return definition;
   },
-  {},
+  {}
 );
 
 const validateCookieConsent = (consent) => {
-  if (
-    typeof consent !== "object" ||
-    consent === null ||
-    Array.isArray(consent)
-  ) {
+  if (typeof consent !== "object" || consent === null || Array.isArray(consent)) {
     return "cookie_consent must be an object";
   }
 
@@ -38,7 +34,7 @@ const validateCookieConsent = (consent) => {
     }
     if (!COOKIE_CONSENT_VALUES.includes(value)) {
       return `Invalid value for ${category}: must be one of ${COOKIE_CONSENT_VALUES.join(
-        ", ",
+        ", "
       )}`;
     }
   }
@@ -88,7 +84,7 @@ const subscribedDeviceSchema = mongoose.Schema(
     // writing (and/or pass `{ runValidators: true }` to the update).
     deviceType: { type: String, enum: DEVICE_TYPE_VALUES, required: true },
   },
-  { _id: false },
+  { _id: false }
 );
 
 const usersSchema = mongoose.Schema(
@@ -103,31 +99,21 @@ const usersSchema = mongoose.Schema(
     organizations: [{ type: mongoose.Types.ObjectId, ref: "Organizations" }],
     alertPhone: String,
     alertCount: { type: Number, default: 0 },
-    // BEING RETIRED (JA-3110 / JA-3335). This was a denormalized copy of the
-    // AQI-alert audience, rewritten on every subscribe and unsubscribe. Do not
-    // write it from new code and do not keep it in step with anything: the
-    // audience is now RESOLVED AT READ TIME from subscribedDevices below, and
-    // the field is dropped once every consumer has moved off it. Five distinct
-    // silent-failure bugs traced back to maintaining this copy; they are
-    // enumerated in the header of src/utils/subscribedDevices.js.
-    //
-    // It is still read (and still the correct thing to read) for any user
-    // whose subscribedDevices has not been backfilled yet — the same header's
-    // PRECONDITION block has the ordering.
     subscribedMonitors: [{ type: mongoose.Types.ObjectId, ref: "Monitors" }],
-    // Subscribed devices (JA-3110 / JA-3335) — the SOURCE OF TRUTH for what the
+    // Subscribed devices (JA-3110 / JA-3335) — the source of truth for what the
     // user has added to "My Monitors", across all three device types.
     //
-    // The monitor ids this implies are derived on read, never stored:
-    // `resolveSubscribedMonitorIdsByUser` for a cohort,
-    // `projectSubscribedMonitors` for one user, both exported from
-    // src/index.js. Deliberately not a schema validator — the derivation needs
-    // a Site lookup, which the schema has no business doing.
+    // subscribedMonitors above is its derived AQI-alert projection (monitor ids
+    // only). The two must be written together on every subscribe and
+    // unsubscribe path, using `projectSubscribedMonitors` rather than a
+    // per-consumer reimplementation. It is deliberately not a schema validator:
+    // the projection needs a Site lookup, which the schema has no business
+    // doing.
     //
     // Everything else — the per-device-type rule, the backfill PRECONDITION,
-    // the privacy obligation, and why the field is split at all — is specified
-    // once, in the header of src/utils/subscribedDevices.js. Read it there; it
-    // is deliberately not summarised here.
+    // the STALENESS gap, and why the field is split at all — is specified once,
+    // in the header of src/utils/subscribedDevices.js. Read it there; it is
+    // deliberately not summarised here.
     subscribedDevices: [subscribedDeviceSchema],
     currentAlertMode: {
       type: String,
@@ -196,7 +182,7 @@ const usersSchema = mongoose.Schema(
   },
   {
     timestamps: true,
-  },
+  }
 );
 
 // Cross-field quiet-hours rules (both-or-neither, start ≠ end) delegated to

package/src/utils/subscribedDevices.js

@@ -39,29 +39,6 @@
 // this result, you are reintroducing all five.
 //
 // ---------------------------------------------------------------------------
-// PRECONDITION: THE BACKFILL LANDS BEFORE ANY CONSUMER SWITCHES OVER
-// ---------------------------------------------------------------------------
-// Resolving at read time is only CORRECT for a user whose `subscribedDevices`
-// has already been backfilled from `subscribedMonitors`. A user who predates
-// the field carries a full `subscribedMonitors` and no `subscribedDevices` key
-// at all on a `.lean()` read — real state, pinned in
-// `src/models/tests/users.test.js`. Call `resolveSubscribedMonitorIdsByUser`
-// on that user and you get `[]` back: their AQI alerts stop, and nothing
-// anywhere errors.
-//
-// So the ordering is not negotiable. Per environment: backfill
-// `subscribedDevices` from `subscribedMonitors` FIRST, verify it, and only
-// then point that environment's consumers at this module. Until the backfill
-// has run there, consumers keep reading `subscribedMonitors`. Dropping the
-// field is the last step of the JA-3110 plan (see "JA-3110 — Retire
-// subscribedMonitors" in JustAirService `TODOS.md`), never the first.
-//
-// This module cannot detect the un-backfilled case for you — an empty
-// `subscribedDevices` and "follows nothing" are the same value — which is
-// exactly why the ordering has to be an operational guarantee rather than a
-// runtime check.
-//
-// ---------------------------------------------------------------------------
 // PRIVACY IS THE CALLER'S JOB, AND IT IS NOT OPTIONAL
 // ---------------------------------------------------------------------------
 // A Site's `monitorIds` is a raw membership list with no visibility filtering.
@@ -93,7 +70,7 @@ export const SUBSCRIBED_DEVICES_ERRORS = Object.freeze({
   RESOLVER_RETURNED_NON_ARRAY: "resolver_returned_non_array",
   RESOLVER_RETURNED_NESTED_ARRAYS: "resolver_returned_nested_arrays",
   RESOLVER_RETURNED_DOCUMENTS: "resolver_returned_documents",
-  // resolveSubscribedMonitorIdsByUser only
+  // resolveMonitorIdsByUser only
   MISSING_COHORT_SITE_RESOLVER: "missing_cohort_site_resolver",
   COHORT_RESOLVER_RETURNED_NON_MAP: "cohort_resolver_returned_non_map",
   COHORT_USER_MISSING_ID: "cohort_user_missing_id",
@@ -116,36 +93,14 @@ export const SUBSCRIBED_DEVICES_ERRORS = Object.freeze({
 //     "_id",
 //   ).lean();
 //
-// `isActive: true` is an EXACT match, and that asymmetry with the `$ne` above
-// is DELIBERATE — do not "fix" it to `{ $ne: false }`. The two clauses answer
-// different questions. `isPrivate` is a privacy gate: a monitor with no
-// `isPrivate` key was never marked private, so excluding it would hide a
-// monitor its followers are entitled to see. `isActive` is an eligibility
-// gate: a monitor only earns a place in an alert audience by positively
-// asserting it is active. A document with no `isActive` key has made no such
-// assertion, and the safe reading of "we don't know" is to leave it out rather
-// than alert on it.
-//
-// So the failure modes are not symmetric and should not be made symmetric.
-// Over-including here means alerting people about a monitor nobody confirmed
-// is live; under-including means one unconfirmed monitor is missing from an
-// audience until someone sets the flag. This predicate takes the second.
-//
 // `monitorState: "Deployed"` is deliberately NOT here. That is an
 // alerting-eligibility rule, not a visibility rule, and it belongs to the
 // notification service alone — the org admin page and the session response
 // must still show a follower the monitors they follow while those monitors sit
 // in a non-Deployed state. Do not consolidate the two filters; keep
 // JustAirNotificationService's own `monitorState` predicate where it is.
-//
-// Frozen at every level, not just the top. `Object.freeze` is shallow, so a
-// top-level-only freeze still lets a consumer write
-// `VISIBLE_SITE_MONITOR_FILTER.isPrivate.$ne = false` — and because every
-// consumer spreads THIS instance, that one write flips the privacy predicate
-// for the whole process. `isPrivate` is the only nested object here; freeze it
-// too, and freeze any operator object a future clause introduces.
 export const VISIBLE_SITE_MONITOR_FILTER = Object.freeze({
-  isPrivate: Object.freeze({ $ne: true }),
+  isPrivate: { $ne: true },
   isActive: true,
 });
 
@@ -207,7 +162,7 @@ const validateResolvedSiteMonitorIds = (resolved) => {
 
   if (!Array.isArray(resolved)) {
     const error = new TypeError(
-      "resolveSiteMonitorIds must resolve to an array of monitor ids",
+      "resolveSiteMonitorIds must resolve to an array of monitor ids"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.RESOLVER_RETURNED_NON_ARRAY;
     throw error;
@@ -219,7 +174,7 @@ const validateResolvedSiteMonitorIds = (resolved) => {
   // silently works, two throws a CastError at write time, far from the cause.
   if (resolved.some(Array.isArray)) {
     const error = new TypeError(
-      "resolveSiteMonitorIds must resolve to a flat array of monitor ids",
+      "resolveSiteMonitorIds must resolve to a flat array of monitor ids"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.RESOLVER_RETURNED_NESTED_ARRAYS;
     throw error;
@@ -235,11 +190,11 @@ const validateResolvedSiteMonitorIds = (resolved) => {
   // (`Sites.find(..., "monitorIds -_id").lean()`) carries none.
   if (
     resolved.some(
-      (id) => isPlainObject(id) && typeof id.toHexString !== "function",
+      (id) => isPlainObject(id) && typeof id.toHexString !== "function"
     )
   ) {
     const error = new TypeError(
-      "resolveSiteMonitorIds must resolve to monitor ids, not Site documents",
+      "resolveSiteMonitorIds must resolve to monitor ids, not Site documents"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.RESOLVER_RETURNED_DOCUMENTS;
     throw error;
@@ -265,7 +220,7 @@ const validateResolvedSiteMonitorMap = (resolved) => {
 
   if (!(resolved instanceof Map)) {
     const error = new TypeError(
-      "resolveVisibleSiteMonitors must resolve to a Map of site id to monitor ids",
+      "resolveVisibleSiteMonitors must resolve to a Map of site id to monitor ids"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.COHORT_RESOLVER_RETURNED_NON_MAP;
     throw error;
@@ -275,15 +230,15 @@ const validateResolvedSiteMonitorMap = (resolved) => {
     [...resolved.entries()].map(([siteId, monitorIds]) => [
       String(siteId),
       validateResolvedSiteMonitorIds(monitorIds),
-    ]),
+    ])
   );
 };
 
-// Resolves one user's subscribedDevices array down to the flat monitor ids
-// that make up their AQI-alert audience. Order is deterministic — direct
-// `monitor` subscriptions in array order, then Site-derived ids in resolver
-// order, first occurrence wins — but carries no meaning; treat the result as a
-// set. This is a value to use, not a value to persist (see below).
+
+// Returns the monitor ids that should be stored in Users.subscribedMonitors for
+// the given subscribedDevices array. Order is deterministic — direct `monitor`
+// subscriptions in array order, then Site-derived ids in resolver order, first
+// occurrence wins — but carries no meaning; treat the result as a set.
 //
 // `subscribedDevices` tolerates undefined/null: a user row written before this
 // field existed has no key at all on a `.lean()` read (pinned in
@@ -292,21 +247,10 @@ const validateResolvedSiteMonitorMap = (resolved) => {
 //
 // `resolveSiteMonitorIds(siteIds)` is called at most once, with every
 // linked-device id at a time, and must resolve to the flat union of those
-// Sites' VISIBLE monitorIds — the ids themselves, not the Site documents.
-// `Sites.monitorIds` is a raw membership list, so it goes through
-// VISIBLE_SITE_MONITOR_FILTER before it becomes an alert audience; handing
-// back `site.monitorIds` untouched is the leak the privacy note above
-// describes:
+// Sites' monitorIds — the ids themselves, not the Site documents:
 //
 //   const sites = await Sites.find({ _id: { $in: siteIds } }, "monitorIds").lean();
-//   const monitors = await Monitors.find(
-//     {
-//       _id: { $in: sites.flatMap((site) => site.monitorIds ?? []) },
-//       ...VISIBLE_SITE_MONITOR_FILTER,
-//     },
-//     "_id",
-//   ).lean();
-//   return monitors.map((monitor) => monitor._id);
+//   return sites.flatMap((site) => site.monitorIds ?? []);
 //
 // Returning the documents is the easy mistake, so it is rejected rather than
 // merely documented: the return is validated and a document-shaped entry
@@ -326,9 +270,8 @@ const validateResolvedSiteMonitorMap = (resolved) => {
 // from. Its privacy obligation applies here too: the ids this returns are only
 // as safe to alert on as the resolver that produced them.
 //
-// For a whole cohort of users, prefer resolveSubscribedMonitorIdsByUser
-// below — it does the Sites lookup once for the batch instead of once per
-// user.
+// For a whole cohort of users, prefer resolveMonitorIdsByUser below — it does
+// the Sites lookup once for the batch instead of once per user.
 /**
  * @param {Array<{ deviceId: import("mongoose").Types.ObjectId,
  *   deviceType: import("../constants/deviceTypes.js").DeviceType }>} [subscribedDevices]
@@ -338,7 +281,7 @@ const validateResolvedSiteMonitorMap = (resolved) => {
  */
 export const projectSubscribedMonitors = async (
   subscribedDevices,
-  { resolveSiteMonitorIds } = {},
+  { resolveSiteMonitorIds } = {}
 ) => {
   const entries = (subscribedDevices ?? []).filter(isPlainObject);
   const direct = directMonitorIds(entries);
@@ -350,14 +293,14 @@ export const projectSubscribedMonitors = async (
 
   if (typeof resolveSiteMonitorIds !== "function") {
     const error = new TypeError(
-      "projectSubscribedMonitors requires resolveSiteMonitorIds when a linked-device is subscribed",
+      "projectSubscribedMonitors requires resolveSiteMonitorIds when a linked-device is subscribed"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.MISSING_SITE_RESOLVER;
     throw error;
   }
 
   const siteMonitorIds = validateResolvedSiteMonitorIds(
-    await resolveSiteMonitorIds(siteIds),
+    await resolveSiteMonitorIds(siteIds)
   );
   return dedupeById([...direct, ...siteMonitorIds]);
 };
@@ -404,21 +347,13 @@ export const projectSubscribedMonitors = async (
 // to nothing, so their alerts stop) is the subscription-identity question
 // tracked in TODOS, and is deliberately not papered over here.
 //
-// Users are keyed by `String(user._id)`, so callers look up with the same.
-// Anything in the cohort that is not a user object carrying an `_id` — a
-// missing `_id`, a `null` slot, a bare id string — throws COHORT_USER_MISSING_ID
-// rather than being skipped. Skipping would silently remove a real person from
-// an alert audience, which is the failure mode this whole module exists to
-// avoid, and a caller cannot tell a dropped entry apart from one that resolved
-// to nothing.
+// Users are keyed by `String(user._id)`, so callers look up with the same. A
+// user with no `_id` throws rather than being skipped: skipping would silently
+// remove a real person from an alert audience, which is the failure mode this
+// whole module exists to avoid.
 //
 // Consumers can shrink the cohort by pushing the AQI-capability predicate into
-// the Users query, so rows that can never alert are not loaded at all.
-// AQI_CAPABLE_DEVICE_TYPES is the query form of isAqiCapableDeviceType and is
-// exported from constants/deviceTypes.js (and the root barrel) for exactly
-// this:
-//
-//   import { AQI_CAPABLE_DEVICE_TYPES } from "@justair/justair-library";
+// the Users query, so rows that can never alert are not loaded at all:
 //
 //   { "subscribedDevices.deviceType": { $in: AQI_CAPABLE_DEVICE_TYPES } }
 //
@@ -434,26 +369,18 @@ export const projectSubscribedMonitors = async (
  *   Promise<Map<string, import("mongoose").Types.ObjectId[]>> }} [options]
  * @returns {Promise<Map<string, import("mongoose").Types.ObjectId[]>>}
  */
-export const resolveSubscribedMonitorIdsByUser = async (
+export const resolveMonitorIdsByUser = async (
   users,
-  { resolveVisibleSiteMonitors } = {},
+  { resolveVisibleSiteMonitors } = {}
 ) => {
-  const cohort = users ?? [];
+  const cohort = (users ?? []).filter(isPlainObject);
 
-  // Every entry must be a user object carrying an _id, and anything else
-  // throws rather than being filtered out. A `null` slot used to be dropped by
-  // an isPlainObject filter and then never appear in the returned Map, which
-  // is the same silent removal from an alert audience that the missing-_id
-  // check below already rejects — a caller cannot tell "that user follows
-  // nothing" apart from "that user was quietly discarded". One rule for both:
-  // if the cohort contains something that is not a resolvable user, say so.
-  const invalid = cohort.some(
-    (user) =>
-      !isPlainObject(user) || user._id === null || user._id === undefined,
+  const missing = cohort.find(
+    (user) => user._id === null || user._id === undefined
   );
-  if (invalid) {
+  if (missing) {
     const error = new TypeError(
-      "resolveSubscribedMonitorIdsByUser requires every cohort entry to be a user object carrying an _id",
+      "resolveMonitorIdsByUser requires every user to carry an _id"
     );
     error.code = SUBSCRIBED_DEVICES_ERRORS.COHORT_USER_MISSING_ID;
     throw error;
@@ -463,21 +390,21 @@ export const resolveSubscribedMonitorIdsByUser = async (
   // of the batch form. Two users following the same Site cost one entry.
   const siteIds = dedupeById(
     cohort.flatMap((user) =>
-      linkedSiteIds((user.subscribedDevices ?? []).filter(isPlainObject)),
-    ),
+      linkedSiteIds((user.subscribedDevices ?? []).filter(isPlainObject))
+    )
   );
 
   let monitorIdsBySite = new Map();
   if (siteIds.length > 0) {
     if (typeof resolveVisibleSiteMonitors !== "function") {
       const error = new TypeError(
-        "resolveSubscribedMonitorIdsByUser requires resolveVisibleSiteMonitors when anyone in the cohort follows a linked-device",
+        "resolveMonitorIdsByUser requires resolveVisibleSiteMonitors when anyone in the cohort follows a linked-device"
       );
       error.code = SUBSCRIBED_DEVICES_ERRORS.MISSING_COHORT_SITE_RESOLVER;
       throw error;
     }
     monitorIdsBySite = validateResolvedSiteMonitorMap(
-      await resolveVisibleSiteMonitors(siteIds),
+      await resolveVisibleSiteMonitors(siteIds)
     );
   }
 
@@ -492,11 +419,11 @@ export const resolveSubscribedMonitorIdsByUser = async (
     cohort.map((user) =>
       projectSubscribedMonitors(user.subscribedDevices, {
         resolveSiteMonitorIds,
-      }),
-    ),
+      })
+    )
   );
 
   return new Map(
-    cohort.map((user, index) => [String(user._id), resolved[index]]),
+    cohort.map((user, index) => [String(user._id), resolved[index]])
   );
 };

package/src/utils/tests/subscribedDevices.test.js

@@ -6,7 +6,7 @@ import {
 } from '../../constants/deviceTypes.js';
 import {
   projectSubscribedMonitors,
-  resolveSubscribedMonitorIdsByUser,
+  resolveMonitorIdsByUser,
   VISIBLE_SITE_MONITOR_FILTER,
   SUBSCRIBED_DEVICES_ERRORS,
 } from '../subscribedDevices.js';
@@ -417,7 +417,7 @@ describe('isAqiCapableDeviceType agrees with the projection', () => {
 });
 
 // ---------------------------------------------------------------------------
-// resolveSubscribedMonitorIdsByUser — the cohort form
+// resolveMonitorIdsByUser — the cohort form
 // ---------------------------------------------------------------------------
 // The batch form exists for exactly two reasons, and both are asserted here
 // rather than just described: it must issue ONE Sites lookup for a whole
@@ -439,11 +439,11 @@ const recordingSiteMap = (byId) => {
 
 const user = (subscribedDevices) => ({ _id: oid(), subscribedDevices });
 
-describe('resolveSubscribedMonitorIdsByUser', () => {
+describe('resolveMonitorIdsByUser', () => {
   test('keys the result by String(user._id)', async () => {
     const u = user([]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u]);
+    const result = await resolveMonitorIdsByUser([u]);
 
     expect([...result.keys()]).toEqual([String(u._id)]);
   });
@@ -457,7 +457,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
       user([{ deviceId: m2, deviceType: 'monitor' }]),
     ];
 
-    const result = await resolveSubscribedMonitorIdsByUser([u1, u2], {
+    const result = await resolveMonitorIdsByUser([u1, u2], {
       resolveVisibleSiteMonitors: resolve,
     });
 
@@ -475,7 +475,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
       [siteB]: [oid()],
     });
 
-    await resolveSubscribedMonitorIdsByUser(
+    await resolveMonitorIdsByUser(
       [
         user([{ deviceId: siteA, deviceType: 'linked-device' }]),
         user([{ deviceId: siteA, deviceType: 'linked-device' }]),
@@ -499,7 +499,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
       user([{ deviceId: siteB, deviceType: 'linked-device' }]),
     ];
 
-    const result = await resolveSubscribedMonitorIdsByUser([ua, ub], {
+    const result = await resolveMonitorIdsByUser([ua, ub], {
       resolveVisibleSiteMonitors: resolve,
     });
 
@@ -516,7 +516,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
       { deviceId: siteId, deviceType: 'linked-device' },
     ]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u], {
+    const result = await resolveMonitorIdsByUser([u], {
       resolveVisibleSiteMonitors: resolve,
     });
 
@@ -526,7 +526,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
   test('a sample-site follower resolves to no monitors', async () => {
     const u = user([{ deviceId: oid(), deviceType: 'sample-site' }]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u]);
+    const result = await resolveMonitorIdsByUser([u]);
 
     expect(result.get(String(u._id))).toEqual([]);
   });
@@ -538,7 +538,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
     const { resolve } = recordingSiteMap({});
     const u = user([{ deviceId: deletedSite, deviceType: 'linked-device' }]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u], {
+    const result = await resolveMonitorIdsByUser([u], {
       resolveVisibleSiteMonitors: resolve,
     });
 
@@ -553,7 +553,7 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
     const monitorId = oid();
     const u = user([{ deviceId: siteId, deviceType: 'linked-device' }]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u], {
+    const result = await resolveMonitorIdsByUser([u], {
       resolveVisibleSiteMonitors: async () => new Map([[siteId, [monitorId]]]),
     });
 
@@ -563,21 +563,21 @@ describe('resolveSubscribedMonitorIdsByUser', () => {
   test('tolerates a user with no subscribedDevices key at all', async () => {
     const u = { _id: oid() };
 
-    const result = await resolveSubscribedMonitorIdsByUser([u]);
+    const result = await resolveMonitorIdsByUser([u]);
 
     expect(result.get(String(u._id))).toEqual([]);
   });
 
   test('an empty or nullish cohort resolves to an empty Map', async () => {
-    expect(await resolveSubscribedMonitorIdsByUser([])).toEqual(new Map());
-    expect(await resolveSubscribedMonitorIdsByUser(undefined)).toEqual(new Map());
+    expect(await resolveMonitorIdsByUser([])).toEqual(new Map());
+    expect(await resolveMonitorIdsByUser(undefined)).toEqual(new Map());
   });
 });
 
-describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fail silently', () => {
+describe('resolveMonitorIdsByUser — rejects what would otherwise fail silently', () => {
   test('throws MISSING_COHORT_SITE_RESOLVER when anyone follows a linked-device', async () => {
     await expect(
-      resolveSubscribedMonitorIdsByUser([
+      resolveMonitorIdsByUser([
         user([{ deviceId: oid(), deviceType: 'linked-device' }]),
       ]),
     ).rejects.toMatchObject({
@@ -589,7 +589,7 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
     const monitorId = oid();
     const u = user([{ deviceId: monitorId, deviceType: 'monitor' }]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u]);
+    const result = await resolveMonitorIdsByUser([u]);
 
     expect(result.get(String(u._id))).toEqual([monitorId]);
   });
@@ -599,7 +599,7 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
     const siteId = oid();
 
     await expect(
-      resolveSubscribedMonitorIdsByUser(
+      resolveMonitorIdsByUser(
         [user([{ deviceId: siteId, deviceType: 'linked-device' }])],
         { resolveVisibleSiteMonitors: async () => [[String(siteId), [oid()]]] },
       ),
@@ -611,7 +611,7 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
   test('a nullish resolver return is an empty audience, not a throw', async () => {
     const u = user([{ deviceId: oid(), deviceType: 'linked-device' }]);
 
-    const result = await resolveSubscribedMonitorIdsByUser([u], {
+    const result = await resolveMonitorIdsByUser([u], {
       resolveVisibleSiteMonitors: async () => null,
     });
 
@@ -625,7 +625,7 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
     const siteId = oid();
 
     await expect(
-      resolveSubscribedMonitorIdsByUser(
+      resolveMonitorIdsByUser(
         [user([{ deviceId: siteId, deviceType: 'linked-device' }])],
         {
           resolveVisibleSiteMonitors: async () =>
@@ -641,23 +641,7 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
     // Skipping would remove a real person from an alert audience with no error
     // anywhere — the exact failure mode this module exists to prevent.
     await expect(
-      resolveSubscribedMonitorIdsByUser([{ subscribedDevices: [] }]),
-    ).rejects.toMatchObject({
-      code: SUBSCRIBED_DEVICES_ERRORS.COHORT_USER_MISSING_ID,
-    });
-  });
-
-  test.each([
-    ['a null slot', null],
-    ['an undefined slot', undefined],
-    ['a bare id string', 'deadbeefdeadbeefdeadbeef'],
-    ['an array', []],
-  ])('throws COHORT_USER_MISSING_ID for %s in the cohort', async (_label, entry) => {
-    // A non-object entry used to be filtered out and then simply never appear
-    // in the returned Map — the same silent removal the missing-_id case above
-    // rejects, and indistinguishable to the caller from "follows nothing".
-    await expect(
-      resolveSubscribedMonitorIdsByUser([user([]), entry]),
+      resolveMonitorIdsByUser([{ subscribedDevices: [] }]),
     ).rejects.toMatchObject({
       code: SUBSCRIBED_DEVICES_ERRORS.COHORT_USER_MISSING_ID,
     });
@@ -665,35 +649,17 @@ describe('resolveSubscribedMonitorIdsByUser — rejects what would otherwise fai
 });
 
 describe('VISIBLE_SITE_MONITOR_FILTER', () => {
-  test('privacy uses $ne, eligibility uses an exact match — deliberately', () => {
-    // The asymmetry is the point, and this test exists to stop it being
-    // "fixed". isPrivate is a privacy gate: $ne keeps a monitor that was never
-    // marked private, which its followers are entitled to see. isActive is an
-    // eligibility gate: a monitor earns a place in an alert audience only by
-    // positively asserting it is active, so a document that has made no such
-    // assertion stays out. Confirmed product decision — flipping either half
-    // is a behaviour change, not a cleanup.
+  test('excludes private monitors with $ne: true, not an exact false match', () => {
+    // $ne matches both `false` and a MISSING key. Documents written before
+    // isPrivate existed carry no key, and an exact { isPrivate: false } match
+    // would drop them from every Site's audience.
     expect(VISIBLE_SITE_MONITOR_FILTER).toEqual({
       isPrivate: { $ne: true },
       isActive: true,
     });
   });
 
-  test('is frozen all the way down — one consumer must not change it for the rest', () => {
-    // Object.freeze is shallow, so the top-level assertion alone would pass
-    // while `FILTER.isPrivate.$ne = false` still silently flipped the privacy
-    // predicate for every consumer that spreads this instance.
+  test('is frozen — one consumer mutating it must not change it for the rest', () => {
     expect(Object.isFrozen(VISIBLE_SITE_MONITOR_FILTER)).toBe(true);
-    expect(Object.isFrozen(VISIBLE_SITE_MONITOR_FILTER.isPrivate)).toBe(true);
-  });
-
-  test('a nested write is rejected rather than shared with every consumer', () => {
-    // ES modules are strict, so a write to a frozen property throws rather
-    // than failing silently.
-    expect(() => {
-      VISIBLE_SITE_MONITOR_FILTER.isPrivate.$ne = false;
-    }).toThrow(TypeError);
-
-    expect(VISIBLE_SITE_MONITOR_FILTER.isPrivate.$ne).toBe(true);
   });
 });

package/src/utils/tests/subscribedDevicesBarrel.test.js

@@ -9,7 +9,7 @@
 // deliberate contract change, not a test fix.
 import {
   projectSubscribedMonitors,
-  resolveSubscribedMonitorIdsByUser,
+  resolveMonitorIdsByUser,
   VISIBLE_SITE_MONITOR_FILTER,
   SUBSCRIBED_DEVICES_ERRORS,
 } from '../subscribedDevices.js';
@@ -17,14 +17,13 @@ import {
   DEVICE_TYPES,
   DEVICE_TYPE_VALUES,
   isAqiCapableDeviceType,
-  AQI_CAPABLE_DEVICE_TYPES,
 } from '../../constants/deviceTypes.js';
 
 test('barrel re-exports the subscribedDevices surface unchanged (identity, not copies)', async () => {
   const barrel = await import('../../index.js');
 
   expect(barrel.projectSubscribedMonitors).toBe(projectSubscribedMonitors);
-  expect(barrel.resolveSubscribedMonitorIdsByUser).toBe(resolveSubscribedMonitorIdsByUser);
+  expect(barrel.resolveMonitorIdsByUser).toBe(resolveMonitorIdsByUser);
   expect(barrel.VISIBLE_SITE_MONITOR_FILTER).toBe(VISIBLE_SITE_MONITOR_FILTER);
   expect(barrel.SUBSCRIBED_DEVICES_ERRORS).toBe(SUBSCRIBED_DEVICES_ERRORS);
 });
@@ -40,5 +39,4 @@ test('barrel re-exports the device-type vocabulary unchanged (identity, not copi
   expect(barrel.DEVICE_TYPES).toBe(DEVICE_TYPES);
   expect(barrel.DEVICE_TYPE_VALUES).toBe(DEVICE_TYPE_VALUES);
   expect(barrel.isAqiCapableDeviceType).toBe(isAqiCapableDeviceType);
-  expect(barrel.AQI_CAPABLE_DEVICE_TYPES).toBe(AQI_CAPABLE_DEVICE_TYPES);
 });