@justair/justair-library 4.4.1 → 4.4.3

package/package.json

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

package/src/config/db.js

@@ -1,39 +1,115 @@
 import mongoose from "mongoose";
 
 class Database {
-  static instance = null;
+  static instances = new Map(); // Store multiple instances by connection key
+
   constructor({ CONNECTION_URL, database }) {
     this.CONNECTION_URL = CONNECTION_URL;
     this.database = database;
+    this.connectionKey = `${CONNECTION_URL}:${database}`;
+    this.isConnected = false;
   }
 
   async connect() {
-    if (mongoose.connection.readyState === 1) {
-      await mongoose.disconnect();
+    // Check if we're already connected to this specific database
+    if (this.isConnected && mongoose.connection.readyState === 1) {
+      // Verify we're connected to the right database
+      if (mongoose.connection.db.databaseName === this.database) {
+        console.log(`Already connected to database: ${this.database}`);
+        return;
+      }
     }
+
     try {
+      // Only disconnect if we're connected to a different database
+      if (mongoose.connection.readyState === 1) {
+        const currentDb = mongoose.connection.db.databaseName;
+        if (currentDb !== this.database) {
+          console.log(
+            `Switching from database: ${currentDb} to: ${this.database}`
+          );
+          await mongoose.disconnect();
+        } else {
+          // Already connected to the correct database
+          this.isConnected = true;
+          return;
+        }
+      }
+
       await mongoose.connect(this.CONNECTION_URL, {
         authSource: "admin",
         ssl: true,
         dbName: this.database,
       });
-      console.log("Database connection successful");
+
+      this.isConnected = true;
+      console.log(`Database connection successful: ${this.database}`);
+    } catch (err) {
+      this.isConnected = false;
+      console.error(`Database connection error for ${this.database}: ${err}`);
+      throw err;
+    }
+  }
+
+  async disconnect() {
+    try {
+      if (mongoose.connection.readyState === 1) {
+        await mongoose.disconnect();
+        this.isConnected = false;
+        console.log(`Disconnected from database: ${this.database}`);
+      }
     } catch (err) {
-      console.error("Database connection error " + err);
+      console.error(`Error disconnecting from database: ${err}`);
       throw err;
     }
   }
 
   static async getInstance(config) {
-    if (
-      !Database.instance ||
-      Database.instance.CONNECTION_URL !== config.CONNECTION_URL ||
-      Database.instance.database !== config.database
-    ) {
-      Database.instance = new Database(config);
-      await Database.instance.connect();
+    const connectionKey = `${config.CONNECTION_URL}:${config.database}`;
+
+    // Check if we have an instance for this connection
+    if (Database.instances.has(connectionKey)) {
+      const instance = Database.instances.get(connectionKey);
+
+      // Ensure the connection is still valid
+      if (!instance.isConnected || mongoose.connection.readyState !== 1) {
+        await instance.connect();
+      }
+
+      return instance;
+    }
+
+    // Create new instance
+    const instance = new Database(config);
+    await instance.connect();
+    Database.instances.set(connectionKey, instance);
+
+    return instance;
+  }
+
+  static getCurrentDatabase() {
+    if (mongoose.connection.readyState === 1) {
+      return mongoose.connection.db.databaseName;
+    }
+    return null;
+  }
+
+  static async closeAllConnections() {
+    try {
+      if (mongoose.connection.readyState === 1) {
+        await mongoose.disconnect();
+      }
+
+      // Mark all instances as disconnected
+      for (const instance of Database.instances.values()) {
+        instance.isConnected = false;
+      }
+
+      console.log("All database connections closed");
+    } catch (err) {
+      console.error("Error closing database connections:", err);
+      throw err;
     }
-    return Database.instance;
   }
 }
 

package/src/models/measurements.js

@@ -8,6 +8,40 @@ const correctionSnapshotSchema = new mongoose.Schema(
   { _id: false } // Not generating separate _id for each correction
 );
 
+// Annotation Schema
+const annotationSchema = new mongoose.Schema(
+  {
+    measurementIdentifier: {
+      type: String,
+      required: true,
+      trim: true,
+      // Examples: "PM2_5", "PM10", "NO2", "O3", etc.
+    },
+    comment: {
+      type: String,
+      required: true,
+      trim: true,
+    },
+    adminId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Admin",
+      required: true,
+    },
+    timestamp: {
+      type: Date,
+      default: Date.now,
+      required: true,
+    },
+  },
+  {
+    _id: true,
+    timestamps: false,
+  }
+);
+
+// Add index for efficient querying
+annotationSchema.index({ measurementIdentifier: 1, timestamp: -1 });
+
 // Audit Schema
 const auditSchema = mongoose.Schema(
   {
@@ -25,6 +59,7 @@ const auditSchema = mongoose.Schema(
       default: {},
     },
     correctedNormalizedMeasurements: Object,
+    annotations: [annotationSchema], // Include annotations in audit trail
   },
   {
     timestamps: true,
@@ -49,6 +84,10 @@ const measurementsSchema = mongoose.Schema(
       default: {},
     },
     correctedNormalizedMeasurements: Object,
+    annotations: {
+      type: [annotationSchema],
+      default: [],
+    },
   },
   {
     timestamps: true,
@@ -58,6 +97,12 @@ const measurementsSchema = mongoose.Schema(
 measurementsSchema.index({ monitorId: 1 });
 measurementsSchema.index({ timeUpdated: 1 });
 
+measurementsSchema.index({
+  "annotations.measurementIdentifier": 1,
+  "annotations.timestamp": -1,
+});
+measurementsSchema.index({ "annotations.userId": 1 });
+
 // Pre-hook to log single document deletions
 measurementsSchema.pre("findOneAndDelete", async function () {
   const docToDelete = await this.model.findOne(this.getFilter());
@@ -74,6 +119,7 @@ measurementsSchema.pre("findOneAndDelete", async function () {
       appliedCorrections: docToDelete.appliedCorrections,
       correctedNormalizedMeasurements:
         docToDelete.correctedNormalizedMeasurements,
+      annotations: docToDelete.annotations, // Include annotations in audit
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -97,6 +143,7 @@ measurementsSchema.pre("deleteMany", async function () {
       flags: doc.flags,
       appliedCorrections: doc.appliedCorrections,
       correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
+      annotations: doc.annotations, // Include annotations in audit
       deletedAt: new Date(),
     }));
 
@@ -122,6 +169,7 @@ measurementsSchema.pre("deleteOne", async function () {
       appliedCorrections: docToDelete.appliedCorrections,
       correctedNormalizedMeasurements:
         docToDelete.correctedNormalizedMeasurements,
+      annotations: docToDelete.annotations, // Include annotations in audit
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -144,6 +192,7 @@ measurementsSchema.pre("findOneAndUpdate", async function () {
       appliedCorrections: docToUpdate.appliedCorrections,
       correctedNormalizedMeasurements:
         docToUpdate.correctedNormalizedMeasurements,
+      annotations: docToUpdate.annotations, // Include annotations in audit
       deletedAt: null, // No deletion happening, so set it to null or undefined
     });
     await auditLog.save();
@@ -165,6 +214,7 @@ measurementsSchema.pre("updateMany", async function () {
       flags: doc.flags,
       appliedCorrections: doc.appliedCorrections,
       correctedNormalizedMeasurements: doc.correctedNormalizedMeasurements,
+      annotations: doc.annotations, // Include annotations in audit
       deletedAt: null, // No deletion happening
     }));
 
@@ -174,4 +224,10 @@ measurementsSchema.pre("updateMany", async function () {
 
 const Measurements = mongoose.model("Measurements", measurementsSchema);
 
-export { measurementsSchema, Measurements, Audit, auditSchema };
+export {
+  measurementsSchema,
+  Measurements,
+  Audit,
+  auditSchema,
+  annotationSchema,
+};