@justair/justair-library 4.7.14 → 4.7.15-beta

package/package.json

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

package/src/index.js

@@ -53,6 +53,7 @@ import {
   DataCompleteness,
   dataCompletenessSchema,
 } from "./models/dataCompleteness.js";
+import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js";
 import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
@@ -110,4 +111,6 @@ export {
   featuresSchema,
   dataCompletenessSchema,
   DataCompleteness,
+  networkMetricsSchema,
+  NetworkMetrics,
 };

package/src/models/measurements.js

@@ -73,7 +73,6 @@ const auditSchema = mongoose.Schema(
     measurements: Object,
     monitorState: String,
     monitorSupplier: String,
-    rawNormalizedMeasurements: Object,
     normalizedMeasurements: Object,
     flags: Object,
     appliedCorrections: {
@@ -81,6 +80,7 @@ const auditSchema = mongoose.Schema(
       of: correctionSnapshotSchema,
       default: {},
     },
+    correctedNormalizedMeasurements: Object,
     annotations: [annotationSchema], // Include annotations in audit trail
   },
   {
@@ -99,7 +99,6 @@ const measurementsSchema = mongoose.Schema(
     measurements: Object,
     monitorState: String,
     monitorSupplier: String,
-    rawNormalizedMeasurements: Object,
     normalizedMeasurements: Object,
     flags: Object,
     appliedCorrections: {
@@ -107,6 +106,7 @@ const measurementsSchema = mongoose.Schema(
       of: correctionSnapshotSchema,
       default: {},
     },
+    correctedNormalizedMeasurements: Object,
     annotations: {
       type: [annotationSchema],
       default: [],
@@ -150,9 +150,10 @@ 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(),
     });
@@ -175,9 +176,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(),
     }));
@@ -201,9 +202,10 @@ 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(),
     });
@@ -224,9 +226,10 @@ 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
     });
@@ -247,9 +250,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/monitors.js

@@ -201,6 +201,7 @@ const monitorsSchema = mongoose.Schema(
     isActive: { type: Boolean, default: true },
     parameterThresholds: Object,
     completionPercentageThresholds: Object,
+    networkAnomalyThresholds: Object,
     // A Map, keyed by pollutant (e.g. "PM2_5"), storing Correction sub-docs
     corrections: {
       type: Map,

package/src/models/networkMetrics.js

@@ -0,0 +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);
+
+export { networkMetricsSchema, NetworkMetrics };

package/src/models/monitorType.js

@@ -1,40 +0,0 @@
-import mongoose from "mongoose";
-
-const parametersEnum = [
-  "NO2",
-  "SO2",
-  "PM2.5",
-  "PM10",
-  "Temperature",
-  "Humidity",
-  "OZONE",
-  "VOC",
-  "CO",
-  "NO",
-  "PM1",
-  "WS And Direction",
-];
-
-const monitorTypeSchema = mongoose.Schema(
-  {
-    model: {
-      type: String,
-      required: true,
-    },
-
-    supplier: {
-      type: mongoose.Types.ObjectId,
-      required: true,
-      ref: "MonitorSuppliers",
-    },
-
-    parameters: {
-      type: String,
-      enum: parametersEnum,
-      required: true,
-    },
-  },
-  { timestamps: true }
-);
-
-const monitorType = mongoose.model("MonitorType", monitorTypeSchema);