@justair/justair-library 5.0.0-alpha.cc5acc0 → 5.0.0-alpha.fb078ea

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/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;AAuIF,2BAA4D;AAnS5D,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.map

@@ -1 +1 @@
-{"version":3,"file":"sampleSites.d.ts","sourceRoot":"","sources":["../../src/models/sampleSites.js"],"names":[],"mappings":"AAsDA,oCAmDE;AAqJF,8BAAqE;AA9NrE,wCAgBE;AAGF,kCAAiF;AA7CjF,4CAAuD"}
+{"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/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/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.cc5acc0",
+  "version": "5.0.0-alpha.fb078ea",
   "description": "JustAir Internal Library",
   "main": "src/index.js",
   "type": "module",

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/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)
@@ -417,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

@@ -99,6 +99,10 @@ const sampleSitesSchema = mongoose.Schema(
     ],
     notes: { type: [noteSchema] },
     image: { type: String },
+    siteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Sites",
+    },
   },
   {
     timestamps: true,

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 };