@justair/justair-library 4.8.20 → 4.8.22

package/package.json

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

package/src/index.js

@@ -58,6 +58,15 @@ import { NetworkMetrics, networkMetricsSchema } from "./models/networkMetrics.js
 import Database from "./config/db.js"; // Import the new Database class
 import CustomLogger from "./config/logger.js";
 
+// SampleSites related imports
+import {
+  sampleSitesSchema,
+  SampleSites,
+  sampleSiteAuditSchema,
+  SampleSiteAudit,
+  sampleParametersEnum,
+} from "./models/sampleSites.js";
+
 export function createLoggerInstance({ DATADOG_API_KEY, APPLICATION_NAME }) {
   return new CustomLogger({ DATADOG_API_KEY, APPLICATION_NAME });
 }
@@ -115,4 +124,10 @@ export {
   DataCompleteness,
   networkMetricsSchema,
   NetworkMetrics,
+  // SampleSites related exports
+  sampleSitesSchema,
+  SampleSites,
+  sampleSiteAuditSchema,
+  SampleSiteAudit,
+  sampleParametersEnum,
 };

package/src/models/sampleSites.js

@@ -38,12 +38,12 @@ const noteSchema = mongoose.Schema({
 // Sample Site Audit Schema
 const sampleSiteAuditSchema = mongoose.Schema(
   {
-    monitorId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
+    sampleSiteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
     orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
     timeUpdated: Date,
     deletedAt: { type: Date, default: Date.now }, // Only populated on delete
-    monitorLocation: {
-      // Monitor GPS location (lat, lon)
+    sampleSiteLocation: {
+      // Sample Site GPS location (lat, lon)
       type: { type: String, enum: ["Point"], required: true },
       coordinates: { type: [Number], required: true },
     },
@@ -59,30 +59,48 @@ const SampleSiteAudit = mongoose.model("SampleSiteAudit", sampleSiteAuditSchema)
 // Sample Sites Schema
 const sampleSitesSchema = mongoose.Schema(
   {
-    monitorCode: String,
-    // Managed By and Sponsored By fields
-    managedBy: String,
-    sponsoredBy: String,
-    measurementUpdate: Date,
+    name: { type: String },
+    managedBy: { type: String },
+    sponsoredBy: { type: String },
+    lastSamplePeriodStartDate: { type: Date },
+    lastSamplePeriodEndDate: { type: Date },
     isPrivate: { type: Boolean, default: false, required: true },
     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 },
+    sponsorName: { type: String },
+    /*
+     * Location object: unified structure for all address and geospatial data.
+     * - monitorLatitude and monitorLongitude are deprecated and no longer used.
+     * - The location object (including location.gps) is now built in config/google.js.
+     * - location.gps is a GeoJSON Point used for all geospatial queries (replaces gpsLocation).
+     */
+    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,
+        },
+      },
     },
-    location: Object,
-    context: [String],
+    context: { type: [String] },
     parameters: [
       {
         type: String,
         enum: sampleParametersEnum,
       },
     ],
-    notes: [noteSchema],
-    image: String,
+    notes: { type: [noteSchema] },
+    image: { type: String },
   },
   {
     timestamps: true,
@@ -90,10 +108,10 @@ const sampleSitesSchema = mongoose.Schema(
 );
 
 // Geographic queries - already exists
-sampleSitesSchema.index({ gpsLocation: "2dsphere" });
+sampleSitesSchema.index({ "location.gps": "2dsphere" }); // use location.gps for geospatial queries
 
 // Sponsor-based queries
-sampleSitesSchema.index({ sponsor: 1, isActive: 1 });
+sampleSitesSchema.index({ sponsor: 1, isPrivate: 1 });
 
 // Location-based filtering
 sampleSitesSchema.index({ "location.city": 1, "location.state": 1 });
@@ -109,20 +127,25 @@ 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);
-    const auditLog = new SampleSiteAudit({
-      monitorId: docToDelete._id,
-      orgId: docToDelete.sponsor,
-      timeUpdated: docToDelete.updatedAt,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [
-          docToDelete.monitorLongitude,
-          docToDelete.monitorLatitude,
-        ],
-      },
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
+    let coordinates = null;
+    if (docToDelete.location && docToDelete.location.gps && Array.isArray(docToDelete.location.gps.coordinates)) {
+      coordinates = docToDelete.location.gps.coordinates;
+    } else if (docToDelete.gpsLocation && Array.isArray(docToDelete.gpsLocation.coordinates)) {
+      coordinates = docToDelete.gpsLocation.coordinates;
+    }
+    if (coordinates) {
+      const auditLog = new SampleSiteAudit({
+        sampleSiteId: docToDelete._id,
+        orgId: docToDelete.sponsor,
+        timeUpdated: docToDelete.updatedAt,
+        sampleSiteLocation: {
+          type: "Point",
+          coordinates,
+        },
+        deletedAt: new Date(),
+      });
+      await auditLog.save();
+    }
   }
 });
 
@@ -133,18 +156,31 @@ sampleSitesSchema.pre("deleteMany", async function () {
 
   if (docsToDelete.length) {
     console.log(`Logging ${docsToDelete.length} sample site documents to audit`);
-    const auditLogs = docsToDelete.map((doc) => ({
-      monitorId: doc._id,
-      orgId: doc.sponsor,
-      timeUpdated: doc.updatedAt,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [doc.monitorLongitude, doc.monitorLatitude],
-      },
-      deletedAt: new Date(),
-    }));
-
-    await SampleSiteAudit.insertMany(auditLogs);
+    const auditLogs = docsToDelete.map((doc) => {
+      let coordinates = null;
+      if (doc.location && doc.location.gps && Array.isArray(doc.location.gps.coordinates)) {
+        coordinates = doc.location.gps.coordinates;
+      } else if (doc.gpsLocation && Array.isArray(doc.gpsLocation.coordinates)) {
+        coordinates = doc.gpsLocation.coordinates;
+      }
+      if (coordinates) {
+          return {
+            sampleSiteId: doc._id,
+            orgId: doc.sponsor,
+            timeUpdated: doc.updatedAt,
+            sampleSiteLocation: {
+              type: "Point",
+              coordinates,
+            },
+            deletedAt: new Date(),
+          };
+        }
+      return null;
+    }).filter(Boolean);
+
+    if (auditLogs.length) {
+      await SampleSiteAudit.insertMany(auditLogs);
+    }
   }
 });
 
@@ -155,20 +191,25 @@ sampleSitesSchema.pre("deleteOne", async function () {
 
   if (docToDelete) {
     console.log("Logging deleteOne to sample site audit", docToDelete);
-    const auditLog = new SampleSiteAudit({
-      monitorId: docToDelete._id,
-      orgId: docToDelete.sponsor,
-      timeUpdated: docToDelete.updatedAt,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [
-          docToDelete.monitorLongitude,
-          docToDelete.monitorLatitude,
-        ],
-      },
-      deletedAt: new Date(),
-    });
-    await auditLog.save();
+    let coordinates = null;
+    if (docToDelete.location && docToDelete.location.gps && Array.isArray(docToDelete.location.gps.coordinates)) {
+      coordinates = docToDelete.location.gps.coordinates;
+    } else if (docToDelete.gpsLocation && Array.isArray(docToDelete.gpsLocation.coordinates)) {
+      coordinates = docToDelete.gpsLocation.coordinates;
+    }
+    if (coordinates) {
+      const auditLog = new SampleSiteAudit({
+        sampleSiteId: docToDelete._id,
+        orgId: docToDelete.sponsor,
+        timeUpdated: docToDelete.updatedAt,
+        sampleSiteLocation: {
+          type: "Point",
+          coordinates,
+        },
+        deletedAt: new Date(),
+      });
+      await auditLog.save();
+    }
   }
 });
 
@@ -177,18 +218,31 @@ 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) => ({
-      monitorId: doc._id,
-      orgId: doc.sponsor,
-      timeUpdated: doc.updatedAt,
-      monitorLocation: {
-        type: "Point",
-        coordinates: [doc.monitorLongitude, doc.monitorLatitude],
-      },
-      deletedAt: null, // Not a deletion, so this field is null
-    }));
-
-    await SampleSiteAudit.insertMany(auditLogs);
+    const auditLogs = docsToUpdate.map((doc) => {
+      let coordinates = null;
+      if (doc.location && doc.location.gps && Array.isArray(doc.location.gps.coordinates)) {
+        coordinates = doc.location.gps.coordinates;
+      } else if (doc.gpsLocation && Array.isArray(doc.gpsLocation.coordinates)) {
+        coordinates = doc.gpsLocation.coordinates;
+      }
+      if (coordinates) {
+          return {
+            sampleSiteId: doc._id,
+            orgId: doc.sponsor,
+            timeUpdated: doc.updatedAt,
+            sampleSiteLocation: {
+              type: "Point",
+              coordinates,
+            },
+            deletedAt: null, // Not a deletion, so this field is null
+          };
+        }
+      return null;
+    }).filter(Boolean);
+
+    if (auditLogs.length) {
+      await SampleSiteAudit.insertMany(auditLogs);
+    }
   }
 });