@justair/justair-library 4.7.16 → 4.7.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "4.7.16",
+  "version": "4.7.18",
   "description": "JustAir Internal Library",
 
   "main": "src/index.js",

package/src/models/dataCompleteness.js

@@ -19,4 +19,24 @@ const DataCompleteness = mongoose.model(
   dataCompletenessSchema
 );
 
+
+dataCompletenessSchema.index({
+  monitorId: 1,
+  parameter: 1,
+  measurementsStartTime: 1
+});
+
+
+dataCompletenessSchema.index({
+  monitorId: 1,
+  measurementsStartTime: 1
+});
+
+
+dataCompletenessSchema.index({
+  monitorId: 1,
+  measurementsStartTime: 1,
+  flags: 1
+});
+
 export { dataCompletenessSchema, DataCompleteness };

package/src/models/measurements.js

@@ -73,6 +73,7 @@ const auditSchema = mongoose.Schema(
     measurements: Object,
     monitorState: String,
     monitorSupplier: String,
+    rawNormalizedMeasurements: Object,
     normalizedMeasurements: Object,
     flags: Object,
     appliedCorrections: {
@@ -80,7 +81,6 @@ const auditSchema = mongoose.Schema(
       of: correctionSnapshotSchema,
       default: {},
     },
-    correctedNormalizedMeasurements: Object,
     annotations: [annotationSchema], // Include annotations in audit trail
   },
   {
@@ -99,6 +99,7 @@ const measurementsSchema = mongoose.Schema(
     measurements: Object,
     monitorState: String,
     monitorSupplier: String,
+    rawNormalizedMeasurements: Object,
     normalizedMeasurements: Object,
     flags: Object,
     appliedCorrections: {
@@ -106,7 +107,6 @@ const measurementsSchema = mongoose.Schema(
       of: correctionSnapshotSchema,
       default: {},
     },
-    correctedNormalizedMeasurements: Object,
     annotations: {
       type: [annotationSchema],
       default: [],
@@ -150,10 +150,9 @@ measurementsSchema.pre("findOneAndDelete", async function () {
       monitorState: docToDelete.monitorState,
       monitorSupplier: docToDelete.monitorSupplier,
       normalizedMeasurements: docToDelete.normalizedMeasurements,
+      rawNormalizedMeasurements: docToDelete.rawNormalizedMeasurements,
       flags: docToDelete.flags,
       appliedCorrections: docToDelete.appliedCorrections,
-      correctedNormalizedMeasurements:
-        docToDelete.correctedNormalizedMeasurements,
       annotations: docToDelete.annotations, // Include annotations in audit
       deletedAt: new Date(),
     });
@@ -176,9 +175,9 @@ measurementsSchema.pre("deleteMany", async function () {
       monitorState: doc.monitorState,
       monitorSupplier: doc.monitorSupplier,
       normalizedMeasurements: doc.normalizedMeasurements,
+      rawNormalizedMeasurements: doc.rawNormalizedMeasurements,
       flags: doc.flags,
       appliedCorrections: doc.appliedCorrections,
-      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
       annotations: doc.annotations, // Include annotations in audit
       deletedAt: new Date(),
     }));
@@ -202,10 +201,9 @@ measurementsSchema.pre("deleteOne", async function () {
       monitorState: docToDelete.monitorState,
       monitorSupplier: docToDelete.monitorSupplier,
       normalizedMeasurements: docToDelete.normalizedMeasurements,
+      rawNormalizedMeasurements: docToDelete.rawNormalizedMeasurements,
       flags: docToDelete.flags,
       appliedCorrections: docToDelete.appliedCorrections,
-      correctedNormalizedMeasurements:
-        docToDelete.correctedNormalizedMeasurements,
       annotations: docToDelete.annotations, // Include annotations in audit
       deletedAt: new Date(),
     });
@@ -226,10 +224,9 @@ measurementsSchema.pre("findOneAndUpdate", async function () {
       monitorState: docToUpdate.monitorState,
       monitorSupplier: docToUpdate.monitorSupplier,
       normalizedMeasurements: docToUpdate.normalizedMeasurements,
+      rawNormalizedMeasurements: docToUpdate.rawNormalizedMeasurements,
       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
     });
@@ -250,9 +247,9 @@ measurementsSchema.pre("updateMany", async function () {
       monitorState: doc.monitorState,
       monitorSupplier: doc.monitorSupplier,
       normalizedMeasurements: doc.normalizedMeasurements,
+      rawNormalizedMeasurements: doc.rawNormalizedMeasurements,
       flags: doc.flags,
       appliedCorrections: doc.appliedCorrections,
-      correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
       annotations: doc.annotations, // Include annotations in audit
       deletedAt: null, // No deletion happening
     }));

package/src/models/networkMetrics.js

@@ -1,18 +1,18 @@
-import mongoose from "mongoose";
-
-const networkMetricsSchema = mongoose.Schema({
-  monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
-  orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-  parameter: String,
-  parameterValue: Number,
-  networkMean: Number, 
-  networkMonitorCount: Number,
-  percentDeviationFromMean: Number,
-  measurementsStartTime: Date,
-  measurementsEndTime: Date,
-  flags: Object
-}, { timestamps: true });
-
-const NetworkMetrics = mongoose.model("NetworkMetrics", networkMetricsSchema);
-
+import mongoose from "mongoose";
+
+const networkMetricsSchema = mongoose.Schema({
+  monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+  orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+  parameter: String,
+  parameterValue: Number,
+  networkMean: Number, 
+  networkMonitorCount: Number,
+  percentDeviationFromMean: Number,
+  measurementsStartTime: Date,
+  measurementsEndTime: Date,
+  flags: Object
+}, { timestamps: true });
+
+const NetworkMetrics = mongoose.model("NetworkMetrics", networkMetricsSchema);
+
 export { networkMetricsSchema, NetworkMetrics };