@justair/justair-library 5.0.0-alpha.56f07df → 5.0.0-alpha.c16a87f

package/README.md

@@ -71,7 +71,7 @@ The following parameters were added to `HEAVY_METALS` and are now included in `s
 | id | Name |
 |---|---|
 | `BE` | Beryllium |
-| `COBALT` | Cobalt |
+| `CO` | Cobalt |
 | `MN` | Manganese |
 | `SE` | Selenium |
 

package/dist/constants/pollutants.d.ts

@@ -353,7 +353,7 @@ export namespace PARAMETERS {
     }
 }
 export namespace HEAVY_METALS {
-    namespace C6H6 {
+    export namespace C6H6 {
         let id_20: string;
         export { id_20 as id };
         let label_20: string;
@@ -371,7 +371,7 @@ export namespace HEAVY_METALS {
         let impacts_20: string;
         export { impacts_20 as impacts };
     }
-    namespace AS {
+    export namespace AS {
         let id_21: string;
         export { id_21 as id };
         let label_21: string;
@@ -389,7 +389,7 @@ export namespace HEAVY_METALS {
         let impacts_21: string;
         export { impacts_21 as impacts };
     }
-    namespace BA {
+    export namespace BA {
         let id_22: string;
         export { id_22 as id };
         let label_22: string;
@@ -407,7 +407,7 @@ export namespace HEAVY_METALS {
         let impacts_22: string;
         export { impacts_22 as impacts };
     }
-    namespace BE {
+    export namespace BE {
         let id_23: string;
         export { id_23 as id };
         let label_23: string;
@@ -425,7 +425,7 @@ export namespace HEAVY_METALS {
         let impacts_23: string;
         export { impacts_23 as impacts };
     }
-    namespace COBALT {
+    export namespace CO_1 {
         let id_24: string;
         export { id_24 as id };
         let label_24: string;
@@ -443,7 +443,8 @@ export namespace HEAVY_METALS {
         let impacts_24: string;
         export { impacts_24 as impacts };
     }
-    namespace NI {
+    export { CO_1 as CO };
+    export namespace NI {
         let id_25: string;
         export { id_25 as id };
         let label_25: string;
@@ -461,7 +462,7 @@ export namespace HEAVY_METALS {
         let impacts_25: string;
         export { impacts_25 as impacts };
     }
-    namespace CD {
+    export namespace CD {
         let id_26: string;
         export { id_26 as id };
         let label_26: string;
@@ -479,7 +480,7 @@ export namespace HEAVY_METALS {
         let impacts_26: string;
         export { impacts_26 as impacts };
     }
-    namespace CR {
+    export namespace CR {
         let id_27: string;
         export { id_27 as id };
         let label_27: string;
@@ -497,7 +498,7 @@ export namespace HEAVY_METALS {
         let impacts_27: string;
         export { impacts_27 as impacts };
     }
-    namespace PB {
+    export namespace PB {
         let id_28: string;
         export { id_28 as id };
         let label_28: string;
@@ -515,7 +516,7 @@ export namespace HEAVY_METALS {
         let impacts_28: string;
         export { impacts_28 as impacts };
     }
-    namespace FE {
+    export namespace FE {
         let id_29: string;
         export { id_29 as id };
         let label_29: string;
@@ -533,7 +534,7 @@ export namespace HEAVY_METALS {
         let impacts_29: string;
         export { impacts_29 as impacts };
     }
-    namespace MN {
+    export namespace MN {
         let id_30: string;
         export { id_30 as id };
         let label_30: string;
@@ -551,7 +552,7 @@ export namespace HEAVY_METALS {
         let impacts_30: string;
         export { impacts_30 as impacts };
     }
-    namespace SE {
+    export namespace SE {
         let id_31: string;
         export { id_31 as id };
         let label_31: string;
@@ -569,7 +570,7 @@ export namespace HEAVY_METALS {
         let impacts_31: string;
         export { impacts_31 as impacts };
     }
-    namespace CU {
+    export namespace CU {
         let id_32: string;
         export { id_32 as id };
         let label_32: string;
@@ -587,7 +588,7 @@ export namespace HEAVY_METALS {
         let impacts_32: string;
         export { impacts_32 as impacts };
     }
-    namespace ZN {
+    export namespace ZN {
         let id_33: string;
         export { id_33 as id };
         let label_33: string;

package/dist/index.d.ts

@@ -43,7 +43,6 @@ import { eventsAuditSchema } from "./models/events.js";
 import { MonitorAudit } from "./models/monitors.js";
 import { monitorAuditSchema } from "./models/monitors.js";
 import { parametersEnum } from "./models/monitors.js";
-import { legacyParametersEnum } from "./models/monitors.js";
 import { deploymentTypesEnum } from "./models/monitors.js";
 import { AlertsAudit } from "./models/alerts.js";
 import { Alerts } from "./models/alerts.js";
@@ -57,6 +56,8 @@ import { networkMetricsSchema } from "./models/networkMetrics.js";
 import { NetworkMetrics } from "./models/networkMetrics.js";
 import { rateOfChangeSchema } from "./models/rateOfChange.js";
 import { RateOfChange } from "./models/rateOfChange.js";
+import { sitesSchema } from "./models/sites.js";
+import { Sites } from "./models/sites.js";
 import { sampleSitesSchema } from "./models/sampleSites.js";
 import { SampleSites } from "./models/sampleSites.js";
 import { sampleSiteAuditSchema } from "./models/sampleSites.js";
@@ -69,5 +70,5 @@ import { SamplesAudit } from "./models/samples.js";
 import { sampleParameterReferenceConcentrations } from "./models/samples.js";
 import { PARAMETERS } from "./constants/pollutants.js";
 import { HEAVY_METALS } from "./constants/pollutants.js";
-export { Database, adminSchema, Admin, configurationsSchema, Configurations, measurementsSchema, Measurements, monitorRequestsSchema, MonitorRequests, monitorsSchema, Monitors, organizationsSchema, Organizations, usersSchema, Users, eventsSchema, Events, lightMonitorSchema, LightMonitors, monitorSuppliersSchema, MonitorSuppliers, contextsSchema, Contexts, parametersSchema, Parameters, announcementSchema, Announcements, jobsSchema, Jobs, apiKeySchema, ApiKey, UsageMetrics, usageMetricsSchema, Audit, auditSchema, EventsAudit, eventsAuditSchema, MonitorAudit, monitorAuditSchema, parametersEnum, legacyParametersEnum, deploymentTypesEnum, AlertsAudit, Alerts, alertsSchema, alertsAuditSchema, Features, featuresSchema, dataCompletenessSchema, DataCompleteness, networkMetricsSchema, NetworkMetrics, rateOfChangeSchema, RateOfChange, sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum, samplesSchema, Samples, samplesAuditSchema, SamplesAudit, sampleParameterReferenceConcentrations, PARAMETERS, HEAVY_METALS };
+export { Database, adminSchema, Admin, configurationsSchema, Configurations, measurementsSchema, Measurements, monitorRequestsSchema, MonitorRequests, monitorsSchema, Monitors, organizationsSchema, Organizations, usersSchema, Users, eventsSchema, Events, lightMonitorSchema, LightMonitors, monitorSuppliersSchema, MonitorSuppliers, contextsSchema, Contexts, parametersSchema, Parameters, announcementSchema, Announcements, jobsSchema, Jobs, apiKeySchema, ApiKey, UsageMetrics, usageMetricsSchema, Audit, auditSchema, EventsAudit, eventsAuditSchema, MonitorAudit, monitorAuditSchema, parametersEnum, deploymentTypesEnum, AlertsAudit, Alerts, alertsSchema, alertsAuditSchema, Features, featuresSchema, dataCompletenessSchema, DataCompleteness, networkMetricsSchema, NetworkMetrics, rateOfChangeSchema, RateOfChange, sitesSchema, Sites, sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum, samplesSchema, Samples, samplesAuditSchema, SamplesAudit, sampleParameterReferenceConcentrations, PARAMETERS, HEAVY_METALS };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AA8EA;;;iBAEC;yBAvBwB,oBAAoB;qBADxB,gBAAgB;4BAxDF,mBAAmB;sBAAnB,mBAAmB;qCAI/C,4BAA4B;+BAA5B,4BAA4B;mCAM5B,0BAA0B;6BAA1B,0BAA0B;sCAI1B,6BAA6B;gCAA7B,6BAA6B;+BAS7B,sBAAsB;yBAAtB,sBAAsB;oCACsB,2BAA2B;8BAA3B,2BAA2B;4BAQ3C,mBAAmB;sBAAnB,mBAAmB;6BAM/C,oBAAoB;uBAApB,oBAAoB;mCAbuB,2BAA2B;8BAA3B,2BAA2B;uCAItE,8BAA8B;iCAA9B,8BAA8B;+BACI,sBAAsB;yBAAtB,sBAAsB;iCAClB,wBAAwB;2BAAxB,wBAAwB;mCAQnB,2BAA2B;8BAA3B,2BAA2B;2BAC5C,kBAAkB;qBAAlB,kBAAkB;6BACd,oBAAoB;uBAApB,oBAAoB;6BACR,0BAA0B;mCAA1B,0BAA0B;sBAhCpE,0BAA0B;4BAA1B,0BAA0B;4BA4B1B,oBAAoB;kCAApB,oBAAoB;6BAfpB,sBAAsB;mCAAtB,sBAAsB;+BAAtB,sBAAsB;qCAAtB,sBAAsB;oCAAtB,sBAAsB;4BAyBtB,oBAAoB;uBAApB,oBAAoB;6BAApB,oBAAoB;kCAApB,oBAAoB;yBACc,sBAAsB;+BAAtB,sBAAsB;uCAIxD,8BAA8B;iCAA9B,8BAA8B;qCACgB,4BAA4B;+BAA5B,4BAA4B;mCAChC,0BAA0B;6BAA1B,0BAA0B;kCAYpE,yBAAyB;4BAAzB,yBAAyB;sCAAzB,yBAAyB;gCAAzB,yBAAyB;qCAAzB,yBAAyB;8BASzB,qBAAqB;wBAArB,qBAAqB;mCAArB,qBAAqB;6BAArB,qBAAqB;uDAArB,qBAAqB;2BAlBa,2BAA2B;6BAA3B,2BAA2B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.js"],"names":[],"mappings":"AAgFA;;;iBAEC;yBA1BwB,oBAAoB;qBADxB,gBAAgB;4BAvDF,mBAAmB;sBAAnB,mBAAmB;qCAI/C,4BAA4B;+BAA5B,4BAA4B;mCAM5B,0BAA0B;6BAA1B,0BAA0B;sCAI1B,6BAA6B;gCAA7B,6BAA6B;+BAQ7B,sBAAsB;yBAAtB,sBAAsB;oCACsB,2BAA2B;8BAA3B,2BAA2B;4BAQ3C,mBAAmB;sBAAnB,mBAAmB;6BAM/C,oBAAoB;uBAApB,oBAAoB;mCAbuB,2BAA2B;8BAA3B,2BAA2B;uCAItE,8BAA8B;iCAA9B,8BAA8B;+BACI,sBAAsB;yBAAtB,sBAAsB;iCAClB,wBAAwB;2BAAxB,wBAAwB;mCAQnB,2BAA2B;8BAA3B,2BAA2B;2BAC5C,kBAAkB;qBAAlB,kBAAkB;6BACd,oBAAoB;uBAApB,oBAAoB;6BACR,0BAA0B;mCAA1B,0BAA0B;sBA/BpE,0BAA0B;4BAA1B,0BAA0B;4BA2B1B,oBAAoB;kCAApB,oBAAoB;6BAfpB,sBAAsB;mCAAtB,sBAAsB;+BAAtB,sBAAsB;oCAAtB,sBAAsB;4BAyBtB,oBAAoB;uBAApB,oBAAoB;6BAApB,oBAAoB;kCAApB,oBAAoB;yBACc,sBAAsB;+BAAtB,sBAAsB;uCAIxD,8BAA8B;iCAA9B,8BAA8B;qCACgB,4BAA4B;+BAA5B,4BAA4B;mCAChC,0BAA0B;6BAA1B,0BAA0B;4BAMxC,mBAAmB;sBAAnB,mBAAmB;kCAS/C,yBAAyB;4BAAzB,yBAAyB;sCAAzB,yBAAyB;gCAAzB,yBAAyB;qCAAzB,yBAAyB;8BASzB,qBAAqB;wBAArB,qBAAqB;mCAArB,qBAAqB;6BAArB,qBAAqB;uDAArB,qBAAqB;2BArBa,2BAA2B;6BAA3B,2BAA2B"}

package/dist/models/measurements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"measurements.d.ts","sourceRoot":"","sources":["../../src/models/measurements.js"],"names":[],"mappings":"AA+FA,qCA0BE;AAgJF,+BAAwE;AA7KxE,wBAAmD;AA1BnD,8BAwBE;AAlEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCE;qBA5DmB,UAAU"}
+{"version":3,"file":"measurements.d.ts","sourceRoot":"","sources":["../../src/models/measurements.js"],"names":[],"mappings":"AA8FA,qCA0BE;AA2IF,+BAAwE;AAxKxE,wBAAmD;AAzBnD,8BAuBE;AAjEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCE;qBA5DmB,UAAU"}

package/dist/models/monitors.d.ts

@@ -3,7 +3,6 @@ export const Monitors: any;
 export const monitorAuditSchema: any;
 export const MonitorAudit: any;
 export const parametersEnum: string[];
-export const legacyParametersEnum: string[];
 export namespace deploymentTypesEnum {
     let STATIONARY: string;
     let MOBILE: string;

package/dist/models/monitors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/models/monitors.js"],"names":[],"mappings":"AAgKA,iCA0HE;AA6IF,2BAA4D;AAzS5D,qCA4BE;AAGF,+BAAwE;AAvJxE,sCAA6E;AAF7E,4CAA+F"}
+{"version":3,"file":"monitors.d.ts","sourceRoot":"","sources":["../../src/models/monitors.js"],"names":[],"mappings":"AA6JA,iCA8HE;AAuIF,2BAA4D;AAvS5D,qCA4BE;AAGF,+BAAwE;AAvJxE,sCAAoD"}

package/dist/models/sampleSites.d.ts

@@ -3,7 +3,4 @@ export const SampleSites: any;
 export const sampleSiteAuditSchema: any;
 export const SampleSiteAudit: any;
 export const sampleParametersEnum: string[];
-export const sampleParameterReferenceConcentrations: {
-    [k: string]: any;
-};
 //# sourceMappingURL=sampleSites.d.ts.map

package/dist/models/sampleSites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampleSites.d.ts","sourceRoot":"","sources":["../../src/models/sampleSites.js"],"names":[],"mappings":"AA4DA,oCAmDE;AA2JF,8BAAqE;AApOrE,wCAgBE;AAGF,kCAAiF;AAnDjF,4CAAuD;AAIvD;;EAEE"}
+{"version":3,"file":"sampleSites.d.ts","sourceRoot":"","sources":["../../src/models/sampleSites.js"],"names":[],"mappings":"AAsDA,oCAuDE;AAqJF,8BAAqE;AAlOrE,wCAgBE;AAGF,kCAAiF;AA7CjF,4CAAuD"}

package/dist/models/samples.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/models/samples.js"],"names":[],"mappings":"AAoCA,gCAkBE;AAoIF,0BAAyD;AAzJzD,+BAAwE;AAvBxE,qCAoBE;AAzBF;;EAEE"}
+{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/models/samples.js"],"names":[],"mappings":"AAqCA,gCAmBE;AAkIF,0BAAyD;AAxJzD,+BAAwE;AAxBxE,qCAqBE;AA1BF;;EAEE"}

package/dist/models/sites.d.ts

@@ -0,0 +1,3 @@
+export const sitesSchema: any;
+export const Sites: any;
+//# sourceMappingURL=sites.d.ts.map

package/dist/models/sites.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites.d.ts","sourceRoot":"","sources":["../../src/models/sites.js"],"names":[],"mappings":"AAGA,8BAoCE;AAaF,wBAAmD"}

package/dist/models/tests/sampleSites.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sampleSites.test.d.ts.map

package/dist/models/tests/sampleSites.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sampleSites.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/sampleSites.test.js"],"names":[],"mappings":""}

package/dist/models/tests/samples.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=samples.test.d.ts.map

package/dist/models/tests/samples.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"samples.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/samples.test.js"],"names":[],"mappings":""}

package/dist/models/tests/sites.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=sites.test.d.ts.map

package/dist/models/tests/sites.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sites.test.d.ts","sourceRoot":"","sources":["../../../src/models/tests/sites.test.js"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@justair/justair-library",
-  "version": "5.0.0-alpha.56f07df",
+  "version": "5.0.0-alpha.c16a87f",
   "description": "JustAir Internal Library",
   "main": "src/index.js",
   "type": "module",

package/src/constants/pollutants.js

@@ -205,7 +205,6 @@ export const PARAMETERS = {
 
 // Parameters analyzed from physical air samples in a laboratory.
 // These correspond to SampleSites.parameters and are not measured by real-time sensors.
-// Note: Cobalt uses the key COBALT (not CO) to avoid collision with PARAMETERS.CO (Carbon Monoxide).
 export const HEAVY_METALS = {
   C6H6: {
     id: "C6H6",
@@ -247,8 +246,8 @@ export const HEAVY_METALS = {
     origin: "Beryllium occurs naturally in rocks, soil, coal, and oil. It gets into the air through mining and industrial processing, burning coal or fuel oil, and tobacco smoke.",
     impacts: "Short-term exposure to high levels can cause lung inflammation, coughing, and difficulty breathing. Long-term exposure can cause permanent lung scarring, reduced lung capacity, shortness of breath, and fatigue. It has also been linked to an increased risk of lung cancer.",
   },
-  COBALT: {
-    id: "COBALT",
+  CO: {
+    id: "CO",
     label: "Cobalt",
     name: "Cobalt (Co)",
     unit: "µg/m³",

package/src/index.js

@@ -19,7 +19,6 @@ import {
   monitorAuditSchema,
   MonitorAudit,
   parametersEnum,
-  legacyParametersEnum,
   deploymentTypesEnum,
 } from "./models/monitors.js";
 import { organizationsSchema, Organizations } from "./models/organizations.js";
@@ -58,6 +57,9 @@ import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 import { PARAMETERS, HEAVY_METALS } from "./constants/pollutants.js";
 
+// Sites related imports
+import { sitesSchema, Sites } from "./models/sites.js";
+
 // SampleSites related imports
 import {
   sampleSitesSchema,
@@ -121,7 +123,6 @@ export {
   MonitorAudit,
   monitorAuditSchema,
   parametersEnum,
-  legacyParametersEnum,
   deploymentTypesEnum,
   AlertsAudit,
   Alerts,
@@ -135,6 +136,9 @@ export {
   NetworkMetrics,
   rateOfChangeSchema,
   RateOfChange,
+  // Sites related exports
+  sitesSchema,
+  Sites,
   // SampleSites related exports
   sampleSitesSchema,
   SampleSites,

package/src/models/measurements.js

@@ -83,7 +83,6 @@ const auditSchema = mongoose.Schema(
     },
     annotations: [annotationSchema], // Include annotations in audit trail
     isCorrected: { type: Boolean },
-    isFog: { type: Boolean },
   },
   {
     timestamps: true,
@@ -139,7 +138,6 @@ measurementsSchema.index({ "annotations.userId": 1 });
 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,
@@ -190,11 +188,9 @@ measurementsSchema.pre("deleteMany", async function () {
 
 // 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,
@@ -218,7 +214,6 @@ measurementsSchema.pre("deleteOne", async function () {
 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,
@@ -242,7 +237,6 @@ measurementsSchema.pre("findOneAndUpdate", async function () {
 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,

package/src/models/monitors.js

@@ -1,10 +1,7 @@
 import mongoose from "mongoose";
 import { PARAMETERS } from "../constants/pollutants.js";
 
-// Legacy values kept for backwards compatibility — remove after data migration
-const legacyParametersEnum = ["PM2.5", "Temperature", "Humidity", "OZONE", "WS And Direction"];
-
-const parametersEnum = [...Object.keys(PARAMETERS), ...legacyParametersEnum];
+const parametersEnum = [...Object.keys(PARAMETERS)];
 
 const deploymentTypesEnum = {
   STATIONARY: "stationary",
@@ -272,6 +269,10 @@ const monitorsSchema = mongoose.Schema(
       enum: Object.values(deploymentTypesEnum),
       default: deploymentTypesEnum.STATIONARY,
     },
+    siteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Sites",
+    },
     // Optional Clarity node ID (1:1 relationship with Node-S sensor)
     nodeId: { type: String },
     // Active alarms from Clarity node (keyed by alarmType)
@@ -308,7 +309,6 @@ monitorsSchema.index({ deploymentType: 1 });
 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,
@@ -335,11 +335,9 @@ monitorsSchema.pre("findOneAndDelete", async function () {
 
 // 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,
@@ -364,11 +362,9 @@ monitorsSchema.pre("deleteMany", async function () {
 
 // 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,
@@ -397,7 +393,6 @@ monitorsSchema.pre("deleteOne", async function () {
 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,
@@ -423,4 +418,4 @@ monitorsSchema.pre("updateMany", async function () {
 // Create the Monitors model
 const Monitors = mongoose.model("Monitors", monitorsSchema);
 
-export { monitorsSchema, Monitors, monitorAuditSchema, MonitorAudit, parametersEnum, legacyParametersEnum, deploymentTypesEnum };
+export { monitorsSchema, Monitors, monitorAuditSchema, MonitorAudit, parametersEnum, deploymentTypesEnum };

package/src/models/sampleSites.js

@@ -6,12 +6,6 @@ const generateSiteCode = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 8);
 
 const sampleParametersEnum = Object.keys(HEAVY_METALS);
 
-// EPA IRIS chronic inhalation reference concentrations (µg/m³)
-// null = no established inhalation RfC
-const sampleParameterReferenceConcentrations = Object.fromEntries(
-  Object.entries(HEAVY_METALS).map(([key, p]) => [key, p.rfc])
-);
-
 const noteSchema = mongoose.Schema({
   note: {
     type: String,
@@ -105,6 +99,10 @@ const sampleSitesSchema = mongoose.Schema(
     ],
     notes: { type: [noteSchema] },
     image: { type: String },
+    siteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Sites",
+    },
   },
   {
     timestamps: true,
@@ -139,7 +137,6 @@ sampleSitesSchema.index({ parameters: 1 });
 sampleSitesSchema.pre("findOneAndDelete", async function () {
   const docToDelete = await this.model.findOne(this.getFilter()).lean();
   if (docToDelete) {
-    console.log("Logging findOneAndDelete to sample site audit", docToDelete);
     let coordinates = null;
     if (docToDelete.location && docToDelete.location.gps && Array.isArray(docToDelete.location.gps.coordinates)) {
       coordinates = docToDelete.location.gps.coordinates;
@@ -165,11 +162,9 @@ sampleSitesSchema.pre("findOneAndDelete", async function () {
 
 // Pre-hook to log multiple document deletions
 sampleSitesSchema.pre("deleteMany", async function () {
-  console.log("deleteMany pre-hook triggered for sample sites");
   const docsToDelete = await this.model.find(this.getFilter()).lean();
 
   if (docsToDelete.length) {
-    console.log(`Logging ${docsToDelete.length} sample site documents to audit`);
     const auditLogs = docsToDelete.map((doc) => {
       let coordinates = null;
       if (doc.location && doc.location.gps && Array.isArray(doc.location.gps.coordinates)) {
@@ -201,11 +196,9 @@ sampleSitesSchema.pre("deleteMany", async function () {
 
 // Pre-hook to log a single document deletion (for deleteOne)
 sampleSitesSchema.pre("deleteOne", async function () {
-  console.log("deleteOne pre-hook triggered for sample sites");
   const docToDelete = await this.model.findOne(this.getFilter()).lean();
 
   if (docToDelete) {
-    console.log("Logging deleteOne to sample site audit", docToDelete);
     let coordinates = null;
     if (docToDelete.location && docToDelete.location.gps && Array.isArray(docToDelete.location.gps.coordinates)) {
       coordinates = docToDelete.location.gps.coordinates;
@@ -233,7 +226,6 @@ sampleSitesSchema.pre("deleteOne", async function () {
 sampleSitesSchema.pre("updateMany", async function () {
   const docsToUpdate = await this.model.find(this.getFilter()).lean();
   if (docsToUpdate.length) {
-    console.log(`Logging ${docsToUpdate.length} sample site documents to audit`);
     const auditLogs = docsToUpdate.map((doc) => {
       let coordinates = null;
       if (doc.location && doc.location.gps && Array.isArray(doc.location.gps.coordinates)) {
@@ -266,4 +258,4 @@ sampleSitesSchema.pre("updateMany", async function () {
 // Create the SampleSites model
 const SampleSites = mongoose.model("SampleSites", sampleSitesSchema);
 
-export { sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum, sampleParameterReferenceConcentrations };
+export { sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum };

package/src/models/samples.js

@@ -12,6 +12,7 @@ const samplesAuditSchema = mongoose.Schema(
   {
     siteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
     orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    filterId: { type: String },
     siteCode: { type: String }, // reference to SampleSites.code
     periodStartDate: { type: Date },
     periodEndDate: { type: Date },
@@ -38,6 +39,7 @@ const samplesSchema = mongoose.Schema(
   {
     siteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
     orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    filterId: { type: String },
     siteCode: { type: String }, // reference to SampleSites.code
     periodStartDate: { type: Date },
     periodEndDate: { type: Date },
@@ -65,10 +67,10 @@ samplesSchema.index({ siteId: 1, uploadDate: -1 });
 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,
+      filterId: docToDelete.filterId,
       siteCode: docToDelete.siteCode,
       periodStartDate: docToDelete.periodStartDate,
       periodEndDate: docToDelete.periodEndDate,
@@ -87,13 +89,12 @@ samplesSchema.pre("findOneAndDelete", async function () {
 
 // 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,
+      filterId: doc.filterId,
       siteCode: doc.siteCode,
       periodStartDate: doc.periodStartDate,
       periodEndDate: doc.periodEndDate,
@@ -112,13 +113,12 @@ samplesSchema.pre("deleteMany", async function () {
 
 // 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,
+      filterId: docToDelete.filterId,
       siteCode: docToDelete.siteCode,
       periodStartDate: docToDelete.periodStartDate,
       periodEndDate: docToDelete.periodEndDate,
@@ -139,10 +139,10 @@ samplesSchema.pre("deleteOne", async function () {
 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,
+      filterId: docToUpdate.filterId,
       siteCode: docToUpdate.siteCode,
       periodStartDate: docToUpdate.periodStartDate,
       periodEndDate: docToUpdate.periodEndDate,
@@ -163,10 +163,10 @@ samplesSchema.pre("findOneAndUpdate", async function () {
 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,
+      filterId: doc.filterId,
       siteCode: doc.siteCode,
       periodStartDate: doc.periodStartDate,
       periodEndDate: doc.periodEndDate,

package/src/models/sites.js

@@ -0,0 +1,55 @@
+import mongoose from "mongoose";
+
+// Sites Schema
+const sitesSchema = mongoose.Schema(
+  {
+    name: { type: String },
+    sampleSiteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "SampleSites",
+    },
+    monitorIds: {
+      type: [{ type: mongoose.Types.ObjectId, ref: "Monitors" }],
+      default: undefined,
+    },
+    sponsor: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    location: {
+      city: { type: String },
+      state: { type: String },
+      county: { type: String },
+      street: { type: String },
+      zip_code: { type: String },
+      neighborhood: { type: String },
+      gps: {
+        type: {
+          type: String,
+          enum: ["Point"],
+          required: true,
+        },
+        coordinates: {
+          type: [Number],
+          required: true,
+        },
+      },
+    },
+    isActive: { type: Boolean, default: true },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Geographic queries
+sitesSchema.index({ "location.gps": "2dsphere" });
+
+// Sponsor-based queries
+sitesSchema.index({ sponsor: 1, isActive: 1 });
+
+// Back-reference lookups
+sitesSchema.index({ sampleSiteId: 1 });
+sitesSchema.index({ monitorIds: 1 });
+
+// Create the Sites model
+const Sites = mongoose.model("Sites", sitesSchema);
+
+export { sitesSchema, Sites };