@justair/justair-library 4.8.17 → 4.8.19

package/package.json

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

package/src/models/measurements.js

@@ -82,7 +82,7 @@ const auditSchema = mongoose.Schema(
       default: {},
     },
     annotations: [annotationSchema], // Include annotations in audit trail
-    isCorrected: { type: Boolean, default: false },
+    isCorrected: { type: Boolean },
   },
   {
     timestamps: true,
@@ -112,7 +112,7 @@ const measurementsSchema = mongoose.Schema(
       type: [annotationSchema],
       default: [],
     },
-    isCorrected: { type: Boolean, default: false },
+    isCorrected: { type: Boolean },
   },
   {
     timestamps: true,

package/src/models/monitors.js

@@ -248,6 +248,8 @@ const monitorsSchema = mongoose.Schema(
       default: [],
     },
     applyCorrections: { type: Boolean, default: false },
+    // Optional readKey for private API access (e.g. PurpleAir)
+    readKey: { type: String, required: false },
     pausedParameters: {
       type: [{ parameter: String, timestamp: Date, isPaused: Boolean }],
       default: [],

package/src/models/organizations.js

@@ -61,6 +61,32 @@ const featureSchema = new Schema({
   },
 });
 
+const computeResetTime = (rateLimitType, baseTime = new Date()) => {
+  const resetTime = new Date(baseTime);
+
+  switch (rateLimitType) {
+    case "second":
+      resetTime.setSeconds(resetTime.getSeconds() + 1);
+      break;
+    case "hourly":
+      resetTime.setHours(resetTime.getHours() + 1);
+      break;
+    case "daily":
+      resetTime.setDate(resetTime.getDate() + 1);
+      break;
+    case "weekly":
+      resetTime.setDate(resetTime.getDate() + 7);
+      break;
+    case "monthly":
+      resetTime.setMonth(resetTime.getMonth() + 1);
+      break;
+    default:
+      break;
+  }
+
+  return resetTime;
+};
+
 const organizationsSchema = mongoose.Schema(
   {
     name: String,
@@ -85,6 +111,54 @@ const organizationsSchema = mongoose.Schema(
   }
 );
 
+organizationsSchema.methods.setRateLimitProperties = function () {
+  if (!Array.isArray(this.orgAPIKey)) {
+    return;
+  }
+
+  const now = new Date();
+
+  this.orgAPIKey = this.orgAPIKey.map((apiKeyEntry) => {
+    if (!apiKeyEntry || !Array.isArray(apiKeyEntry.rateLimits)) {
+      return apiKeyEntry;
+    }
+
+    const updatedRateLimits = apiKeyEntry.rateLimits.map((rateLimit) => {
+      if (!rateLimit) {
+        return rateLimit;
+      }
+
+      const updatedRateLimit = { ...rateLimit };
+
+      if (updatedRateLimit.apiCount == null) {
+        updatedRateLimit.apiCount = 0;
+      }
+
+      if (!updatedRateLimit.resetTime) {
+        updatedRateLimit.resetTime = computeResetTime(
+          updatedRateLimit.type,
+          now
+        );
+      }
+
+      return updatedRateLimit;
+    });
+
+    return {
+      ...apiKeyEntry,
+      rateLimits: updatedRateLimits,
+    };
+  });
+};
+
+organizationsSchema.pre("save", function (next) {
+  if (this.isModified("orgAPIKey")) {
+    this.setRateLimitProperties();
+  }
+
+  next();
+});
+
 // Name-based sorting index
 organizationsSchema.index({ name: 1 });
 // Connected monitors array queries