@justair/justair-library 3.2.0 → 3.3.0

package/package.json

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

package/src/config/db.js

@@ -9,7 +9,6 @@ class Database {
 
   async connect() {
     if (mongoose.connection.readyState === 1) {
-      // If there's an active connection, close it first
       await mongoose.disconnect();
     }
 

package/src/index.js

@@ -3,7 +3,7 @@ import {
   configurationsSchema,
   Configurations,
 } from "./models/configurations.js";
-import { measurementsSchema, Measurements } from "./models/measurements.js";
+import { measurementsSchema, Measurements, Audit } from "./models/measurements.js";
 import {
   monitorRequestsSchema,
   MonitorRequests,
@@ -31,18 +31,15 @@ import { announcementSchema, Announcements } from "./models/announcements.js";
 import { jobsSchema, Jobs } from "./models/jobs.js";
 import { apiKeySchema, ApiKey } from "./models/apiKey.js";
 import { UsageMetrics, usageMetricsSchema } from "./models/usageMetrics.js";
-import dbConfig from "./config/db.js";
+import Database from "./config/db.js";  // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
-export function createDatabaseInstance({ CONNECTION_URL, database }) {
-  return new dbConfig({ CONNECTION_URL, database });
-}
-
 export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
   return new CustomLogger({ DATADOG_API_KEY, APPLICATION_NAME });
 }
 
 export {
+  Database,  // Export the Database class
   adminSchema,
   Admin,
   configurationsSchema,
@@ -79,4 +76,5 @@ export {
   ApiKey,
   UsageMetrics,
   usageMetricsSchema,
-};
+  Audit
+};

package/src/models/measurements.js

@@ -1,18 +1,93 @@
-import mongoose from 'mongoose';
+import mongoose from "mongoose";
 
-const measurementsSchema = mongoose.Schema({
-    monitorId: { type: mongoose.Types.ObjectId, ref: 'Monitors' },
-    orgId: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
+// Audit Schema
+const auditSchema = mongoose.Schema(
+  {
+    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
     timeUpdated: Date,
+    deletedAt: { type: Date, default: Date.now }, // Timestamp of deletion
     measurements: Object,
-    monitorState: String
-}, {
-    timestamps: true
+    monitorState: String,
+  },
+  {
+    timestamps: true,
+  }
+);
+
+const Audit = mongoose.model("Audit", auditSchema);
+
+// Measurements Schema
+const measurementsSchema = mongoose.Schema(
+  {
+    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    timeUpdated: Date,
+    measurements: Object,
+    monitorState: String,
+  },
+  {
+    timestamps: true,
+  }
+);
+
+measurementsSchema.index({ monitorId: 1 });
+measurementsSchema.index({ timeUpdated: 1 });
+
+// Post hook to log single document deletions
+measurementsSchema.post("findOneAndDelete", async function (doc) {
+  if (doc) {
+    const auditLog = new Audit({
+      monitorId: doc.monitorId,
+      orgId: doc.orgId,
+      timeUpdated: doc.timeUpdated,
+      measurements: doc.measurements,
+      monitorState: doc.monitorState,
+    });
+    await auditLog.save();
+  }
+});
+
+// Post hook to log multiple document deletions
+measurementsSchema.post("deleteMany", async function (result, next) {
+  // Access the query object to know what was deleted
+  const deletedDocs = await this.model.find(this.getQuery());
+
+  if (deletedDocs.length) {
+    const auditLogs = deletedDocs.map((doc) => ({
+      monitorId: doc.monitorId,
+      orgId: doc.orgId,
+      timeUpdated: doc.timeUpdated,
+      measurements: doc.measurements,
+      monitorState: doc.monitorState,
+      deletedAt: Date.now(),
+    }));
+
+    await Audit.insertMany(auditLogs);
+  }
+
+  next();
 });
 
-measurementsSchema.index({monitorId: 1});
-measurementsSchema.index({timeUpdated: 1});
+// Post hook to log a single document deletion (for deleteOne)
+measurementsSchema.post("deleteOne", async function (result, next) {
+  const deletedDoc = await this.model.findOne(this.getQuery());
+
+  if (deletedDoc) {
+    const auditLog = new Audit({
+      monitorId: deletedDoc.monitorId,
+      orgId: deletedDoc.orgId,
+      timeUpdated: deletedDoc.timeUpdated,
+      measurements: deletedDoc.measurements,
+      monitorState: deletedDoc.monitorState,
+      deletedAt: Date.now(),
+    });
+    await auditLog.save();
+  }
+
+  next();
+});
 
-const Measurements = mongoose.model('Measurements', measurementsSchema);
+const Measurements = mongoose.model("Measurements", measurementsSchema);
 
-export  {measurementsSchema, Measurements};
+export { measurementsSchema, Measurements, Audit };