@justair/justair-library 4.5.3 → 4.6.2

package/src/models/measurements.js

@@ -1,240 +1,246 @@
-import mongoose from "mongoose";
-
-const correctionSnapshotSchema = new mongoose.Schema(
-  {
-    equationType: String,
-    dateCreated: Date,
-  },
-  { _id: false } // Not generating separate _id for each correction
-);
-
-// Annotation Schema
-const annotationSchema = new mongoose.Schema(
-  {
-    measurementIdentifier: {
-      type: String,
-      required: true,
-      trim: true,
-      // Examples: "PM2_5", "PM10", "NO2", "O3", etc.
-    },
-    comment: {
-      type: String,
-      required: true,
-      trim: true,
-    },
-    adminId: {
-      type: mongoose.Types.ObjectId,
-      ref: "Admin",
-      required: true,
-    },
-    timestamp: {
-      type: Date,
-      default: Date.now,
-      required: true,
-    },
-  },
-  {
-    _id: true,
-    timestamps: false,
-  }
-);
-
-// Add index for efficient querying
-annotationSchema.index({ measurementIdentifier: 1, timestamp: -1 });
-
-// Audit Schema
-const auditSchema = mongoose.Schema(
-  {
-    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
-    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    timeUpdated: Date,
-    deletedAt: { type: Date, default: Date.now },
-    measurements: Object,
-    monitorState: String,
-    monitorSupplier: String,
-    normalizedMeasurements: Object,
-    flags: Object,
-    appliedCorrections: {
-      type: Map,
-      of: correctionSnapshotSchema,
-      default: {},
-    },
-    correctedNormalizedMeasurements: Object,
-    annotations: [annotationSchema], // Include annotations in audit trail
-  },
-  {
-    timestamps: true,
-  }
-);
-
-const Audit = mongoose.model("Audit", auditSchema);
-
-// Measurements Schema
-const measurementsSchema = mongoose.Schema(
-  {
-    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
-    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    timeUpdated: Date,
-    measurements: Object,
-    monitorState: String,
-    monitorSupplier: String,
-    normalizedMeasurements: Object,
-    flags: Object,
-    appliedCorrections: {
-      type: Map,
-      of: correctionSnapshotSchema,
-      default: {},
-    },
-    correctedNormalizedMeasurements: Object,
-    annotations: {
-      type: [annotationSchema],
-      default: [],
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-measurementsSchema.index({ monitorId: 1 });
-measurementsSchema.index({ timeUpdated: 1 });
-
-measurementsSchema.index({
-  "annotations.measurementIdentifier": 1,
-  "annotations.timestamp": -1,
-});
-measurementsSchema.index({ "annotations.userId": 1 });
-
-// Pre-hook to log single document deletions
-measurementsSchema.pre("findOneAndDelete", async function () {
-  const docToDelete = await this.model.findOne(this.getFilter());
-  if (docToDelete) {
-    console.log("Logging findOneAndDelete to audit", docToDelete);
-    const auditLog = new Audit({
-      monitorId: docToDelete.monitorId,
-      orgId: docToDelete.orgId,
-      timeUpdated: docToDelete.timeUpdated,
-      measurements: docToDelete.measurements,
-      monitorState: docToDelete.monitorState,
-      monitorSupplier: docToDelete.monitorSupplier,
-      normalizedMeasurements: docToDelete.normalizedMeasurements,
-      flags: docToDelete.flags,
-      appliedCorrections: docToDelete.appliedCorrections,
-      correctedNormalizedMeasurements:
-        docToDelete.correctedNormalizedMeasurements,
-      annotations: docToDelete.annotations, // Include annotations in audit
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log multiple document deletions
-measurementsSchema.pre("deleteMany", async function () {
-  console.log("deleteMany pre-hook triggered");
-  const docsToDelete = await this.model.find(this.getFilter()).lean();
-
-  if (docsToDelete.length) {
-    console.log(`Logging ${docsToDelete.length} documents to audit`);
-    const auditLogs = docsToDelete.map((doc) => ({
-      monitorId: doc.monitorId,
-      orgId: doc.orgId,
-      timeUpdated: doc.timeUpdated,
-      measurements: doc.measurements,
-      monitorState: doc.monitorState,
-      monitorSupplier: doc.monitorSupplier,
-      normalizedMeasurements: doc.normalizedMeasurements,
-      flags: doc.flags,
-      appliedCorrections: doc.appliedCorrections,
-      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
-      annotations: doc.annotations, // Include annotations in audit
-      deletedAt: new Date(),
-    }));
-
-    await Audit.insertMany(auditLogs);
-  }
-});
-
-// Pre-hook to log a single document deletion (for deleteOne)
-measurementsSchema.pre("deleteOne", async function () {
-  console.log("deleteOne pre-hook triggered");
-  const docToDelete = await this.model.findOne(this.getFilter()).lean();
-
-  if (docToDelete) {
-    console.log("Logging deleteOne to audit", docToDelete);
-    const auditLog = new Audit({
-      monitorId: docToDelete.monitorId,
-      orgId: docToDelete.orgId,
-      timeUpdated: docToDelete.timeUpdated,
-      measurements: docToDelete.measurements,
-      monitorState: docToDelete.monitorState,
-      monitorSupplier: docToDelete.monitorSupplier,
-      normalizedMeasurements: docToDelete.normalizedMeasurements,
-      flags: docToDelete.flags,
-      appliedCorrections: docToDelete.appliedCorrections,
-      correctedNormalizedMeasurements:
-        docToDelete.correctedNormalizedMeasurements,
-      annotations: docToDelete.annotations, // Include annotations in audit
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log single document updates
-measurementsSchema.pre("findOneAndUpdate", async function () {
-  const docToUpdate = await this.model.findOne(this.getFilter()).lean();
-  if (docToUpdate) {
-    console.log("Logging findOneAndUpdate to audit", docToUpdate);
-    const auditLog = new Audit({
-      monitorId: docToUpdate.monitorId,
-      orgId: docToUpdate.orgId,
-      timeUpdated: docToUpdate.timeUpdated,
-      measurements: docToUpdate.measurements,
-      monitorState: docToUpdate.monitorState,
-      monitorSupplier: docToUpdate.monitorSupplier,
-      normalizedMeasurements: docToUpdate.normalizedMeasurements,
-      flags: docToUpdate.flags,
-      appliedCorrections: docToUpdate.appliedCorrections,
-      correctedNormalizedMeasurements:
-        docToUpdate.correctedNormalizedMeasurements,
-      annotations: docToUpdate.annotations, // Include annotations in audit
-      deletedAt: null, // No deletion happening, so set it to null or undefined
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log multiple document updates
-measurementsSchema.pre("updateMany", async function () {
-  const docsToUpdate = await this.model.find(this.getFilter()).lean();
-  if (docsToUpdate.length) {
-    console.log(`Logging ${docsToUpdate.length} documents to audit`);
-    const auditLogs = docsToUpdate.map((doc) => ({
-      monitorId: doc.monitorId,
-      orgId: doc.orgId,
-      timeUpdated: doc.timeUpdated,
-      measurements: doc.measurements,
-      monitorState: doc.monitorState,
-      monitorSupplier: doc.monitorSupplier,
-      normalizedMeasurements: doc.normalizedMeasurements,
-      flags: doc.flags,
-      appliedCorrections: doc.appliedCorrections,
-      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
-      annotations: doc.annotations, // Include annotations in audit
-      deletedAt: null, // No deletion happening
-    }));
-
-    await Audit.insertMany(auditLogs);
-  }
-});
-
-const Measurements = mongoose.model("Measurements", measurementsSchema);
-
-export {
-  measurementsSchema,
-  Measurements,
-  Audit,
-  auditSchema,
-  annotationSchema,
-};
+import mongoose from "mongoose";
+
+const correctionSnapshotSchema = new mongoose.Schema(
+  {
+    equationType: String,
+    dateCreated: Date,
+  },
+  { _id: false } // Not generating separate _id for each correction
+);
+
+// Annotation Schema
+const annotationSchema = new mongoose.Schema(
+  {
+    measurementIdentifier: {
+      type: String,
+      required: true,
+      trim: true,
+      // Examples: "PM2_5", "PM10", "NO2", "O3", etc.
+    },
+    comment: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    adminId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Admin",
+      required: true,
+    },
+    timestamp: {
+      type: Date,
+      default: Date.now,
+      required: true,
+    },
+  },
+  {
+    _id: true,
+    timestamps: false,
+  }
+);
+
+// Add index for efficient querying
+annotationSchema.index({ measurementIdentifier: 1, timestamp: -1 });
+
+// Audit Schema
+const auditSchema = mongoose.Schema(
+  {
+    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    timeUpdated: Date,
+    deletedAt: { type: Date, default: Date.now },
+    measurements: Object,
+    monitorState: String,
+    monitorSupplier: String,
+    normalizedMeasurements: Object,
+    flags: Object,
+    appliedCorrections: {
+      type: Map,
+      of: correctionSnapshotSchema,
+      default: {},
+    },
+    correctedNormalizedMeasurements: Object,
+    annotations: [annotationSchema], // Include annotations in audit trail
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const Audit = mongoose.model("Audit", auditSchema);
+
+// Measurements Schema
+const measurementsSchema = mongoose.Schema(
+  {
+    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    timeUpdated: Date,
+    measurements: Object,
+    monitorState: String,
+    monitorSupplier: String,
+    normalizedMeasurements: Object,
+    flags: Object,
+    appliedCorrections: {
+      type: Map,
+      of: correctionSnapshotSchema,
+      default: {},
+    },
+    correctedNormalizedMeasurements: Object,
+    annotations: {
+      type: [annotationSchema],
+      default: [],
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// CRITICAL: Add compound index for monitorId + timeUpdated
+// This significantly improves performance for date range queries on specific monitors
+measurementsSchema.index({ monitorId: 1, timeUpdated: -1 });
+
+// Keep the individual indexes as they may still be useful for other queries
+measurementsSchema.index({ monitorId: 1 });
+measurementsSchema.index({ timeUpdated: 1 });
+
+// Annotation-related indexes
+measurementsSchema.index({
+  "annotations.measurementIdentifier": 1,
+  "annotations.timestamp": -1,
+});
+measurementsSchema.index({ "annotations.userId": 1 });
+
+// Pre-hook to log single document deletions
+measurementsSchema.pre("findOneAndDelete", async function () {
+  const docToDelete = await this.model.findOne(this.getFilter());
+  if (docToDelete) {
+    console.log("Logging findOneAndDelete to audit", docToDelete);
+    const auditLog = new Audit({
+      monitorId: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      monitorSupplier: docToDelete.monitorSupplier,
+      normalizedMeasurements: docToDelete.normalizedMeasurements,
+      flags: docToDelete.flags,
+      appliedCorrections: docToDelete.appliedCorrections,
+      correctedNormalizedMeasurements:
+        docToDelete.correctedNormalizedMeasurements,
+      annotations: docToDelete.annotations, // Include annotations in audit
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log multiple document deletions
+measurementsSchema.pre("deleteMany", async function () {
+  console.log("deleteMany pre-hook triggered");
+  const docsToDelete = await this.model.find(this.getFilter()).lean();
+
+  if (docsToDelete.length) {
+    console.log(`Logging ${docsToDelete.length} documents to audit`);
+    const auditLogs = docsToDelete.map((doc) => ({
+      monitorId: doc.monitorId,
+      orgId: doc.orgId,
+      timeUpdated: doc.timeUpdated,
+      measurements: doc.measurements,
+      monitorState: doc.monitorState,
+      monitorSupplier: doc.monitorSupplier,
+      normalizedMeasurements: doc.normalizedMeasurements,
+      flags: doc.flags,
+      appliedCorrections: doc.appliedCorrections,
+      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
+      annotations: doc.annotations, // Include annotations in audit
+      deletedAt: new Date(),
+    }));
+
+    await Audit.insertMany(auditLogs);
+  }
+});
+
+// Pre-hook to log a single document deletion (for deleteOne)
+measurementsSchema.pre("deleteOne", async function () {
+  console.log("deleteOne pre-hook triggered");
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
+
+  if (docToDelete) {
+    console.log("Logging deleteOne to audit", docToDelete);
+    const auditLog = new Audit({
+      monitorId: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      monitorSupplier: docToDelete.monitorSupplier,
+      normalizedMeasurements: docToDelete.normalizedMeasurements,
+      flags: docToDelete.flags,
+      appliedCorrections: docToDelete.appliedCorrections,
+      correctedNormalizedMeasurements:
+        docToDelete.correctedNormalizedMeasurements,
+      annotations: docToDelete.annotations, // Include annotations in audit
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log single document updates
+measurementsSchema.pre("findOneAndUpdate", async function () {
+  const docToUpdate = await this.model.findOne(this.getFilter()).lean();
+  if (docToUpdate) {
+    console.log("Logging findOneAndUpdate to audit", docToUpdate);
+    const auditLog = new Audit({
+      monitorId: docToUpdate.monitorId,
+      orgId: docToUpdate.orgId,
+      timeUpdated: docToUpdate.timeUpdated,
+      measurements: docToUpdate.measurements,
+      monitorState: docToUpdate.monitorState,
+      monitorSupplier: docToUpdate.monitorSupplier,
+      normalizedMeasurements: docToUpdate.normalizedMeasurements,
+      flags: docToUpdate.flags,
+      appliedCorrections: docToUpdate.appliedCorrections,
+      correctedNormalizedMeasurements:
+        docToUpdate.correctedNormalizedMeasurements,
+      annotations: docToUpdate.annotations, // Include annotations in audit
+      deletedAt: null, // No deletion happening, so set it to null or undefined
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log multiple document updates
+measurementsSchema.pre("updateMany", async function () {
+  const docsToUpdate = await this.model.find(this.getFilter()).lean();
+  if (docsToUpdate.length) {
+    console.log(`Logging ${docsToUpdate.length} documents to audit`);
+    const auditLogs = docsToUpdate.map((doc) => ({
+      monitorId: doc.monitorId,
+      orgId: doc.orgId,
+      timeUpdated: doc.timeUpdated,
+      measurements: doc.measurements,
+      monitorState: doc.monitorState,
+      monitorSupplier: doc.monitorSupplier,
+      normalizedMeasurements: doc.normalizedMeasurements,
+      flags: doc.flags,
+      appliedCorrections: doc.appliedCorrections,
+      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
+      annotations: doc.annotations, // Include annotations in audit
+      deletedAt: null, // No deletion happening
+    }));
+
+    await Audit.insertMany(auditLogs);
+  }
+});
+
+const Measurements = mongoose.model("Measurements", measurementsSchema);
+
+export {
+  measurementsSchema,
+  Measurements,
+  Audit,
+  auditSchema,
+  annotationSchema,
+};

package/src/models/monitorRequests.js

@@ -1,25 +1,25 @@
-import mongoose from "mongoose";
-
-const monitorRequestsSchema = mongoose.Schema(
-  {
-    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    monitorOwnerOrgName: String,
-    monitorReceiverOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    monitorReceiverOrgName: String,
-    monitorList: [{ type: mongoose.Types.ObjectId, ref: "Monitors" }],
-    status: {
-      type: String,
-      enum: ["Requested", "Approved", "Denied", "Cancel", "Deleted"],
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-const MonitorRequests = mongoose.model(
-  "MonitorRequests",
-  monitorRequestsSchema
-);
-
-export { monitorRequestsSchema, MonitorRequests };
+import mongoose from "mongoose";
+
+const monitorRequestsSchema = mongoose.Schema(
+  {
+    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    monitorOwnerOrgName: String,
+    monitorReceiverOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    monitorReceiverOrgName: String,
+    monitorList: [{ type: mongoose.Types.ObjectId, ref: "Monitors" }],
+    status: {
+      type: String,
+      enum: ["Requested", "Approved", "Denied", "Cancel", "Deleted"],
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const MonitorRequests = mongoose.model(
+  "MonitorRequests",
+  monitorRequestsSchema
+);
+
+export { monitorRequestsSchema, MonitorRequests };

package/src/models/monitorSuppliers.js

@@ -1,21 +1,21 @@
-import mongoose from "mongoose";
-
-const monitorSuppliersSchema = mongoose.Schema(
-  {
-    name: String,
-    supplierTypes: [String],
-    authenticationStructure: [String],
-    defaultParameterThresholds: Object,
-    defaultCompletenessThresholdCount: Number,
-  },
-  {
-    timestamps: true,
-  }
-);
-
-const MonitorSuppliers = mongoose.model(
-  "MonitorSuppliers",
-  monitorSuppliersSchema
-);
-
-export { monitorSuppliersSchema, MonitorSuppliers };
+import mongoose from "mongoose";
+
+const monitorSuppliersSchema = mongoose.Schema(
+  {
+    name: String,
+    supplierTypes: [String],
+    authenticationStructure: [String],
+    defaultParameterThresholds: Object,
+    defaultCompletenessThresholdCount: Number,
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const MonitorSuppliers = mongoose.model(
+  "MonitorSuppliers",
+  monitorSuppliersSchema
+);
+
+export { monitorSuppliersSchema, MonitorSuppliers };