@justair/justair-library 4.7.27 → 4.8.0

package/package.json

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

package/src/models/admin.js

@@ -22,9 +22,6 @@ adminSchema.index({ email: 1, isActive: 1 });
 // Permission-based queries
 adminSchema.index({ orgId: 1, permissionName: 1 });
 
-// Keep individual email index for backward compatibility
-adminSchema.index({ email: 1 });
-
 
 const Admin = mongoose.model('Admin', adminSchema);
 

package/src/models/alerts.js

@@ -56,9 +56,6 @@ alertsSchema.index({ orgId: 1, status: 1, updatedAt: -1 });
 // Alert configuration matching - already optimal
 alertsSchema.index({ alertConfigurationId: 1 });
 
-// Keep individual indexes for backward compatibility
-alertsSchema.index({ orgId: 1 });
-alertsSchema.index({ monitorId: 1 });
 alertsSchema.index({ type: 1 });
 
 const alertsAuditSchema = mongoose.Schema(

package/src/models/dataCompleteness.js

@@ -26,13 +26,6 @@ dataCompletenessSchema.index({
   measurementsStartTime: 1
 });
 
-
-dataCompletenessSchema.index({
-  monitorId: 1,
-  measurementsStartTime: 1
-});
-
-
 dataCompletenessSchema.index({
   monitorId: 1,
   measurementsStartTime: 1,

package/src/models/events.js

@@ -50,8 +50,6 @@ eventsSchema.index({ monitorId: 1, createdAt: -1 });
 // Date range filtering index
 eventsSchema.index({ monitorId: 1, updatedAt: -1 });
 
-// Keep individual indexes for other query patterns
-eventsSchema.index({ monitorId: 1 });
 eventsSchema.index({ parameter: 1 });
 
 // Pre-hook to log single document deletions

package/src/models/jobs.js

@@ -32,18 +32,12 @@ const jobsSchema = mongoose.Schema(
 
 const Jobs = mongoose.model("Jobs", jobsSchema);
 
-// Requestor-based queries with category filtering
-jobsSchema.index({ requestorId: 1, category: 1 });
 // Exclude specific categories efficiently with timestamp ordering
 jobsSchema.index({ requestorId: 1, category: 1, createdAt: -1 });
 // Monitor-based job lookups (if monitorId field exists in resourceMetaData)
 // Note: This may need to be adjusted based on actual schema structure
-// jobsSchema.index({ "resourceMetaData.monitorId": 1, updatedAt: -1 });
+jobsSchema.index({ "resourceMetaData.monitorId": 1, updatedAt: -1 });
 
-// Keep individual indexes for backward compatibility
-jobsSchema.index({ requestorId: 1 });
-jobsSchema.index({ createdAt: 1 });
-jobsSchema.index({ category: 1 });
 jobsSchema.index({ jobStatus: 1 });
 
 export { jobsSchema, Jobs };

package/src/models/measurements.js

@@ -4,13 +4,13 @@ const correctionSnapshotSchema = new mongoose.Schema(
   {
     equationType: {
       type: String,
-      enum: ['custom', 'linear'],
+      enum: ["custom", "linear"],
       required: true,
     },
     equation: {
       type: String,
-      required: function() {
-        return this.equationType === 'custom';
+      required: function () {
+        return this.equationType === "custom";
       },
     },
     dateCreated: {
@@ -36,17 +36,17 @@ const annotationSchema = new mongoose.Schema(
       trim: true,
     },
     adminId: {
-    type: mongoose.Types.ObjectId,
-    ref: "Admin",
-    required: function() {
-      return this.source === 'admin';
+      type: mongoose.Types.ObjectId,
+      ref: "Admin",
+      required: function () {
+        return this.source === "admin";
       },
     },
     source: {
       type: String,
-      enum: ['admin', 'processing_engine'],
+      enum: ["admin", "processing_engine"],
       required: true,
-      default: 'admin'
+      default: "admin",
     },
     timestamp: {
       type: Date,
@@ -120,16 +120,10 @@ const measurementsSchema = mongoose.Schema(
 // CRITICAL: Add compound indexes for monitorId + timeUpdated
 // Primary query pattern index (descending timeUpdated for latest data first)
 measurementsSchema.index({ monitorId: 1, timeUpdated: -1 });
-// Date range query index (ascending timeUpdated for range queries)
-measurementsSchema.index({ monitorId: 1, timeUpdated: 1 });
 
 // Flag-based query index for filtering by monitor and flags
 measurementsSchema.index({ monitorId: 1, flags: 1 });
 
-// Keep the individual indexes as they may still be useful for other queries  
-measurementsSchema.index({ monitorId: 1 });
-measurementsSchema.index({ timeUpdated: 1 });
-
 // Annotation-related indexes
 measurementsSchema.index({
   "annotations.measurementIdentifier": 1,

package/src/models/monitorSuppliers.js

@@ -20,13 +20,19 @@ const monitorSuppliersSchema = mongoose.Schema(
     runFrequencyMinutes: { type: Number, default: 5 },
     lastSuccessfulRun: Date,
     lastFailedRun: Date,
-    orgAPICount: {
-      monthlyApiCallCount: { type: Number, default: 0 },
-      monthlyLimit: Number,
-    },
-    rateLimit: {
-      requestsPerSecond: { type: Number, default: 10 },
-    },
+    rateLimits: [
+      {
+        type: { 
+          type: String, 
+          required: true,
+          enum: ["second", "hourly", "daily", "weekly", "monthly"]
+        },
+        limit: { type: Number, required: true },
+        currentCount: { type: Number, default: 0 },
+        resetTime: { type: Date },
+        _id: false
+      }
+    ],
     latestErrorLogs: {
       type: [errorLogSchema],
     },

package/src/models/monitors.js

@@ -272,16 +272,8 @@ monitorsSchema.index({ monitorSupplier: 1, monitorState: 1 });
 monitorsSchema.index({ context: 1 });
 monitorsSchema.index({ parameters: 1 });
 
-// Monitor lookups by supplier
-monitorsSchema.index({ sponsor: 1, monitorSupplier: 1 });
-
-// Keep existing single-field indexes for backward compatibility
-monitorsSchema.index({ monitorSupplier: 1 });
-monitorsSchema.index({ monitorIdFromSupplier: 1 });
-monitorsSchema.index({ monitorState: 1 });
-
 //network metrics for anomalies
-monitorsSchema.index({ sponsor: 1, isActive: 1, monitorSupplier: 1 })
+monitorsSchema.index({ sponsor: 1, isActive: 1, monitorSupplier: 1 });
 
 // Pre-hook to log single document deletions
 monitorsSchema.pre("findOneAndDelete", async function () {