@justair/justair-library 3.3.4-golf → 3.3.4-india

package/package.json

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

package/src/models/monitors.js

@@ -16,17 +16,32 @@ const parametersEnum = [
 
 const parameterThresholdsSchema = mongoose.Schema({
   parameter: {
-    type: mongoose.Schema.Types.Mixed,
-    validate: {
-      validator: function(v) {
-        return Object.keys(v).every(key => pollutants.includes(key)  
-        );
+    type: Map,
+    of: new mongoose.Schema({
+      invalid: {
+        max: Number,
+        min: Number,
       },
-      message: props => `${props.value} is not a valid parameter threshold object`
-    }
+
+      warning: {
+        max: Number,
+        min: Number,
+      },
+    }),
   },
 });
 
+/*Ensure the parameter value is one of our valid parameters */
+parameterThresholdsSchema.path('parameter').validate(function(value) {
+  console.log(value)
+  for (let key of value.keys()) {
+    if (!parametersEnum.includes(key)) {
+      return false;
+    }
+  }
+  return true;
+}, 'Invalid parameter key');
+
 // Monitors Schema
 const monitorsSchema = mongoose.Schema(
   {
@@ -94,7 +109,7 @@ const monitorsSchema = mongoose.Schema(
     calculatedAverages: [Object],
     images: [String],
     isActive: { type: Boolean, default: true },
-    parameterThresholds: { type: Object,  },
+    parameterThresholds: { type: Map, of: parameterThresholdsSchema },
   },
   {
     timestamps: true,