@justair/justair-library 3.3.0 → 3.3.1

package/package.json

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

package/src/index.js

@@ -3,7 +3,12 @@ import {
   configurationsSchema,
   Configurations,
 } from "./models/configurations.js";
-import { measurementsSchema, Measurements, Audit } from "./models/measurements.js";
+import {
+  measurementsSchema,
+  Measurements,
+  Audit,
+  auditSchema,
+} from "./models/measurements.js";
 import {
   monitorRequestsSchema,
   MonitorRequests,
@@ -31,7 +36,7 @@ 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 Database from "./config/db.js";  // Import the new Database class
+import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
 export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
@@ -39,7 +44,7 @@ export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
 }
 
 export {
-  Database,  // Export the Database class
+  Database, // Export the Database class
   adminSchema,
   Admin,
   configurationsSchema,
@@ -76,5 +81,6 @@ export {
   ApiKey,
   UsageMetrics,
   usageMetricsSchema,
-  Audit
-};
+  Audit,
+  auditSchema,
+};

package/src/models/measurements.js

@@ -6,7 +6,7 @@ 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
+    deletedAt: { type: Date, default: Date.now },
     measurements: Object,
     monitorState: String,
   },
@@ -34,60 +34,62 @@ const measurementsSchema = mongoose.Schema(
 measurementsSchema.index({ monitorId: 1 });
 measurementsSchema.index({ timeUpdated: 1 });
 
-// Post hook to log single document deletions
-measurementsSchema.post("findOneAndDelete", async function (doc) {
-  if (doc) {
+// Pre-hook to log single document deletions
+measurementsSchema.pre("findOneAndDelete", async function () {
+  const docToDelete = await this.model.findOne(this.getFilter());
+  if (docToDelete) {
+    console.log("Logging findOneAndDelete to audit", docToDelete);
     const auditLog = new Audit({
-      monitorId: doc.monitorId,
-      orgId: doc.orgId,
-      timeUpdated: doc.timeUpdated,
-      measurements: doc.measurements,
-      monitorState: doc.monitorState,
+      monitorId: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      deletedAt: new Date(),
     });
     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());
+// Pre-hook to log multiple document deletions
+measurementsSchema.pre("deleteMany", async function () {
+  console.log("deleteMany pre-hook triggered");
+  const docsToDelete = await this.model.find(this.getFilter()).lean();
 
-  if (deletedDocs.length) {
-    const auditLogs = deletedDocs.map((doc) => ({
+  if (docsToDelete.length) {
+    console.log(`Logging ${docsToDelete.length} documents to audit`);
+    const auditLogs = docsToDelete.map((doc) => ({
       monitorId: doc.monitorId,
       orgId: doc.orgId,
       timeUpdated: doc.timeUpdated,
       measurements: doc.measurements,
       monitorState: doc.monitorState,
-      deletedAt: Date.now(),
+      deletedAt: new Date(),
     }));
 
     await Audit.insertMany(auditLogs);
   }
-
-  next();
 });
 
-// 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());
+// Pre-hook to log a single document deletion (for deleteOne)
+measurementsSchema.pre("deleteOne", async function () {
+  console.log("deleteOne pre-hook triggered");
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
 
-  if (deletedDoc) {
+  if (docToDelete) {
+    console.log("Logging deleteOne to audit", docToDelete);
     const auditLog = new Audit({
-      monitorId: deletedDoc.monitorId,
-      orgId: deletedDoc.orgId,
-      timeUpdated: deletedDoc.timeUpdated,
-      measurements: deletedDoc.measurements,
-      monitorState: deletedDoc.monitorState,
-      deletedAt: Date.now(),
+      monitorId: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      deletedAt: new Date(),
     });
     await auditLog.save();
   }
-
-  next();
 });
 
 const Measurements = mongoose.model("Measurements", measurementsSchema);
 
-export { measurementsSchema, Measurements, Audit };
+export { measurementsSchema, Measurements, Audit, auditSchema };