@justair/justair-library 3.3.4 → 3.3.5

package/src/models/measurements.js

@@ -1,130 +1,130 @@
-import mongoose from "mongoose";
-
-// 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 },
-    measurements: Object,
-    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 });
-
-// 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: docToDelete.monitorId,
-      orgId: docToDelete.orgId,
-      timeUpdated: docToDelete.timeUpdated,
-      measurements: docToDelete.measurements,
-      monitorState: docToDelete.monitorState,
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// 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 (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: new Date(),
-    }));
-
-    await Audit.insertMany(auditLogs);
-  }
-});
-
-// 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 (docToDelete) {
-    console.log("Logging deleteOne to audit", docToDelete);
-    const auditLog = new Audit({
-      monitorId: docToDelete.monitorId,
-      orgId: docToDelete.orgId,
-      timeUpdated: docToDelete.timeUpdated,
-      measurements: docToDelete.measurements,
-      monitorState: docToDelete.monitorState,
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log single document updates
-measurementsSchema.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 Audit({
-      monitorId: docToUpdate.monitorId,
-      orgId: docToUpdate.orgId,
-      timeUpdated: docToUpdate.timeUpdated,
-      measurements: docToUpdate.measurements,
-      monitorState: docToUpdate.monitorState,
-      deletedAt: null, // No deletion happening, so set it to null or undefined
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log multiple document updates
-measurementsSchema.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) => ({
-      monitorId: doc.monitorId,
-      orgId: doc.orgId,
-      timeUpdated: doc.timeUpdated,
-      measurements: doc.measurements,
-      monitorState: doc.monitorState,
-      deletedAt: null, // No deletion happening
-    }));
-
-    await Audit.insertMany(auditLogs);
-  }
-});
-
-const Measurements = mongoose.model("Measurements", measurementsSchema);
-
-export { measurementsSchema, Measurements, Audit, auditSchema };
+import mongoose from "mongoose";
+
+// 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 },
+    measurements: Object,
+    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 });
+
+// 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: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// 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 (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: new Date(),
+    }));
+
+    await Audit.insertMany(auditLogs);
+  }
+});
+
+// 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 (docToDelete) {
+    console.log("Logging deleteOne to audit", docToDelete);
+    const auditLog = new Audit({
+      monitorId: docToDelete.monitorId,
+      orgId: docToDelete.orgId,
+      timeUpdated: docToDelete.timeUpdated,
+      measurements: docToDelete.measurements,
+      monitorState: docToDelete.monitorState,
+      deletedAt: new Date(),
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log single document updates
+measurementsSchema.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 Audit({
+      monitorId: docToUpdate.monitorId,
+      orgId: docToUpdate.orgId,
+      timeUpdated: docToUpdate.timeUpdated,
+      measurements: docToUpdate.measurements,
+      monitorState: docToUpdate.monitorState,
+      deletedAt: null, // No deletion happening, so set it to null or undefined
+    });
+    await auditLog.save();
+  }
+});
+
+// Pre-hook to log multiple document updates
+measurementsSchema.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) => ({
+      monitorId: doc.monitorId,
+      orgId: doc.orgId,
+      timeUpdated: doc.timeUpdated,
+      measurements: doc.measurements,
+      monitorState: doc.monitorState,
+      deletedAt: null, // No deletion happening
+    }));
+
+    await Audit.insertMany(auditLogs);
+  }
+});
+
+const Measurements = mongoose.model("Measurements", measurementsSchema);
+
+export { measurementsSchema, Measurements, Audit, auditSchema };

package/src/models/monitorRequests.js

@@ -1,16 +1,16 @@
-import mongoose from 'mongoose';
-
-const monitorRequestsSchema = mongoose.Schema({
-    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
-    monitorOwnerOrgName: String,
-    monitorSharerOrg: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
-    monitorSharerOrgName: String,
-    monitorList: [{ type: mongoose.Types.ObjectId, ref: 'Monitors' }],
-    status: { type: String, enum: ['Requested', 'Approved', 'Denied', 'Cancel', 'Deleted'] }
-}, {
-    timestamps: true
-});
-
-const MonitorRequests = mongoose.model('MonitorRequests', monitorRequestsSchema);
-
+import mongoose from 'mongoose';
+
+const monitorRequestsSchema = mongoose.Schema({
+    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
+    monitorOwnerOrgName: String,
+    monitorSharerOrg: { type: mongoose.Types.ObjectId, ref: 'Organizations' },
+    monitorSharerOrgName: String,
+    monitorList: [{ type: mongoose.Types.ObjectId, ref: 'Monitors' }],
+    status: { type: String, enum: ['Requested', 'Approved', 'Denied', 'Cancel', 'Deleted'] }
+}, {
+    timestamps: true
+});
+
+const MonitorRequests = mongoose.model('MonitorRequests', monitorRequestsSchema);
+
 export {monitorRequestsSchema, MonitorRequests};

package/src/models/monitorSuppliers.js

@@ -1,12 +1,12 @@
-import mongoose from "mongoose";
-
-const monitorSuppliersSchema = mongoose.Schema({
-    name : String
-},
-{
-    timestamps: true
-});
-
-const MonitorSuppliers = mongoose.model("MonitorSuppliers", monitorSuppliersSchema);
-
+import mongoose from "mongoose";
+
+const monitorSuppliersSchema = mongoose.Schema({
+    name : String
+},
+{
+    timestamps: true
+});
+
+const MonitorSuppliers = mongoose.model("MonitorSuppliers", monitorSuppliersSchema);
+
 export {monitorSuppliersSchema, MonitorSuppliers};

package/src/models/monitorType.js

@@ -0,0 +1,40 @@
+import mongoose from "mongoose";
+
+const parametersEnum = [
+  "NO2",
+  "SO2",
+  "PM2.5",
+  "PM10",
+  "Temperature",
+  "Humidity",
+  "OZONE",
+  "VOC",
+  "CO",
+  "NO",
+  "PM1",
+  "WS And Direction",
+];
+
+const monitorTypeSchema = mongoose.Schema(
+  {
+    model: {
+      type: String,
+      required: true,
+    },
+
+    supplier: {
+      type: mongoose.Types.ObjectId,
+      required: true,
+      ref: "MonitorSuppliers",
+    },
+
+    parameters: {
+      type: String,
+      enum: parametersEnum,
+      required: true,
+    },
+  },
+  { timestamps: true }
+);
+
+const monitorType = mongoose.model("MonitorType", monitorTypeSchema);

package/src/models/monitors.js

@@ -1,215 +1,98 @@
-import mongoose from "mongoose";
-
-// Monitor Audit Schema
-const monitorAuditSchema = mongoose.Schema(
-  {
-    monitorId: { type: mongoose.Types.ObjectId, ref: "Monitors" },
-    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    timeUpdated: Date,
-    deletedAt: { type: Date, default: Date.now }, // Only populated on delete
-    monitorProperties: Object, // Stores properties of the monitor
-    monitorState: String, // Tracks the state of the monitor (e.g., "Deployed", "Maintenance")
-    monitorLocation: {
-      // Monitor GPS location (lat, lon)
-      type: { type: String, enum: ["Point"], required: true },
-      coordinates: { type: [Number], required: true },
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Create the MonitorAudit model
-const MonitorAudit = mongoose.model("MonitorAudit", monitorAuditSchema);
-
-// Monitors Schema
-const monitorsSchema = mongoose.Schema(
-  {
-    monitorCode: String,
-    monitorSupplier: {
-      type: String,
-      enum: [
-        "clarity",
-        "aeroqual",
-        "purple air",
-        "reference monitor",
-        "earthview",
-        "sensit",
-        "blue sky",
-        "aq mesh",
-        "quant aq",
-      ],
-    },
-    monitorType: String,
-    monitorIdFromSupplier: String,
-    measurementUpdate: Date,
-    monitorProperties: Object,
-    isPrivate: { type: Boolean, default: false, required: true },
-    monitorState: {
-      type: String,
-      enum: ["Collocation", "Deployed", "Maintenance", "Pending Deployment"],
-    },
-    monitorStateHistory: [Object],
-    monitorAlertStatus: {
-      type: String,
-      enum: [
-        "Good",
-        "Moderate",
-        "Unhealthy for SG",
-        "Unhealthy",
-        "Very Unhealthy",
-        "Hazardous",
-        "Bad",
-      ],
-      default: "Good",
-    },
-    sponsor: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    sponsorName: String,
-    monitorLatitude: Number,
-    monitorLongitude: Number,
-    gpsLocation: {
-      type: { type: String, enum: ["Point"], required: true },
-      coordinates: { type: [Number], required: true },
-    },
-    location: Object,
-    context: [String],
-    colocationDate: Date,
-    deploymentDate: Date,
-    subscriptionDate: Date,
-    parameters: [
-      {
-        type: String,
-        enum: [
-          "NO2",
-          "SO2",
-          "PM2.5",
-          "PM10",
-          "Temperature",
-          "Humidity",
-          "OZONE",
-          "VOC",
-          "CO",
-          "NO",
-          "PM1",
-          "WS And Direction",
-        ],
-      },
-    ],
-    latestPM2_5: Number,
-    latestAQI_PM2_5: Number,
-    notes: [Object],
-    calculatedAverages: [Object],
-    images: [String],
-    isActive: { type: Boolean, default: true },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-monitorsSchema.index({ gpsLocation: "2dsphere" });
-monitorsSchema.index({ monitorSupplier: 1 });
-monitorsSchema.index({ monitorIdFromSupplier: 1 });
-monitorsSchema.index({ monitorState: 1 });
-
-// Pre-hook to log single document deletions
-monitorsSchema.pre("findOneAndDelete", async function () {
-  const docToDelete = await this.model.findOne(this.getFilter()).lean();
-  if (docToDelete) {
-    console.log("Logging findOneAndDelete to monitor audit", docToDelete);
-    const auditLog = new MonitorAudit({
-      monitorId: docToDelete._id,
-      orgId: docToDelete.sponsor,
-      timeUpdated: docToDelete.updatedAt,
-      monitorProperties: docToDelete.monitorProperties,
-      monitorState: docToDelete.monitorState,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [
-          docToDelete.monitorLongitude,
-          docToDelete.monitorLatitude,
-        ],
-      },
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log multiple document deletions
-monitorsSchema.pre("deleteMany", async function () {
-  console.log("deleteMany pre-hook triggered for monitors");
-  const docsToDelete = await this.model.find(this.getFilter()).lean();
-
-  if (docsToDelete.length) {
-    console.log(`Logging ${docsToDelete.length} monitor documents to audit`);
-    const auditLogs = docsToDelete.map((doc) => ({
-      monitorId: doc._id,
-      orgId: doc.sponsor,
-      timeUpdated: doc.updatedAt,
-      monitorProperties: doc.monitorProperties,
-      monitorState: doc.monitorState,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [doc.monitorLongitude, doc.monitorLatitude],
-      },
-      deletedAt: new Date(),
-    }));
-
-    await MonitorAudit.insertMany(auditLogs);
-  }
-});
-
-// Pre-hook to log a single document deletion (for deleteOne)
-monitorsSchema.pre("deleteOne", async function () {
-  console.log("deleteOne pre-hook triggered for monitors");
-  const docToDelete = await this.model.findOne(this.getFilter()).lean();
-
-  if (docToDelete) {
-    console.log("Logging deleteOne to monitor audit", docToDelete);
-    const auditLog = new MonitorAudit({
-      monitorId: docToDelete._id,
-      orgId: docToDelete.sponsor,
-      timeUpdated: docToDelete.updatedAt,
-      monitorProperties: docToDelete.monitorProperties,
-      monitorState: docToDelete.monitorState,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [
-          docToDelete.monitorLongitude,
-          docToDelete.monitorLatitude,
-        ],
-      },
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
-  }
-});
-
-// Pre-hook to log multiple document updates
-monitorsSchema.pre("updateMany", async function () {
-  const docsToUpdate = await this.model.find(this.getFilter()).lean();
-  if (docsToUpdate.length) {
-    console.log(`Logging ${docsToUpdate.length} monitor documents to audit`);
-    const auditLogs = docsToUpdate.map((doc) => ({
-      monitorId: doc._id,
-      orgId: doc.sponsor,
-      timeUpdated: doc.updatedAt,
-      monitorProperties: doc.monitorProperties,
-      monitorState: doc.monitorState,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [doc.monitorLongitude, doc.monitorLatitude],
-      },
-      deletedAt: null, // Not a deletion, so this field is null
-    }));
-
-    await MonitorAudit.insertMany(auditLogs);
-  }
-});
-
-// Create the Monitors model
-const Monitors = mongoose.model("Monitors", monitorsSchema);
-
-export { monitorsSchema, Monitors, monitorAuditSchema, MonitorAudit };
+import mongoose from "mongoose";import { emitWarning } from "process";
+const parametersEnum = [
+  "NO2",
+  "SO2",
+  "PM2.5",
+  "PM10",
+  "Temperature",
+  "Humidity",
+  "OZONE",
+  "VOC",
+  "CO",
+  "NO",
+  "PM1",
+  "WS And Direction",
+];
+
+// Monitors Schema
+const monitorsSchema = mongoose.Schema(
+  {
+    monitorCode: String,
+    //keep up to date with diff manufacturers
+    monitorSupplier: {
+      type: String,
+      enum: [
+        "clarity",
+        "aeroqual",
+        "purple air",
+        "reference monitor",
+        "earthview",
+        "sensit",
+        "blue sky",
+        "aq mesh",
+        "quant aq",
+      ],
+    },
+    monitorType: String,
+    monitorIdFromSupplier: String,
+    measurementUpdate: Date,
+    monitorProperties: Object,
+    isPrivate: { type: Boolean, default: false },
+    monitorState: {
+      type: String,
+      enum: ["Collocation", "Deployed", "Maintenance", "Pending Deployment"],
+    },
+    monitorStateHistory: [Object],
+    monitorAlertStatus: {
+      type: String,
+      enum: [
+        "Good",
+        "Moderate",
+        "Unhealthy for SG",
+        "Unhealthy",
+        "Very Unhealthy",
+        "Hazardous",
+        "Bad",
+      ],
+      default: "Good",
+    },
+    sponsor: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    sponsorName: String,
+    monitorLatitude: Number,
+    monitorLongitude: Number,
+    gpsLocation: {
+      type: { type: String, enul: ["Point"], required: true },
+      coordinates: { type: [Number], required: true },
+    },
+    location: Object, //copied over from associated org
+    context: [String],
+    colocationDate: Date,
+    deploymentDate: Date,
+    subscriptionDate: Date,
+    parameters: [
+      {
+        type: String,
+        enum: parametersEnum,
+      },
+    ],
+    latestPM2_5: Number,
+    latestAQI_PM2_5: Number,
+    notes: [Object],
+    calculatedAverages: [Object],
+    images: [String],
+    isActive: { type: Boolean, default: true },
+    parameterThresholds: Object 
+  },
+  {
+    timestamps: true,
+  }
+);
+
+monitorsSchema.index({ gpsLocation: "2dsphere" });
+monitorsSchema.index({ monitorSupplier: 1 });
+monitorsSchema.index({ monitorIdFromSupplier: 1 });
+monitorsSchema.index({ monitorState: 1 });
+
+const Monitors = mongoose.model("Monitors", monitorsSchema);
+
+export { monitorsSchema, Monitors };