@justair/justair-library 3.3.4-mike → 3.3.4-oscar

package/package.json

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

package/src/models/monitors.js

@@ -14,29 +14,17 @@ const parametersEnum = [
   "WS And Direction",
 ];
 
-const parameterThresholdsSchema = mongoose.Schema({
-  parameter: {
-    type: mongoose.Schema.Types.Mixed,
-    validate: {
-      validator: function(v) {
-        return Object.keys(v).every(key => parametersEnum.includes(key)
-        );
-      },
-      message: props => `${props.value} is not a valid parameter threshold object`
-    }
+const thresholdSchema = new mongoose.Schema({
+  invalid: {
+    min: Number,
+    max: 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;
-    }
+  warning: {
+    min: Number,
+    max: Number
   }
-  return true;
-}, 'Invalid parameter key');
+}, { _id: false });
+
 
 // Monitors Schema
 const monitorsSchema = mongoose.Schema(
@@ -109,13 +97,7 @@ const monitorsSchema = mongoose.Schema(
     type: mongoose.Schema.Types.Mixed,
     validate: {
       validator: function(v) {
-        return Object.keys(v).every(key => 
-          parametersEnum.includes(key) && 
-          thresholdSchema.path('invalid.min').instance(v[key].invalid.min) &&
-          thresholdSchema.path('invalid.max').instance(v[key].invalid.max) &&
-          thresholdSchema.path('warning.min').instance(v[key].warning.min) &&
-          thresholdSchema.path('warning.max').instance(v[key].warning.max)
-        );
+        return Object.keys(v).every(key => parametersEnum.includes(key));
       },
       message: props => `${props.value} is not a valid parameter threshold object`
     }