@justair/justair-library 7.2.0 → 7.3.0-alpha.002ee84

package/dist/constants/deviceTypes.d.ts

@@ -0,0 +1,8 @@
+export namespace DEVICE_TYPES {
+    let MONITOR: string;
+    let SAMPLE_SITE: string;
+    let LINKED_DEVICE: string;
+}
+export const DEVICE_TYPE_VALUES: string[];
+export function isAqiCapableDeviceType(deviceType: any): boolean;
+//# sourceMappingURL=deviceTypes.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deviceTypes.d.ts","sourceRoot":"","sources":["../../src/constants/deviceTypes.js"],"names":[],"mappings":";;;;;AA2BA,0CAA8D;AASvD,iEAEoC"}

package/dist/constants/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./pollutants.js";
 export * from "./alertLevels.js";
 export * from "./userNotifications.js";
+export * from "./deviceTypes.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/constants/tests/deviceTypes.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=deviceTypes.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deviceTypes.test.d.ts","sourceRoot":"","sources":["../../../src/constants/tests/deviceTypes.test.js"],"names":[],"mappings":""}

package/dist/index.d.ts

@@ -90,6 +90,9 @@ import { PARAMETERS } from "./constants/pollutants.js";
 import { HEAVY_METALS } from "./constants/pollutants.js";
 import { ALERT_LEVEL_WEIGHTS } from "./constants/alertLevels.js";
 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 { splitName } from "./utils/splitName.js";
 import { DEFAULT_QUIET_HOURS } from "./utils/quietHours.js";
 import { DEFAULT_TIMEZONE } from "./utils/quietHours.js";
@@ -100,5 +103,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, PARAMETERS, HEAVY_METALS, ALERT_LEVEL_WEIGHTS, getAlertWeight, 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, PARAMETERS, HEAVY_METALS, ALERT_LEVEL_WEIGHTS, getAlertWeight, DEVICE_TYPES, DEVICE_TYPE_VALUES, isAqiCapableDeviceType, 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":"AAuHA;;;iBAEC;yBAvDwB,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;4BAkCT,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;sCA7CtF,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;2BAhBG,2BAA2B;6BAA3B,2BAA2B;oCAChB,4BAA4B;+BAA5B,4BAA4B;0BAgBtD,sBAAsB;oCAWzC,uBAAuB;iCAAvB,uBAAuB;mCAAvB,uBAAuB;kCAAvB,uBAAuB;oCAAvB,uBAAuB;mCAAvB,uBAAuB;+BAAvB,uBAAuB;gCAAvB,uBAAuB;kCAAvB,uBAAuB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA4HA;;;iBAEC;yBA5DwB,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;4BAuCT,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;sCA7CtF,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;2BArBG,2BAA2B;6BAA3B,2BAA2B;oCAChB,4BAA4B;+BAA5B,4BAA4B;6BAKzE,4BAA4B;mCAA5B,4BAA4B;uCAA5B,4BAA4B;0BAgBT,sBAAsB;oCAWzC,uBAAuB;iCAAvB,uBAAuB;mCAAvB,uBAAuB;kCAAvB,uBAAuB;oCAAvB,uBAAuB;mCAAvB,uBAAuB;+BAAvB,uBAAuB;gCAAvB,uBAAuB;kCAAvB,uBAAuB"}

package/dist/models/monitorEpisodes.d.ts

@@ -1,8 +1,8 @@
 export const monitorEpisodesSchema: mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -10,8 +10,8 @@ export const monitorEpisodesSchema: mongoose.Schema<any, mongoose.Model<any, any
     endedAt?: NativeDate;
     peakStatus?: string;
 } & mongoose.DefaultTimestampProps, mongoose.Document<unknown, {}, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -23,8 +23,8 @@ export const monitorEpisodesSchema: mongoose.Schema<any, mongoose.Model<any, any
 }, Omit<mongoose.DefaultSchemaOptions, "timestamps"> & {
     timestamps: true;
 }> & Omit<{
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -38,8 +38,8 @@ export const monitorEpisodesSchema: mongoose.Schema<any, mongoose.Model<any, any
 }, "id"> & mongoose.HydratedDocumentOverrides<{
     id: string;
 }>, unknown, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -54,8 +54,8 @@ export const monitorEpisodesSchema: mongoose.Schema<any, mongoose.Model<any, any
     __v: number;
 }>;
 export const MonitorEpisode: mongoose.Model<{
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -65,8 +65,8 @@ export const MonitorEpisode: mongoose.Model<{
 } & mongoose.DefaultTimestampProps, {}, {}, {
     id: string;
 }, mongoose.Document<unknown, {}, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -78,8 +78,8 @@ export const MonitorEpisode: mongoose.Model<{
 }, {
     timestamps: true;
 }> & Omit<{
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -95,8 +95,8 @@ export const MonitorEpisode: mongoose.Model<{
 }>, mongoose.Schema<any, mongoose.Model<any, any, any, any, any, any, any>, {}, {}, {}, {}, {
     timestamps: true;
 }, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -104,8 +104,8 @@ export const MonitorEpisode: mongoose.Model<{
     endedAt?: NativeDate;
     peakStatus?: string;
 } & mongoose.DefaultTimestampProps, mongoose.Document<unknown, {}, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -117,8 +117,8 @@ export const MonitorEpisode: mongoose.Model<{
 }, Omit<mongoose.DefaultSchemaOptions, "timestamps"> & {
     timestamps: true;
 }> & Omit<{
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -132,8 +132,8 @@ export const MonitorEpisode: mongoose.Model<{
 }, "id"> & mongoose.HydratedDocumentOverrides<{
     id: string;
 }>, unknown, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;
@@ -147,8 +147,8 @@ export const MonitorEpisode: mongoose.Model<{
 } & {
     __v: number;
 }>, {
-    user: mongoose.Types.ObjectId;
     monitor: mongoose.Types.ObjectId;
+    user: mongoose.Types.ObjectId;
     open: boolean;
     startedAt: NativeDate;
     alertCount: number;

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

@@ -1 +1 @@
-{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/models/users.js"],"names":[],"mappings":"AA2CA,8BAiFE;AA8BF,wBAAmD;AAlJnD,iDAA4D;AAC5D,6CAAmD;AAUnD,4DAsBC"}
+{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/models/users.js"],"names":[],"mappings":"AA6DA,8BAiGE;AAiCF,wBAAmD;AAtLnD,iDAA4D;AAC5D,6CAAmD;AAUnD,4DAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "7.2.0",
+  "version": "7.3.0-alpha.002ee84",
   "description": "JustAir Internal Library",
   "main": "src/index.js",
   "type": "module",

package/src/constants/deviceTypes.js

@@ -0,0 +1,39 @@
+// V2 device-type vocabulary — single source of truth (JA-3110 / JA-3335).
+//
+// Every device a user can see or subscribe to is exactly one of three things,
+// each backed by a different collection:
+//   monitor       — a standalone Monitors doc (siteId: null). Reports live AQI.
+//   sample-site   — a standalone SampleSites doc (siteId: null). Lab/filter
+//                   sample data only, no live AQI, so it can never trigger an
+//                   AQI alert.
+//   linked-device — a Sites doc joining one or more Monitors and/or one
+//                   SampleSite at a single physical location. Reports live AQI
+//                   when it links at least one monitor.
+//
+// Consumers: JustAirService fetchDevices/getDeviceById stamp these strings onto
+// every device response; JustAirUserService validates the subscribe body
+// against them and persists them in Users.subscribedDevices; JustAir-Client
+// passes back verbatim the value it received. Keep the string values
+// byte-identical to what the devices API emits — the FE does no mapping, and a
+// casing drift here is a silent 404 on subscribe.
+//
+// DO NOT rename these values: they are persisted in Users.subscribedDevices.
+
+export const DEVICE_TYPES = {
+  MONITOR: "monitor",
+  SAMPLE_SITE: "sample-site",
+  LINKED_DEVICE: "linked-device",
+};
+
+export const DEVICE_TYPE_VALUES = Object.values(DEVICE_TYPES);
+
+// Whether a device of this type can ever report AQI, and therefore whether a
+// subscription to it can contribute to AQI alert delivery.
+//
+// Note the asymmetry: `sample-site` is unconditionally false, but a true result
+// for `linked-device` is necessary and NOT sufficient — a Site is only actually
+// AQI-capable when it links at least one monitor, which the type alone cannot
+// tell you. Callers must still check the Site's monitorIds.
+export const isAqiCapableDeviceType = (deviceType) =>
+  deviceType === DEVICE_TYPES.MONITOR ||
+  deviceType === DEVICE_TYPES.LINKED_DEVICE;

package/src/constants/index.js

@@ -10,3 +10,4 @@
 export * from "./pollutants.js";
 export * from "./alertLevels.js";
 export * from "./userNotifications.js";
+export * from "./deviceTypes.js";

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

@@ -0,0 +1,48 @@
+// Pins the device-type vocabulary shared across JustAirService (which stamps
+// deviceType onto every device response), JustAirUserService (which validates
+// the subscribe body and persists it), and JustAir-Client (which passes it
+// back verbatim). A casing drift in any value is a silent subscribe failure,
+// so the exact strings are asserted rather than derived.
+import * as barrel from '../index.js';
+import {
+  DEVICE_TYPES,
+  DEVICE_TYPE_VALUES,
+  isAqiCapableDeviceType,
+} 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);
+});
+
+test('DEVICE_TYPES values match the strings the devices API emits', () => {
+  expect(DEVICE_TYPES).toEqual({
+    MONITOR: 'monitor',
+    SAMPLE_SITE: 'sample-site',
+    LINKED_DEVICE: 'linked-device',
+  });
+});
+
+test('DEVICE_TYPE_VALUES covers every type exactly once', () => {
+  expect(DEVICE_TYPE_VALUES).toEqual(['monitor', 'sample-site', 'linked-device']);
+  expect(new Set(DEVICE_TYPE_VALUES).size).toBe(DEVICE_TYPE_VALUES.length);
+});
+
+describe('isAqiCapableDeviceType', () => {
+  test('monitor and linked-device can report AQI', () => {
+    expect(isAqiCapableDeviceType('monitor')).toBe(true);
+    expect(isAqiCapableDeviceType('linked-device')).toBe(true);
+  });
+
+  test('sample-site never reports AQI, so it never alerts', () => {
+    expect(isAqiCapableDeviceType('sample-site')).toBe(false);
+  });
+
+  test('unknown and missing types are not AQI-capable', () => {
+    expect(isAqiCapableDeviceType('sampleSite')).toBe(false);
+    expect(isAqiCapableDeviceType(undefined)).toBe(false);
+    expect(isAqiCapableDeviceType(null)).toBe(false);
+    expect(isAqiCapableDeviceType('')).toBe(false);
+  });
+});

package/src/index.js

@@ -67,6 +67,11 @@ 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 {
+  DEVICE_TYPES,
+  DEVICE_TYPE_VALUES,
+  isAqiCapableDeviceType,
+} from "./constants/deviceTypes.js";
 import {
   monitorEpisodesSchema,
   MonitorEpisode,
@@ -216,6 +221,10 @@ export {
   // AQI alert-level hierarchy (single source of truth)
   ALERT_LEVEL_WEIGHTS,
   getAlertWeight,
+  // V2 device-type vocabulary (single source of truth) — JA-3110 / JA-3335
+  DEVICE_TYPES,
+  DEVICE_TYPE_VALUES,
+  isAqiCapableDeviceType,
   // Utilities
   splitName,
   // Quiet hours (JA-3054): shared validation + window evaluation

package/src/models/users.js

@@ -5,6 +5,7 @@ import {
   validateQuietHours,
   QUIET_HOURS_ERRORS,
 } from "../utils/quietHours.js";
+import { DEVICE_TYPE_VALUES } from "../constants/deviceTypes.js";
 
 const COOKIE_CONSENT_CATEGORIES = ["analytics_performance"];
 const COOKIE_CONSENT_VALUES = ["accept", "reject"];
@@ -41,6 +42,23 @@ const validateCookieConsent = (consent) => {
   return null;
 };
 
+// One entry in Users.subscribedDevices (JA-3110 / JA-3335). deviceId points
+// into a different collection per deviceType (Monitors / SampleSites / Sites),
+// so there is deliberately no `ref` to declare here.
+//
+// `_id: false` is load-bearing, not cosmetic: it makes the pair itself the
+// identity of an element, so `$addToSet` dedupes and re-subscribing is
+// idempotent. With per-subdocument _ids every push would cast to a brand-new
+// object, `$addToSet` would never match, and the array would accumulate a
+// duplicate on every click of the subscribe button.
+const subscribedDeviceSchema = mongoose.Schema(
+  {
+    deviceId: { type: mongoose.Types.ObjectId, required: true },
+    deviceType: { type: String, enum: DEVICE_TYPE_VALUES, required: true },
+  },
+  { _id: false }
+);
+
 const usersSchema = mongoose.Schema(
   {
     name: String,
@@ -54,6 +72,22 @@ const usersSchema = mongoose.Schema(
     alertPhone: String,
     alertCount: { type: Number, default: 0 },
     subscribedMonitors: [{ type: mongoose.Types.ObjectId, ref: "Monitors" }],
+    // Subscribed devices (JA-3110 / JA-3335) — the source of truth for what the
+    // user has added to "My Monitors", across all three device types.
+    //
+    // Relationship to subscribedMonitors above: that array stays monitor ids
+    // ONLY, and is the AQI-alert projection of this one. A subscribed
+    // linked-device contributes the monitorIds of its Site to it; a subscribed
+    // sample-site contributes nothing, having no live AQI. The two must be
+    // written together on every subscribe/unsubscribe path.
+    //
+    // Why the split matters: JustAirNotificationService reads subscribedMonitors
+    // and drops ids that do not resolve to a Monitor (statusAlerts.js
+    // `.filter(monitor => monitor)`). Writing a Site or SampleSite id in there
+    // therefore throws no error — it silently delivers no alerts. Keeping the
+    // polymorphic ids in their own field preserves that invariant for every
+    // library consumer.
+    subscribedDevices: [subscribedDeviceSchema],
     currentAlertMode: {
       type: String,
       enum: [
@@ -151,6 +185,9 @@ usersSchema.pre("validate", function () {
 });
 
 usersSchema.index({ phone: 1 });
+// Supports the "is this user subscribed to device X?" lookup behind the V2
+// device-card subscribed state and the My Monitors map filter.
+usersSchema.index({ "subscribedDevices.deviceId": 1 });
 
 const Users = mongoose.model("Users", usersSchema);