@justair/justair-library 7.2.0-alpha.a00effb → 7.2.0-alpha.a4979c6

package/dist/index.d.ts

@@ -77,8 +77,6 @@ import { passwordResetTokenSchema } from "./models/passwordResetToken.js";
 import { PasswordResetToken } from "./models/passwordResetToken.js";
 import { monitorEpisodesSchema } from "./models/monitorEpisodes.js";
 import { MonitorEpisode } from "./models/monitorEpisodes.js";
-import { dataDownloadSchema } from "./models/dataDownloads.js";
-import { DataDownloads } from "./models/dataDownloads.js";
 import { userNotificationsSchema } from "./models/userNotifications.js";
 import { UserNotification } from "./models/userNotifications.js";
 import { AqiAlertNotification } from "./models/userNotifications.js";
@@ -88,6 +86,10 @@ import { AccountNotification } from "./models/userNotifications.js";
 import { NOTIFICATION_KINDS } from "./models/userNotifications.js";
 import { NOTIFICATION_CHANNELS } from "./models/userNotifications.js";
 import { DELIVERY_STATUSES } from "./models/userNotifications.js";
+import { dataDownloadSchema } from "./models/dataDownloads.js";
+import { DataDownloads } from "./models/dataDownloads.js";
+import { AqiDataDownload } from "./models/dataDownloads.js";
+import { SampleDataDownload } from "./models/dataDownloads.js";
 import { PARAMETERS } from "./constants/pollutants.js";
 import { HEAVY_METALS } from "./constants/pollutants.js";
 import { ALERT_LEVEL_WEIGHTS } from "./constants/alertLevels.js";
@@ -102,5 +104,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, dataDownloadSchema, DataDownloads, 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, dataDownloadSchema, DataDownloads, AqiDataDownload, SampleDataDownload, PARAMETERS, HEAVY_METALS, ALERT_LEVEL_WEIGHTS, getAlertWeight, 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":"AAwHA;;;iBAEC;yBAxDwB,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;mCA8Cc,2BAA2B;8BAA3B,2BAA2B;wCAnCtE,+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":"AA6HA;;;iBAEC;yBA7DwB,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;mCAwC/B,2BAA2B;8BAA3B,2BAA2B;gCAA3B,2BAA2B;mCAA3B,2BAA2B;2BAxDO,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"}

package/dist/models/dataDownloads.d.ts

@@ -1,3 +1,5 @@
 export const dataDownloadSchema: any;
 export const DataDownloads: any;
+export const AqiDataDownload: any;
+export const SampleDataDownload: any;
 //# sourceMappingURL=dataDownloads.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"dataDownloads.d.ts","sourceRoot":"","sources":["../../src/models/dataDownloads.js"],"names":[],"mappings":"AAEA,qCAwBE;AAEF,gCAA0E"}
+{"version":3,"file":"dataDownloads.d.ts","sourceRoot":"","sources":["../../src/models/dataDownloads.js"],"names":[],"mappings":"AAWA,qCAiBE;AAuBF,gCAA0E;AAE1E,kCASE;AAGF,qCASE"}

package/package.json

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

package/src/index.js

@@ -116,7 +116,12 @@ import {
   sampleParameterReferenceConcentrations,
 } from "./models/samples.js";
 import { passwordResetTokenSchema, PasswordResetToken } from "./models/passwordResetToken.js";
-import { dataDownloadSchema, DataDownloads } from "./models/dataDownloads.js";
+import {
+  dataDownloadSchema,
+  DataDownloads,
+  AqiDataDownload,
+  SampleDataDownload,
+} from "./models/dataDownloads.js";
 
 export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
   return new CustomLogger({ DATADOG_API_KEY, APPLICATION_NAME });
@@ -202,9 +207,6 @@ export {
   // Notification episodes + send log (JA-2658 / JA-2691 stack)
   monitorEpisodesSchema,
   MonitorEpisode,
-  // Data downloads (JA-3080)
-  dataDownloadSchema,
-  DataDownloads,
   userNotificationsSchema,
   UserNotification,
   AqiAlertNotification,
@@ -214,6 +216,11 @@ export {
   NOTIFICATION_KINDS,
   NOTIFICATION_CHANNELS,
   DELIVERY_STATUSES,
+  // Data downloads (JA-3080)
+  dataDownloadSchema,
+  DataDownloads,
+  AqiDataDownload,
+  SampleDataDownload,
   // Pollutant constants
   PARAMETERS,
   HEAVY_METALS,

package/src/models/dataDownloads.js

@@ -1,31 +1,78 @@
 import mongoose from "mongoose";
+import { DEFAULT_TIMEZONE } from "../utils/quietHours.js";
 
+const MAX_RANGE_DAYS = 31;
+
+// DataDownloads — one doc per data download request (JA-3080). Written by
+// JustAirService on download (JA-3081); read by the org-level admin
+// communication screen. AQI downloads are monitor-scoped, Sample downloads
+// are site-scoped (samples.js keys samples to SampleSites, not Monitors) —
+// modeled as discriminators per CLAUDE.md's multi-kind pattern rather than
+// a flat schema with a monitorId/siteId pair that's nullable either way.
 const dataDownloadSchema = mongoose.Schema(
   {
-    monitorId: {
-      type: mongoose.Types.ObjectId,
-      ref: "Monitors",
-      required: [true, "monitorId is required"],
-    },
     orgId: {
       type: mongoose.Types.ObjectId,
       ref: "Organizations",
       required: [true, "orgId is required"],
     },
-    dataType: {
-      type: String,
-      enum: ["AQI", "Sample"],
-      required: [true, "dataType is required"],
-    },
-    startDate: { type: Date, required: [true, "startDate is required"] },
-    endDate: { type: Date, required: [true, "endDate is required"] },
-    email: { type: String, default: null },
+    dateRangeStart: { type: Date, required: [true, "dateRangeStart is required"] },
+    dateRangeEnd: { type: Date, required: [true, "dateRangeEnd is required"] },
+    timezone: { type: String, default: DEFAULT_TIMEZONE },
+    downloadedAt: { type: Date, required: true, default: Date.now },
+    email: { type: String, trim: true, lowercase: true, default: null },
   },
   {
     timestamps: true,
+    discriminatorKey: "dataType",
   }
 );
 
+// Cross-field rule (quiet-hours shape, CLAUDE.md): end must not precede
+// start, and the product rule caps a single download at 31 days of hourly
+// data. Lives in pre('validate') so create()/save() can't persist an
+// invalid range even if a caller forgets to check.
+dataDownloadSchema.pre("validate", async function () {
+  if (this.dateRangeStart && this.dateRangeEnd) {
+    if (this.dateRangeEnd < this.dateRangeStart) {
+      this.invalidate("dateRangeEnd", "dateRangeEnd must not be before dateRangeStart");
+    } else {
+      const rangeMs = this.dateRangeEnd - this.dateRangeStart;
+      const maxRangeMs = MAX_RANGE_DAYS * 24 * 60 * 60 * 1000;
+      if (rangeMs > maxRangeMs) {
+        this.invalidate("dateRangeEnd", `date range cannot exceed ${MAX_RANGE_DAYS} days`);
+      }
+    }
+  }
+});
+
+// Org-level admin screen lists a given org's downloads, most recent first.
+dataDownloadSchema.index({ orgId: 1, createdAt: -1 });
+
 const DataDownloads = mongoose.model("DataDownloads", dataDownloadSchema);
 
-export { dataDownloadSchema, DataDownloads };
+const AqiDataDownload = DataDownloads.discriminator(
+  "AQI",
+  new mongoose.Schema({
+    monitorId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Monitors",
+      required: [true, "monitorId is required"],
+    },
+  })
+);
+AqiDataDownload.schema.index({ monitorId: 1, createdAt: -1 });
+
+const SampleDataDownload = DataDownloads.discriminator(
+  "Sample",
+  new mongoose.Schema({
+    siteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "SampleSites",
+      required: [true, "siteId is required"],
+    },
+  })
+);
+SampleDataDownload.schema.index({ siteId: 1, createdAt: -1 });
+
+export { dataDownloadSchema, DataDownloads, AqiDataDownload, SampleDataDownload };