@justair/justair-library 4.8.43 → 4.8.45

package/package.json

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

package/src/index.js

@@ -19,6 +19,7 @@ import {
   monitorAuditSchema,
   MonitorAudit,
   parametersEnum,
+  deploymentTypesEnum,
 } from "./models/monitors.js";
 import { organizationsSchema, Organizations } from "./models/organizations.js";
 import {
@@ -123,6 +124,7 @@ export {
   MonitorAudit,
   monitorAuditSchema,
   parametersEnum,
+  deploymentTypesEnum,
   AlertsAudit,
   Alerts,
   alertsSchema,

package/src/models/monitorSuppliers.js

@@ -1,4 +1,5 @@
 import mongoose from "mongoose";
+import { deploymentTypesEnum } from "./monitors.js";
 
 const errorLogSchema = mongoose.Schema(
   {
@@ -35,6 +36,10 @@ const monitorSuppliersSchema = mongoose.Schema(
     latestErrorLogs: {
       type: [errorLogSchema],
     },
+    supportedDeploymentTypes: {
+      type: [String],
+      enum: Object.values(deploymentTypesEnum),
+    },
   },
   {
     timestamps: true,

package/src/models/monitors.js

@@ -22,6 +22,11 @@ const parametersEnum = [
   "H2S",
 ];
 
+const deploymentTypesEnum = {
+  STATIONARY: "stationary",
+  MOBILE: "mobile",
+};
+
 const noteSchema = mongoose.Schema({
   note: {
     type: String,
@@ -158,6 +163,7 @@ const monitorAuditSchema = mongoose.Schema(
       type: [correctionHistorySchema],
       default: [],
     },
+    deploymentType: String,
   },
   {
     timestamps: true,
@@ -264,6 +270,11 @@ const monitorsSchema = mongoose.Schema(
       type: [{ parameter: String, timestamp: Date, isPaused: Boolean }],
       default: [],
     },
+    deploymentType: {
+      type: String,
+      enum: Object.values(deploymentTypesEnum),
+      default: deploymentTypesEnum.STATIONARY,
+    },
   },
   {
     timestamps: true,
@@ -289,6 +300,9 @@ monitorsSchema.index({ parameters: 1 });
 //network metrics for anomalies
 monitorsSchema.index({ sponsor: 1, isActive: 1, monitorSupplier: 1 });
 
+// Deployment type filtering
+monitorsSchema.index({ deploymentType: 1 });
+
 // Pre-hook to log single document deletions
 monitorsSchema.pre("findOneAndDelete", async function () {
   const docToDelete = await this.model.findOne(this.getFilter()).lean();
@@ -311,6 +325,7 @@ monitorsSchema.pre("findOneAndDelete", async function () {
       corrections: docToDelete.corrections,
       correctionHistory: docToDelete.correctionHistory,
       applyCorrections: docToDelete.applyCorrections,
+      deploymentType: docToDelete.deploymentType,
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -338,6 +353,7 @@ monitorsSchema.pre("deleteMany", async function () {
       corrections: doc.corrections,
       correctionHistory: doc.correctionHistory,
       applyCorrections: doc.applyCorrections,
+      deploymentType: doc.deploymentType,
       deletedAt: new Date(),
     }));
 
@@ -369,6 +385,7 @@ monitorsSchema.pre("deleteOne", async function () {
       corrections: docToDelete.corrections,
       correctionHistory: docToDelete.correctionHistory,
       applyCorrections: docToDelete.applyCorrections,
+      deploymentType: docToDelete.deploymentType,
       deletedAt: new Date(),
     });
     await auditLog.save();
@@ -394,6 +411,7 @@ monitorsSchema.pre("updateMany", async function () {
       corrections: doc.corrections,
       correctionHistory: doc.correctionHistory,
       applyCorrections: doc.applyCorrections,
+      deploymentType: doc.deploymentType,
       deletedAt: null, // Not a deletion, so this field is null
     }));
 
@@ -404,4 +422,4 @@ monitorsSchema.pre("updateMany", async function () {
 // Create the Monitors model
 const Monitors = mongoose.model("Monitors", monitorsSchema);
 
-export { monitorsSchema, Monitors, monitorAuditSchema, MonitorAudit, parametersEnum };
+export { monitorsSchema, Monitors, monitorAuditSchema, MonitorAudit, parametersEnum, deploymentTypesEnum };

package/src/models/samples.js

@@ -30,6 +30,8 @@ const samplesAuditSchema = mongoose.Schema(
     upperDetectionLimit: { type: Number },
     lowerDetectionLimit: { type: Number },
     deletedAt: { type: Date, default: Date.now }, // Only populated on delete
+    uploadedByName: { type: String }, // Name of the user who uploaded the sample
+    uploadDate: { type: Date }, // Date when the sample was uploaded
   },
   {
     timestamps: true,
@@ -54,6 +56,7 @@ const samplesSchema = mongoose.Schema(
     upperDetectionLimit: { type: Number },
     lowerDetectionLimit: { type: Number },
     uploadedByName: { type: String }, // Name of the user who uploaded the sample
+    uploadDate: { type: Date }, // Date when the sample was uploaded
   },
   {
     timestamps: true,
@@ -64,6 +67,8 @@ const samplesSchema = mongoose.Schema(
 samplesSchema.index({ siteId: 1, periodStartDate: -1 });
 // Pollutant-based queries
 samplesSchema.index({ siteId: 1, parameterName: 1 });
+// Upload history queries (show samples grouped by upload date)
+samplesSchema.index({ siteId: 1, uploadDate: -1 });
 
 // Pre-hook to log single document deletions
 samplesSchema.pre("findOneAndDelete", async function () {
@@ -82,6 +87,8 @@ samplesSchema.pre("findOneAndDelete", async function () {
       upperDetectionLimit: docToDelete.upperDetectionLimit,
       lowerDetectionLimit: docToDelete.lowerDetectionLimit,
       deletedAt: new Date(),
+      uploadedByName: docToDelete.uploadedByName,
+      uploadDate: docToDelete.uploadDate,
     });
     await auditLog.save();
   }
@@ -105,6 +112,8 @@ samplesSchema.pre("deleteMany", async function () {
       upperDetectionLimit: doc.upperDetectionLimit,
       lowerDetectionLimit: doc.lowerDetectionLimit,
       deletedAt: new Date(),
+      uploadedByName: doc.uploadedByName,
+      uploadDate: doc.uploadDate,
     }));
     await SamplesAudit.insertMany(auditLogs);
   }
@@ -128,6 +137,8 @@ samplesSchema.pre("deleteOne", async function () {
       upperDetectionLimit: docToDelete.upperDetectionLimit,
       lowerDetectionLimit: docToDelete.lowerDetectionLimit,
       deletedAt: new Date(),
+      uploadedByName: docToDelete.uploadedByName,
+      uploadDate: docToDelete.uploadDate,
     });
     await auditLog.save();
   }
@@ -150,6 +161,8 @@ samplesSchema.pre("findOneAndUpdate", async function () {
       upperDetectionLimit: docToUpdate.upperDetectionLimit,
       lowerDetectionLimit: docToUpdate.lowerDetectionLimit,
       deletedAt: null,
+      uploadedByName: docToUpdate.uploadedByName,
+      uploadDate: docToUpdate.uploadDate,
     });
     await auditLog.save();
   }
@@ -172,6 +185,8 @@ samplesSchema.pre("updateMany", async function () {
       upperDetectionLimit: doc.upperDetectionLimit,
       lowerDetectionLimit: doc.lowerDetectionLimit,
       deletedAt: null,
+      uploadedByName: doc.uploadedByName,
+      uploadDate: doc.uploadDate,
     }));
     await SamplesAudit.insertMany(auditLogs);
   }