@justair/justair-library 4.8.28 → 4.8.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "4.8.28",
+  "version": "4.8.30",
   "description": "JustAir Internal Library",
   "main": "src/index.js",
   "type": "module",
@@ -17,11 +17,12 @@
   "license": "ISC",
   "dependencies": {
     "mongoose": "^7.8.3",
+    "nanoid": "^5.1.6",
     "winston": "^3.10.0"
   },
   "devDependencies": {
-    "typescript": "^5.3.2",
     "@types/node": "^16.0.0",
-    "ts-node": "^10.0.0"
+    "ts-node": "^10.0.0",
+    "typescript": "^5.3.2"
   }
 }

package/src/models/monitors.js

@@ -237,7 +237,8 @@ const monitorsSchema = mongoose.Schema(
     latestAQI_PM2_5: Number,
     notes: [noteSchema],
     calculatedAverages: [Object],
-    images: [String],
+    image: String,
+    images: [String], // deprecated as of 2/9/26
     isActive: { type: Boolean, default: true },
     parameterThresholds: Object,
     completionPercentageThresholds: Object,

package/src/models/sampleSites.js

@@ -1,4 +1,7 @@
 import mongoose from "mongoose";
+import { customAlphabet } from 'nanoid';
+const generateSiteCode = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 8);
+
 const sampleParametersEnum = [
   "C6H6", // Benzene
   "PB", // Lead
@@ -39,6 +42,7 @@ const noteSchema = mongoose.Schema({
 const sampleSiteAuditSchema = mongoose.Schema(
   {
     sampleSiteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
+    sampleSiteCode: { type: String }, // reference to SampleSites.code
     orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
     timeUpdated: Date,
     deletedAt: { type: Date, default: Date.now }, // Only populated on delete
@@ -60,6 +64,7 @@ const SampleSiteAudit = mongoose.model("SampleSiteAudit", sampleSiteAuditSchema)
 const sampleSitesSchema = mongoose.Schema(
   {
     name: { type: String },
+    code: { type: String, unique: true },
     managedBy: { type: String },
     sponsoredBy: { type: String },
     lastSamplePeriodStartDate: { type: Date },
@@ -108,6 +113,14 @@ const sampleSitesSchema = mongoose.Schema(
   }
 );
 
+// Update pre-save hook
+sampleSitesSchema.pre('save', function (next) {
+  if (!this.code) {
+    this.code = generateSiteCode();
+  }
+  next();
+});
+  
 // Geographic queries - already exists
 sampleSitesSchema.index({ "location.gps": "2dsphere" }); // use location.gps for geospatial queries
 
@@ -137,6 +150,7 @@ sampleSitesSchema.pre("findOneAndDelete", async function () {
     if (coordinates) {
       const auditLog = new SampleSiteAudit({
         sampleSiteId: docToDelete._id,
+        sampleSiteCode: docToDelete.code,
         orgId: docToDelete.sponsor,
         timeUpdated: docToDelete.updatedAt,
         sampleSiteLocation: {
@@ -167,6 +181,7 @@ sampleSitesSchema.pre("deleteMany", async function () {
       if (coordinates) {
           return {
             sampleSiteId: doc._id,
+            sampleSiteCode: doc.code,
             orgId: doc.sponsor,
             timeUpdated: doc.updatedAt,
             sampleSiteLocation: {
@@ -201,6 +216,7 @@ sampleSitesSchema.pre("deleteOne", async function () {
     if (coordinates) {
       const auditLog = new SampleSiteAudit({
         sampleSiteId: docToDelete._id,
+        sampleSiteCode: docToDelete.code,
         orgId: docToDelete.sponsor,
         timeUpdated: docToDelete.updatedAt,
         sampleSiteLocation: {
@@ -229,6 +245,7 @@ sampleSitesSchema.pre("updateMany", async function () {
       if (coordinates) {
           return {
             sampleSiteId: doc._id,
+            sampleSiteCode: doc.code,
             orgId: doc.sponsor,
             timeUpdated: doc.updatedAt,
             sampleSiteLocation: {

package/src/models/samples.js

@@ -0,0 +1,165 @@
+import mongoose from "mongoose";
+
+// Samples Audit Schema
+const samplesAuditSchema = mongoose.Schema(
+  {
+    siteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    siteCode: { type: String }, // reference to SampleSites.code
+    periodStartDate: { type: Date },
+    periodEndDate: { type: Date },
+    parameterName: { type: String },
+    parameterValue: { type: Number },
+    parameterUnit: { type: String },
+    upperDetectionLimit: { type: Number },
+    lowerDetectionLimit: { type: Number },
+    deletedAt: { type: Date, default: Date.now }, // Only populated on delete
+  },
+  {
+    timestamps: true,
+
+  }
+);
+
+// Create the SamplesAudit model
+const SamplesAudit = mongoose.model("SamplesAudit", samplesAuditSchema);
+
+// Samples Schema
+const samplesSchema = mongoose.Schema(
+  {
+    siteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    siteCode: { type: String }, // reference to SampleSites.code
+    periodStartDate: { type: Date },
+    periodEndDate: { type: Date },
+    parameterName: { type: String },
+    parameterValue: { type: Number },
+    parameterUnit: { type: String },
+    upperDetectionLimit: { type: Number },
+    lowerDetectionLimit: { type: Number },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Primary query pattern index (descending periodStartDate for latest data first)
+samplesSchema.index({ siteId: 1, periodStartDate: -1 });
+// Pollutant-based queries
+samplesSchema.index({ siteId: 1, parameterName: 1 });
+
+// Pre-hook to log single document deletions
+samplesSchema.pre("findOneAndDelete", async function () {
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
+  if (docToDelete) {
+    console.log("Logging findOneAndDelete to audit", docToDelete);
+    const auditLog = new SamplesAudit({
+      siteId: docToDelete.siteId,
+      orgId: docToDelete.orgId,
+      siteCode: docToDelete.siteCode,
+      periodStartDate: docToDelete.periodStartDate,
+      periodEndDate: docToDelete.periodEndDate,
+      parameterName: docToDelete.parameterName,
+      parameterValue: docToDelete.parameterValue,
+      parameterUnit: docToDelete.parameterUnit,
+      upperDetectionLimit: docToDelete.upperDetectionLimit,
+      lowerDetectionLimit: docToDelete.lowerDetectionLimit,
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log multiple document deletions
+samplesSchema.pre("deleteMany", async function () {
+  console.log("deleteMany pre-hook triggered");
+  const docsToDelete = await this.model.find(this.getFilter()).lean();
+  if (docsToDelete.length) {
+    console.log(`Logging ${docsToDelete.length} documents to audit`);
+    const auditLogs = docsToDelete.map((doc) => ({
+      siteId: doc.siteId,
+      orgId: doc.orgId,
+      siteCode: doc.siteCode,
+      periodStartDate: doc.periodStartDate,
+      periodEndDate: doc.periodEndDate,
+      parameterName: doc.parameterName,
+      parameterValue: doc.parameterValue,
+      parameterUnit: doc.parameterUnit,
+      upperDetectionLimit: doc.upperDetectionLimit,
+      lowerDetectionLimit: doc.lowerDetectionLimit,
+      deletedAt: new Date(),
+    }));
+    await SamplesAudit.insertMany(auditLogs);
+  }
+});
+
+// Pre-hook to log a single document deletion (for deleteOne)
+samplesSchema.pre("deleteOne", async function () {
+  console.log("deleteOne pre-hook triggered");
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
+  if (docToDelete) {
+    console.log("Logging deleteOne to audit", docToDelete);
+    const auditLog = new SamplesAudit({
+      siteId: docToDelete.siteId,
+      orgId: docToDelete.orgId,
+      siteCode: docToDelete.siteCode,
+      periodStartDate: docToDelete.periodStartDate,
+      periodEndDate: docToDelete.periodEndDate,
+      parameterName: docToDelete.parameterName,
+      parameterValue: docToDelete.parameterValue,
+      parameterUnit: docToDelete.parameterUnit,
+      upperDetectionLimit: docToDelete.upperDetectionLimit,
+      lowerDetectionLimit: docToDelete.lowerDetectionLimit,
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log single document updates
+samplesSchema.pre("findOneAndUpdate", async function () {
+  const docToUpdate = await this.model.findOne(this.getFilter()).lean();
+  if (docToUpdate) {
+    console.log("Logging findOneAndUpdate to audit", docToUpdate);
+    const auditLog = new SamplesAudit({
+      siteId: docToUpdate.siteId,
+      orgId: docToUpdate.orgId,
+      siteCode: docToUpdate.siteCode,
+      periodStartDate: docToUpdate.periodStartDate,
+      periodEndDate: docToUpdate.periodEndDate,
+      parameterName: docToUpdate.parameterName,
+      parameterValue: docToUpdate.parameterValue,
+      parameterUnit: docToUpdate.parameterUnit,
+      upperDetectionLimit: docToUpdate.upperDetectionLimit,
+      lowerDetectionLimit: docToUpdate.lowerDetectionLimit,
+      deletedAt: null,
+    });
+    await auditLog.save();
+  }
+})
+
+// Pre-hook to log multiple document updates
+samplesSchema.pre("updateMany", async function () {
+  const docsToUpdate = await this.model.find(this.getFilter()).lean();
+  if (docsToUpdate.length) {
+    console.log(`Logging ${docsToUpdate.length} documents to audit`);
+    const auditLogs = docsToUpdate.map((doc) => ({
+      siteId: doc.siteId,
+      orgId: doc.orgId,
+      siteCode: doc.siteCode,
+      periodStartDate: doc.periodStartDate,
+      periodEndDate: doc.periodEndDate,
+      parameterName: doc.parameterName,
+      parameterValue: doc.parameterValue,
+      parameterUnit: doc.parameterUnit,
+      upperDetectionLimit: doc.upperDetectionLimit,
+      lowerDetectionLimit: doc.lowerDetectionLimit,
+      deletedAt: null,
+    }));
+    await SamplesAudit.insertMany(auditLogs);
+  }
+});
+
+// Create the SampleSites model
+const Samples = mongoose.model("Samples", samplesSchema);
+export { samplesSchema, Samples, SamplesAudit, samplesAuditSchema };