@justair/justair-library 4.3.4 → 4.4.0

package/package.json

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

package/src/index.js

@@ -49,6 +49,10 @@ import {
   alertsAuditSchema,
 } from "./models/alerts.js";
 import { Features, featuresSchema } from "./models/features.js";
+import {
+  DataCompleteness,
+  dataCompletenessSchema,
+} from "./models/dataCompleteness.js";
 import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
@@ -104,4 +108,6 @@ export {
   alertsAuditSchema,
   Features,
   featuresSchema,
+  dataCompletenessSchema,
+  DataCompleteness,
 };

package/src/models/alerts.js

@@ -31,7 +31,13 @@ const alertsSchema = mongoose.Schema(
     actionBy: { type: mongoose.Types.ObjectId, ref: "Admin" },
     actionDate: { type: Date, default: Date.now },
     recipients: [recipientSchema],
-    metaData: Object
+    metaData: Object,
+    flaggedMeasurementIds: [
+      {
+        type: mongoose.Types.ObjectId,
+        ref: "Measurements",
+      },
+    ],
   },
   {
     timestamps: true,
@@ -61,6 +67,13 @@ const alertsAuditSchema = mongoose.Schema(
     actionBy: { type: mongoose.Types.ObjectId, ref: "Admin" },
     actionDate: { type: Date, default: Date.now },
     recipients: [recipientSchema],
+    metaData: Object,
+    flaggedMeasurementIds: [
+      {
+        type: mongoose.Types.ObjectId,
+        ref: "Measurements",
+      },
+    ],
   },
   {
     timestamps: true,
@@ -69,8 +82,8 @@ const alertsAuditSchema = mongoose.Schema(
 
 const AlertsAudit = mongoose.model("AlertsAudit", alertsAuditSchema);
 
-// Pre-hook to log single alert deletions
-alertsSchema.pre("sindOneAndDelete", async function () {
+// Fix the typo in the hook name - 'sindOneAndDelete' to 'findOneAndDelete'
+alertsSchema.pre("findOneAndDelete", async function () {
   const docToDelete = await this.model.findOne(this.getFilter());
   if (docToDelete) {
     console.log("Logging findOneAndDelete to audit", docToDelete);
@@ -84,6 +97,7 @@ alertsSchema.pre("sindOneAndDelete", async function () {
       actionBy: docToDelete.actionBy,
       actionDate: docToDelete.actionDate,
       recipients: docToDelete.recipients,
+      flaggedMeasurementIds: docToDelete.flaggedMeasurementIds,
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -107,6 +121,7 @@ alertsSchema.pre("deleteMany", async function () {
       actionBy: doc.actionBy,
       actionDate: doc.actionDate,
       recipients: doc.recipients,
+      flaggedMeasurementIds: doc.flaggedMeasurementIds,
       deletedAt: new Date(),
     }));
 
@@ -131,6 +146,7 @@ alertsSchema.pre("deleteOne", async function () {
       actionBy: docToDelete.actionBy,
       actionDate: docToDelete.actionDate,
       recipients: docToDelete.recipients,
+      flaggedMeasurementIds: docToDelete.flaggedMeasurementIds,
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -152,6 +168,7 @@ alertsSchema.pre("findOneAndUpdate", async function () {
       actionBy: docToUpdate.actionBy,
       actionDate: docToUpdate.actionDate,
       recipients: docToUpdate.recipients,
+      flaggedMeasurementIds: docToUpdate.flaggedMeasurementIds,
       deletedAt: null, // No deletion happening
     });
     await auditLog.save();
@@ -173,6 +190,7 @@ alertsSchema.pre("updateMany", async function () {
       actionBy: doc.actionBy,
       actionDate: doc.actionDate,
       recipients: doc.recipients,
+      flaggedMeasurementIds: doc.flaggedMeasurementIds,
       deletedAt: null, // No deletion happening
     }));
 

package/src/models/dataCompleteness.js

@@ -0,0 +1,21 @@
+import mongoose from "mongoose";
+
+const dataCompletenessSchema = mongoose.Schema(
+  {
+    monitorId: { type: ObjectId, ref: "Monitors" },
+    supplierId: { type: ObjectId, ref: "MonitorSuppliers" },
+    parameter: String,
+    count: Number,
+    threshold: Number,
+    completeness: Number, // percent 0–100
+    measurementsStartTime: Date,
+    measurementsEndTime: Date,
+  },
+  { timestamps: true }
+);
+const DataCompleteness = mongoose.model(
+  "DataCompleteness",
+  dataCompletenessSchema
+);
+
+export { dataCompletenessSchema, DataCompleteness };