@justair/justair-library 4.6.0 → 4.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "4.6.0",
+  "version": "4.7.0",
   "description": "JustAir Internal Library",
 
   "main": "src/index.js",

package/src/models/admin.js

@@ -15,7 +15,15 @@ const adminSchema = mongoose.Schema({
     timestamps: true
 });
 
-adminSchema.index({email: 1});
+// Organization-based admin queries
+adminSchema.index({ orgId: 1, isActive: 1 });
+// Email-based login with active status (case-insensitive handled in app)
+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

@@ -47,10 +47,19 @@ const alertsSchema = mongoose.Schema(
   }
 );
 
+// Organization-based queries with timestamp ordering
+alertsSchema.index({ orgId: 1, updatedAt: -1 });
+// Monitor-based queries for lookups with timestamp ordering
+alertsSchema.index({ monitorId: 1, updatedAt: -1 });
+// Status-based filtering with organization and timestamp
+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 });
-alertsSchema.index({ alertConfigurationId: 1 });
 
 const alertsAuditSchema = mongoose.Schema(
   {

package/src/models/events.js

@@ -44,6 +44,12 @@ const eventsSchema = mongoose.Schema(
   }
 );
 
+// Primary lookup pattern from monitors - for $lookup operations
+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 });
 

package/src/models/jobs.js

@@ -32,6 +32,15 @@ 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 });
+
+// Keep individual indexes for backward compatibility
 jobsSchema.index({ requestorId: 1 });
 jobsSchema.index({ createdAt: 1 });
 jobsSchema.index({ category: 1 });

package/src/models/measurements.js

@@ -96,11 +96,16 @@ const measurementsSchema = mongoose.Schema(
   }
 );
 
-// CRITICAL: Add compound index for monitorId + timeUpdated
-// This significantly improves performance for date range queries on specific monitors
+// 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 });
 
-// Keep the individual indexes as they may still be useful for other queries
+// 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 });
 

package/src/models/monitors.js

@@ -131,9 +131,9 @@ const monitorsSchema = mongoose.Schema(
         "blue sky",
         "aq mesh",
         "quant aq",
-        "airgradient",
+        "airGradient",
         "oizom",
-        "metOne"
+        "metOne",
       ],
     },
     monitorType: String,
@@ -207,7 +207,26 @@ const monitorsSchema = mongoose.Schema(
   }
 );
 
+// Geographic queries - already exists
 monitorsSchema.index({ gpsLocation: "2dsphere" });
+
+// Sponsor-based queries
+monitorsSchema.index({ sponsor: 1, isPrivate: 1, isActive: 1 });
+
+// Location-based filtering
+monitorsSchema.index({ "location.city": 1, "location.state": 1 });
+monitorsSchema.index({ "location.neighborhood": 1 });
+monitorsSchema.index({ "location.county": 1 });
+
+// Query parameter filtering
+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 });

package/src/models/organizations.js

@@ -72,6 +72,13 @@ const organizationsSchema = mongoose.Schema(
   }
 );
 
+// Name-based sorting index
+organizationsSchema.index({ name: 1 });
+// Connected monitors array queries
+organizationsSchema.index({ connectedMonitors: 1 });
+// Alert configuration queries
+organizationsSchema.index({ _id: 1, "alertConfigurations.isActive": 1 });
+
 const Organizations = mongoose.model("Organizations", organizationsSchema);
 
 export { organizationsSchema, Organizations };