@justair/justair-library 3.4.1 → 3.4.2

package/src/models/measurements.js

@@ -1,132 +1,133 @@
-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,
-    normalizedMeasurements: Object,
-  },
-  {
-    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,
-    normalizedMeasurements: Object,
-  },
-  {
-    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,
+    normalizedMeasurements: Object,
+  },
+  {
+    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,
+    normalizedMeasurements: Object,
+    flags: Object
+  },
+  {
+    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,25 +1,25 @@
-import mongoose from "mongoose";
-
-const monitorRequestsSchema = mongoose.Schema(
-  {
-    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    monitorOwnerOrgName: String,
-    monitorReceiverOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    monitorReceiverOrgName: 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 };
+import mongoose from "mongoose";
+
+const monitorRequestsSchema = mongoose.Schema(
+  {
+    monitorOwnerOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    monitorOwnerOrgName: String,
+    monitorReceiverOrg: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    monitorReceiverOrgName: 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);