@justair/justair-library 4.8.48 → 4.9.0

package/package.json

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

package/src/index.js

@@ -22,10 +22,6 @@ import {
   deploymentTypesEnum,
 } from "./models/monitors.js";
 import { organizationsSchema, Organizations } from "./models/organizations.js";
-import {
-  referenceMonitorInfoSchema,
-  ReferenceMonitorInfo,
-} from "./models/referenceMonitorInfo.js";
 import { lightMonitorSchema, LightMonitors } from "./models/lightmonitors.js";
 import {
   monitorSuppliersSchema,
@@ -56,6 +52,7 @@ import {
   dataCompletenessSchema,
 } from "./models/dataCompleteness.js";
 import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js";
+import { RateOfChange, rateOfChangeSchema } from "./models/rateOfChange.js";
 import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
@@ -95,8 +92,6 @@ export {
   Monitors,
   organizationsSchema,
   Organizations,
-  referenceMonitorInfoSchema,
-  ReferenceMonitorInfo,
   usersSchema,
   Users,
   eventsSchema,
@@ -135,6 +130,8 @@ export {
   DataCompleteness,
   networkMetricsSchema,
   NetworkMetrics,
+  rateOfChangeSchema,
+  RateOfChange,
   // SampleSites related exports
   sampleSitesSchema,
   SampleSites,

package/src/models/monitorSuppliers.js

@@ -18,6 +18,7 @@ const monitorSuppliersSchema = mongoose.Schema(
     authenticationStructure: [String],
     defaultParameterThresholds: Object,
     defaultCompletenessThresholdCount: Number,
+    defaultRateOfChangeThresholds: Object,
     runFrequencyMinutes: { type: Number, default: 5 },
     aqiServiceRunMinute: { type: Number, default: 5 },
     lastSuccessfulRun: Date,

package/src/models/monitors.js

@@ -230,8 +230,19 @@ const monitorsSchema = mongoose.Schema(
     monitorLatitude: Number,
     monitorLongitude: Number,
     gpsLocation: {
-      type: { type: String, enum: ["Point"], required: true },
-      coordinates: { type: [Number], required: true },
+      type: {
+        type: String,
+        enum: ["Point"],
+        required: function () {
+          return this.monitorLatitude != null && this.monitorLongitude != null;
+        },
+      },
+      coordinates: {
+        type: [Number],
+        required: function () {
+          return this.monitorLatitude != null && this.monitorLongitude != null;
+        },
+      },
     },
     location: Object,
     context: [String],
@@ -254,6 +265,7 @@ const monitorsSchema = mongoose.Schema(
     parameterThresholds: Object,
     completionPercentageThresholds: Object,
     anomalyPercentageThresholds: Object,
+    rateOfChangeThresholds: Object,
     // A Map, keyed by pollutant (e.g. "PM2_5"), storing Correction sub-docs
     corrections: {
       type: Map,

package/src/models/rateOfChange.js

@@ -0,0 +1,34 @@
+import mongoose from "mongoose";
+
+const rateOfChangeSchema = mongoose.Schema(
+  {
+    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+    monitorSupplier: String,
+    parameter: String,
+    hourStart: Date,
+    hourEnd: Date,
+    previousHourStart: Date,
+    previousHourEnd: Date,
+    hourlyAvg: { type: Number, default: null },
+    previousHourlyAvg: { type: Number, default: null },
+    absoluteDifference: Number,
+    flags: Object,
+  },
+  { timestamps: true }
+);
+
+rateOfChangeSchema.index({
+  monitorId: 1,
+  parameter: 1,
+  hourStart: 1,
+});
+
+rateOfChangeSchema.index({
+  monitorId: 1,
+  hourStart: 1,
+  flags: 1,
+});
+
+const RateOfChange = mongoose.model("RateOfChange", rateOfChangeSchema);
+
+export { rateOfChangeSchema, RateOfChange };

package/src/models/referenceMonitorInfo.js

@@ -1,19 +0,0 @@
-import mongoose from 'mongoose';
-
-const referenceMonitorInfoSchema = mongoose.Schema({
-    bboxStartLat: String,
-    bboxStartLong: String,
-    bboxEndLat: String,
-    bboxEndLong: String,
-    parameters: String,
-    sponsor: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
-    location: Object,
-    isActive: { type: Boolean, default: true },
-    context: [String]
-}, {
-    timestamps: true
-});
-
-const ReferenceMonitorInfo = mongoose.model('ReferenceMonitorInfo', referenceMonitorInfoSchema);
-
-export {referenceMonitorInfoSchema, ReferenceMonitorInfo};