@justair/justair-library 6.14.0 → 7.0.0

package/src/models/sampleSites.js

@@ -1,261 +1,270 @@
-import mongoose from "mongoose";
-import { customAlphabet } from 'nanoid';
-import { HEAVY_METALS } from "../constants/pollutants.js";
-
-const generateSiteCode = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 8);
-
-const sampleParametersEnum = Object.keys(HEAVY_METALS);
-
-const noteSchema = mongoose.Schema({
-  note: {
-    type: String,
-    required: true,
-  },
-  type: {
-    type: String,
-    required: true,
-  },
-  adminId: {
-    type: mongoose.Types.ObjectId,
-    ref: "Admin",
-    required: true,
-  },
-  adminName: {
-    type: String,
-  },
-  date: {
-    type: Date,
-    default: Date.now,
-  },
-});
-
-// Sample Site Audit Schema
-const sampleSiteAuditSchema = mongoose.Schema(
-  {
-    sampleSiteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
-    sampleSiteCode: { type: String }, // reference to SampleSites.code
-    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    timeUpdated: Date,
-    deletedAt: { type: Date, default: Date.now }, // Only populated on delete
-    sampleSiteLocation: {
-      // Sample Site GPS location (lat, lon)
-      type: { type: String, enum: ["Point"], required: true },
-      coordinates: { type: [Number], required: true },
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Create the SampleSiteAudit model
-const SampleSiteAudit = mongoose.model("SampleSiteAudit", sampleSiteAuditSchema);
-
-// Sample Sites Schema
-const sampleSitesSchema = mongoose.Schema(
-  {
-    name: { type: String },
-    code: { type: String, unique: true },
-    managedBy: { type: String },
-    sponsoredBy: { type: String },
-    lastSamplePeriodStartDate: { type: Date },
-    lastSamplePeriodEndDate: { type: Date },
-    lastSampleUploadDate: { type: Date },
-    isPrivate: { type: Boolean, default: false, required: true },
-    isActive: { type: Boolean, default: true, required: true },
-    sponsor: { type: mongoose.Types.ObjectId, ref: "Organizations" },
-    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,
-        },
-      },
-    },
-    context: { type: [String] },
-    parameters: [
-      {
-        type: String,
-        enum: sampleParametersEnum,
-      },
-    ],
-    notes: { type: [noteSchema] },
-    image: { type: String },
-    siteId: {
-      type: mongoose.Types.ObjectId,
-      ref: "Sites",
-    },
-  },
-  {
-    timestamps: true,
-  }
-);
-
-// Update pre-save hook
-sampleSitesSchema.pre('save', function (next) {
-  if (!this.code) {
-    this.code = generateSiteCode();
-  }
-  next();
-});
-  
-
-// Geographic queries - already exists
-sampleSitesSchema.index({ "location.gps": "2dsphere" }); // use location.gps for geospatial queries
-
-// Sponsor-based queries
-sampleSitesSchema.index({ sponsor: 1, isPrivate: 1 });
-
-// Location-based filtering
-sampleSitesSchema.index({ "location.city": 1, "location.state": 1 });
-sampleSitesSchema.index({ "location.neighborhood": 1 });
-sampleSitesSchema.index({ "location.county": 1 });
-
-// Query parameter filtering
-sampleSitesSchema.index({ context: 1 });
-sampleSitesSchema.index({ parameters: 1 });
-
-// Pre-hook to log single document deletions
-sampleSitesSchema.pre("findOneAndDelete", async function () {
-  const docToDelete = await this.model.findOne(this.getFilter()).lean();
-  if (docToDelete) {
-    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,
-        sampleSiteCode: docToDelete.code,
-        orgId: docToDelete.sponsor,
-        timeUpdated: docToDelete.updatedAt,
-        sampleSiteLocation: {
-          type: "Point",
-          coordinates,
-        },
-        deletedAt: new Date(),
-      });
-      await auditLog.save();
-    }
-  }
-});
-
-// Pre-hook to log multiple document deletions
-sampleSitesSchema.pre("deleteMany", async function () {
-  const docsToDelete = await this.model.find(this.getFilter()).lean();
-
-  if (docsToDelete.length) {
-    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,
-          sampleSiteCode: doc.code,
-          orgId: doc.sponsor,
-          timeUpdated: doc.updatedAt,
-          sampleSiteLocation: {
-            type: "Point",
-            coordinates,
-          },
-          deletedAt: new Date(),
-        };
-      }
-      return null;
-    }).filter(Boolean);
-
-    if (auditLogs.length) {
-      await SampleSiteAudit.insertMany(auditLogs);
-    }
-  }
-});
-
-// Pre-hook to log a single document deletion (for deleteOne)
-sampleSitesSchema.pre("deleteOne", async function () {
-  const docToDelete = await this.model.findOne(this.getFilter()).lean();
-
-  if (docToDelete) {
-    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,
-        sampleSiteCode: docToDelete.code,
-        orgId: docToDelete.sponsor,
-        timeUpdated: docToDelete.updatedAt,
-        sampleSiteLocation: {
-          type: "Point",
-          coordinates,
-        },
-        deletedAt: new Date(),
-      });
-      await auditLog.save();
-    }
-  }
-});
-
-// Pre-hook to log multiple document updates
-sampleSitesSchema.pre("updateMany", async function () {
-  const docsToUpdate = await this.model.find(this.getFilter()).lean();
-  if (docsToUpdate.length) {
-    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,
-          sampleSiteCode: doc.code,
-          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);
-    }
-  }
-});
-
-// Create the SampleSites model
-const SampleSites = mongoose.model("SampleSites", sampleSitesSchema);
-
+import mongoose from "mongoose";
+import { customAlphabet } from 'nanoid';
+import { HEAVY_METALS } from "../constants/pollutants.js";
+
+const generateSiteCode = customAlphabet('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 8);
+
+const sampleParametersEnum = Object.keys(HEAVY_METALS);
+
+const noteSchema = mongoose.Schema({
+  note: {
+    type: String,
+    required: true,
+  },
+  type: {
+    type: String,
+    required: true,
+  },
+  adminId: {
+    type: mongoose.Types.ObjectId,
+    ref: "Admin",
+    required: true,
+  },
+  adminName: {
+    type: String,
+  },
+  date: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+// Sample Site Audit Schema
+const sampleSiteAuditSchema = mongoose.Schema(
+  {
+    sampleSiteId: { type: mongoose.Types.ObjectId, ref: "SampleSites" },
+    sampleSiteCode: { type: String }, // reference to SampleSites.code
+    orgId: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    timeUpdated: Date,
+    deletedAt: { type: Date, default: Date.now }, // Only populated on delete
+    sampleSiteLocation: {
+      // Sample Site GPS location (lat, lon)
+      type: { type: String, enum: ["Point"], required: true },
+      coordinates: { type: [Number], required: true },
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Create the SampleSiteAudit model
+const SampleSiteAudit = mongoose.model("SampleSiteAudit", sampleSiteAuditSchema);
+
+// Sample Sites Schema
+const sampleSitesSchema = mongoose.Schema(
+  {
+    name: { type: String },
+    code: { type: String, unique: true },
+    managedBy: { type: String },
+    sponsoredBy: { type: String },
+    lastSamplePeriodStartDate: { type: Date },
+    lastSamplePeriodEndDate: { type: Date },
+    lastSampleUploadDate: { type: Date },
+    isPrivate: { type: Boolean, default: false, required: true },
+    isActive: { type: Boolean, default: true, required: true },
+    sponsor: { type: mongoose.Types.ObjectId, ref: "Organizations" },
+    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 is optional (legacy docs predate it — D14), but a partial Point is
+      // invalid: providing either half makes both halves required.
+      gps: {
+        type: {
+          type: String,
+          enum: ["Point"],
+          required: function () {
+            const gps = this.location?.gps;
+            return Array.isArray(gps?.coordinates) && gps.coordinates.length > 0;
+          },
+        },
+        coordinates: {
+          type: [Number],
+          // no [] default — an empty coordinates array is invalid GeoJSON and
+          // would poison the 2dsphere index
+          default: undefined,
+          required: function () {
+            return this.location?.gps?.type != null;
+          },
+        },
+      },
+    },
+    context: { type: [String] },
+    parameters: [
+      {
+        type: String,
+        enum: sampleParametersEnum,
+      },
+    ],
+    notes: { type: [noteSchema] },
+    image: { type: String },
+    siteId: {
+      type: mongoose.Types.ObjectId,
+      ref: "Sites",
+    },
+  },
+  {
+    timestamps: true,
+  }
+);
+
+// Update pre-save hook
+sampleSitesSchema.pre('save', function () {
+  if (!this.code) {
+    this.code = generateSiteCode();
+  }
+});
+  
+
+// Geographic queries - already exists
+sampleSitesSchema.index({ "location.gps": "2dsphere" }); // use location.gps for geospatial queries
+
+// Sponsor-based queries
+sampleSitesSchema.index({ sponsor: 1, isPrivate: 1 });
+
+// Location-based filtering
+sampleSitesSchema.index({ "location.city": 1, "location.state": 1 });
+sampleSitesSchema.index({ "location.neighborhood": 1 });
+sampleSitesSchema.index({ "location.county": 1 });
+
+// Query parameter filtering
+sampleSitesSchema.index({ context: 1 });
+sampleSitesSchema.index({ parameters: 1 });
+
+// Pre-hook to log single document deletions
+sampleSitesSchema.pre("findOneAndDelete", async function () {
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
+  if (docToDelete) {
+    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,
+        sampleSiteCode: docToDelete.code,
+        orgId: docToDelete.sponsor,
+        timeUpdated: docToDelete.updatedAt,
+        sampleSiteLocation: {
+          type: "Point",
+          coordinates,
+        },
+        deletedAt: new Date(),
+      });
+      await auditLog.save();
+    }
+  }
+});
+
+// Pre-hook to log multiple document deletions
+sampleSitesSchema.pre("deleteMany", async function () {
+  const docsToDelete = await this.model.find(this.getFilter()).lean();
+
+  if (docsToDelete.length) {
+    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,
+          sampleSiteCode: doc.code,
+          orgId: doc.sponsor,
+          timeUpdated: doc.updatedAt,
+          sampleSiteLocation: {
+            type: "Point",
+            coordinates,
+          },
+          deletedAt: new Date(),
+        };
+      }
+      return null;
+    }).filter(Boolean);
+
+    if (auditLogs.length) {
+      await SampleSiteAudit.insertMany(auditLogs);
+    }
+  }
+});
+
+// Pre-hook to log a single document deletion (for deleteOne)
+sampleSitesSchema.pre("deleteOne", async function () {
+  const docToDelete = await this.model.findOne(this.getFilter()).lean();
+
+  if (docToDelete) {
+    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,
+        sampleSiteCode: docToDelete.code,
+        orgId: docToDelete.sponsor,
+        timeUpdated: docToDelete.updatedAt,
+        sampleSiteLocation: {
+          type: "Point",
+          coordinates,
+        },
+        deletedAt: new Date(),
+      });
+      await auditLog.save();
+    }
+  }
+});
+
+// Pre-hook to log multiple document updates
+sampleSitesSchema.pre("updateMany", async function () {
+  const docsToUpdate = await this.model.find(this.getFilter()).lean();
+  if (docsToUpdate.length) {
+    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,
+          sampleSiteCode: doc.code,
+          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);
+    }
+  }
+});
+
+// Create the SampleSites model
+const SampleSites = mongoose.model("SampleSites", sampleSitesSchema);
+
 export { sampleSitesSchema, SampleSites, sampleSiteAuditSchema, SampleSiteAudit, sampleParametersEnum };

package/src/models/sites.js

@@ -1,55 +1,65 @@
-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 };
+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 is optional (legacy docs predate it — D14), but a partial Point is
+      // invalid: providing either half makes both halves required.
+      gps: {
+        type: {
+          type: String,
+          enum: ["Point"],
+          required: function () {
+            const gps = this.location?.gps;
+            return Array.isArray(gps?.coordinates) && gps.coordinates.length > 0;
+          },
+        },
+        coordinates: {
+          type: [Number],
+          // no [] default — an empty coordinates array is invalid GeoJSON and
+          // would poison the 2dsphere index
+          default: undefined,
+          required: function () {
+            return this.location?.gps?.type != null;
+          },
+        },
+      },
+    },
+    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 };