tabletcommand-backend-models 7.1.1 → 7.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabletcommand-backend-models",
-  "version": "7.1.1",
+  "version": "7.2.1",
   "description": "Tablet Command Backend Models",
   "scripts": {
     "build": "gulp build",
@@ -17,7 +17,7 @@
   "types": "definitions/index.d.ts",
   "dependencies": {
     "bluebird": "^3.7.2",
-    "debug": "^4.3.6",
+    "debug": "^4.3.7",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.45",
     "mongoose": "^7.7.0",
@@ -26,9 +26,10 @@
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.42",
-    "@types/chai": "^4.3.16",
+    "@types/chai": "^4.3.19",
     "@types/lodash": "^4.14.202",
-    "@types/mocha": "^10.0.7",
+    "@types/mocha": "^10.0.8",
+    "@types/node": "^22.5.5",
     "@types/uuid": "~10.0.0",
     "@typescript-eslint/eslint-plugin": "~6.21.0",
     "@typescript-eslint/parser": "~6.21.0",
@@ -41,7 +42,7 @@
     "mocha": "^10.7.3",
     "ts-node": "^10.9.2",
     "type-coverage": "^2.29.1",
-    "typescript": "~4.7.4",
+    "typescript": "~4.9.5",
     "yargs-parser": ">=21.1.1"
   },
   "typeCoverage": {

package/src/helpers.ts

@@ -123,3 +123,7 @@ export async function closeAllMongooseConnections() {
     }
   }
 }
+
+export async function sleep(ms: number) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}

package/src/index.ts

@@ -131,9 +131,10 @@ export { ValidationReport, ValidationReportModel } from "./models/validation-rep
 
 export * from "./helpers";
 
-export async function connect(url: string, overwriteOpts?: ConnectOptions) {
+export async function connect(url: string, overwriteOpts?: ConnectOptions, enableDebug = false) {
   const mongoose = await import("mongoose");
   mongoose.Promise = await import("bluebird");
+  mongoose.set("debug", enableDebug);
   const models = await wireModels(mongoose);
   const defaultOpts: ConnectOptions = {
     autoIndex: false,

package/src/models/action-log.ts

@@ -62,6 +62,14 @@ export default async function ActionLogModule(mongoose: MongooseModule) {
   }, {
     autoIndex: false
   });
+
+  modelSchema.index({
+    departmentId: 1,
+    modified_unix_date: 1
+  }, {
+    name: "departmentId_1_modified_unix_date_1",
+  });
+
   return mongoose.model<ActionLog>("ActionLog", modelSchema, "massive_action_log", { overwriteModels: true });
 }
 

package/src/models/agency.ts

@@ -129,6 +129,47 @@ export function AgencySchema(mongoose: MongooseModule) {
   }, {
     autoIndex: false,
   });
+
+  modelSchema.index({
+    agencyApiKey: 1,
+  }, {
+    name: "agencyApiKey_1",
+    unique: true,
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+  }, {
+    name: "departmentId_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    code: 1,
+  }, {
+    name: "departmentId_1_code_1_unique",
+    unique: true,
+  });
+
+  modelSchema.index({
+    personnelApiKey: 1,
+  }, {
+    name: "personnelApiKey_1_unique",
+    unique: true,
+  });
+
+  modelSchema.index({
+    "saml.selector": 1,
+  }, {
+    name: "saml_selector_partial_uniq",
+    unique: true,
+    partialFilterExpression: {
+      "saml.selector": {
+        "$exists": true
+      }
+    }
+  });
+
   return modelSchema;
 }
 

package/src/models/arcgis-group.ts

@@ -108,7 +108,8 @@ export default async function ArcGISGroupModule(mongoose: MongooseModule) {
     // Unique, to be able to use replaceInto
     groupId: {
       type: String,
-      unique: true,
+      // unique: true,
+      // TODO: Review if this can be created as unique
     },
     title: {
       type: String,
@@ -177,6 +178,14 @@ export default async function ArcGISGroupModule(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    groupId: 1,
+  }, {
+    name: "groupId_1",
+    // unique: true,
+    // TODO: Review if this can be created as unique
+  });
+
   return mongoose.model<ArcGISGroup>("ArcGISGroup", modelSchema, "massive_arcgis_group", { overwriteModels: true });
 }
 

package/src/models/assignment.ts

@@ -30,7 +30,6 @@ export default async function AssignmentModule(mongoose: MongooseModule) {
     departmentId: {
       type: String,
       required: true,
-      index: true,
     },
     isMandatory: {
       type: Boolean,
@@ -68,13 +67,34 @@ export default async function AssignmentModule(mongoose: MongooseModule) {
     },
   }, {
     autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+    }
   });
   modelSchema.virtual("id").get(function(this: AssignmentType) {
     return this._id.toString();
   });
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
+
+  modelSchema.index({
+    departmentId: 1,
+    isMandatory: 1,
+  }, {
+    name: "departmentId_1_isMandatory_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    modified_date: 1,
+  }, {
+    name: "departmentId_1_modified_date_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    userId: 1,
+  }, {
+    name: "departmentId_1_userId_1",
   });
 
   return mongoose.model<Assignment>("Assignment", modelSchema, "massive_assignment", { overwriteModels: true });

package/src/models/battalion.ts

@@ -73,20 +73,21 @@ export function BattalionSchema(mongoose: MongooseModule) {
       ref: "Agency",
       default: null,
     },
-  }, {});
+  }, {
+    autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+      transform(doc, ret) {
+        strictSchema(doc.schema as typeof modelSchema, ret);
+      },
+    }
+  });
 
   BattalionUnit.virtual("id").get(function(this: MongooseDocument) {
     // tslint:disable-next-line: no-unsafe-any
     return this._id.toString();
   });
-  BattalionUnit.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-    transform(doc, ret) {
-      strictSchema(doc.schema as typeof modelSchema, ret);
-    },
-  });
-
 
   const modelSchema = new Schema<BattalionType>({
     _id: {
@@ -127,7 +128,6 @@ export function BattalionSchema(mongoose: MongooseModule) {
     departmentId: {
       type: String,
       required: true,
-      index: true,
     },
     agencyId: {
       type: Schema.Types.ObjectId,
@@ -144,19 +144,45 @@ export function BattalionSchema(mongoose: MongooseModule) {
     },
   }, {
     autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+      transform(doc, ret) {
+        strictSchema(doc.schema as typeof modelSchema, ret);
+      },
+    }
   });
   modelSchema.virtual("id").get(function(this: MongooseDocument) {
     // tslint:disable-next-line: no-unsafe-any
     return this._id.toString();
   });
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-    transform(doc, ret) {
-      strictSchema(doc.schema as typeof modelSchema, ret);
-    },
+
+  modelSchema.index({
+    departmentId: 1,
+    isMandatory: 1,
+  }, {
+    name: "departmentId_1_isMandatory_1",
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    modified_date: 1,
+  }, {
+    name: "departmentId_1_modified_date_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    userId: 1,
+  }, {
+    name: "departmentId_1_userId_1",
+  });
+
+  modelSchema.index({
+    uuid: 1,
+  }, {
+    name: "uuid_1",
+  });
 
   function strictSchema(schema: typeof modelSchema, ret: Record<string, unknown>) {
     Object.keys(ret).forEach(function(element) {

package/src/models/beacon-log.ts

@@ -19,7 +19,6 @@ export default async function BeaconLogModule(mongoose: MongooseModule) {
     departmentId: {
       type: String,
       default: "",
-      index: true,
     },
     userId: {
       type: String,
@@ -40,6 +39,12 @@ export default async function BeaconLogModule(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1,
+  }, {
+    name: "departmentId_1",
+  });
+
   return mongoose.model<BeaconLog>("BeaconLog", modelSchema, "massive_beacon_log", { overwriteModels: true });
 }
 

package/src/models/cad-incident-block.ts

@@ -23,7 +23,6 @@ export default async function CADIncidentBlockModule(mongoose: MongooseModule) {
     departmentId: {
       type: String,
       required: true,
-      index: true,
     },
     // callType or admin email
     source: {
@@ -59,6 +58,14 @@ export default async function CADIncidentBlockModule(mongoose: MongooseModule) {
     }
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    IncidentNumber: 1,
+  }, {
+    name: "departmentId_1_IncidentNumber_1_unique",
+    unique: true,
+  });
+
   return mongoose.model<CADIncidentBlock>("CADIncidentBlock", modelSchema, "massive_cad_incident_block", { overwriteModels: true });
 }
 

package/src/models/cad-incident-stream.ts

@@ -32,7 +32,6 @@ export default async function CADIncidentStreamModule(mongoose: MongooseModule)
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     incidentNumber: {
       type: String,
@@ -54,6 +53,37 @@ export default async function CADIncidentStreamModule(mongoose: MongooseModule)
     }
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    incidentNumber: 1,
+    createdAt: -1,
+    _id: -1
+  }, {
+    name: "departmentId_1_incidentNumber_1_createdAt_-1__id_-1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    createdAt: -1
+  }, {
+    name: "departmentId_createdAt",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    incidentNumber: 1,
+    createdAt: 1
+  }, {
+    name: "departmentId_incidentNumber_createdAt",
+  });
+
+  modelSchema.index({
+    createdAt: -1,
+  }, {
+    name: "ttl_90d_createdAt_-1",
+    expireAfterSeconds: 7786800,
+  });
+
   return mongoose.model<CADIncidentStream>("CADIncidentStream", modelSchema, "massive_cad_incident_stream", { overwriteModels: true });
 }
 

package/src/models/cad-incident.ts

@@ -12,7 +12,36 @@ export default async function CADIncidentModule(mongoose: MongooseModule) {
   const modelSchema = CADIncidentSchema(mongoose);
   modelSchema.set("strict", false); // Because we accept all kind of data in
 
-  // Indexes
+  modelSchema.index({
+    closed_unix_date: 1,
+    departmentId: 1,
+    modified_unix_date: 1
+  }, {
+    name: "closed_unix_date_1_departmentId_1_modified_unix_date_1",
+  });
+
+  modelSchema.index({
+    closed_unix_date: 1,
+    modified_unix_date: 1
+  }, {
+    name: "closed_unix_date_modified_unix_date",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    ClosedDateTime: -1
+  }, {
+    name: "departmentId_1_ClosedDateTime_-1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    ClosedDateTime: 1,
+    expiration_date: 1
+  }, {
+    name: "departmentId_1_ClosedDateTime_1_expiration_date_1",
+  });
+
   modelSchema.index({
     departmentId: 1,
     IncidentNumber: 1
@@ -21,6 +50,87 @@ export default async function CADIncidentModule(mongoose: MongooseModule) {
     unique: true,
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    closed_unix_date: 1,
+    modified_unix_date: 1
+  }, {
+    name: "departmentId_1_closed_unix_date_1_modified_unix_date_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    modified_unix_date: 1
+  }, {
+    name: "departmentId_1_modified_unix_date_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    start_unix_date: -1,
+    closed_unix_date: 1
+  }, {
+    name: "departmentId_1_start_unix_date_-1_closed_unix_date_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    start_unix_date: 1
+  }, {
+    name: "departmentId_1_start_unix_date_1",
+  });
+
+  modelSchema.index({
+    expiration_date: 1,
+    ClosedDateTime: 1
+  }, {
+    name: "expiration_date_1_ClosedDateTime_1",
+    partialFilterExpression: {
+      expiration_date: {
+        "$gt": ""
+      },
+      ClosedDateTime: {
+        "$eq": ""
+      }
+    },
+  });
+
+  modelSchema.index({
+    expiration_date: 1,
+    ClosedDateTime: 1,
+    departmentId: 1
+  }, {
+    name: "expiration_date_1_ClosedDateTime_1_departmentId_1",
+    partialFilterExpression: {
+      expiration_date: {
+        "$gt": ""
+      },
+      ClosedDateTime: ""
+    }
+  });
+
+  modelSchema.index({
+    "sharedTo.departmentId": 1,
+    start_unix_date: -1,
+    closed_unix_date: 1
+  }, {
+    name: "sharedTo.departmentId_1_start_unix_date_-1_closed_unix_date_1",
+  });
+
+  modelSchema.index({
+    "sharedTo.departmentId": 1,
+    "sharedTo.expireAt": 1
+  }, {
+    name: "sharedTo_departmentId_1_sharedTo_expireAt_1",
+  });
+
+  modelSchema.index({
+    uuid: 1,
+  }, {
+    name: "uuid_1",
+    unique: true,
+  });
+
   return mongoose.model<CADIncident>("CADIncident", modelSchema, "massive_incident_cad", { overwriteModels: true });
 }
 

package/src/models/cad-simulation.ts

@@ -132,14 +132,12 @@ export default async function CADSimulationModule(mongoose: MongooseModule) {
     // Internal
     uuid: {
       type: String,
-      index: true,
       default: uuid.v4,
     },
     departmentId: {
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     modifiedDate: {
       type: Number,

package/src/models/cad-status-map.ts

@@ -35,7 +35,6 @@ export default async function CADStatusMapModule(mongoose: MongooseModule) {
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     modifiedDate: {
       type: Number,
@@ -63,6 +62,12 @@ export default async function CADStatusMapModule(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1
+  }, {
+    name: "departmentId_1",
+  });
+
   return mongoose.model<CADStatusMap>("CADStatusMap", modelSchema, "massive_cad_status_map", { overwriteModels: true });
 }
 

package/src/models/cad-status.ts

@@ -89,14 +89,12 @@ export default async function CADStatusModule(mongoose: MongooseModule) {
   const modelSchema = new Schema<CADStatus>({
     uuid: {
       type: String,
-      index: true,
       default: uuid.v4,
     },
     departmentId: {
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     modifiedDate: {
       type: Number,
@@ -160,6 +158,19 @@ export default async function CADStatusModule(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1
+  }, {
+    name: "departmentId_1",
+  });
+
+  modelSchema.index({
+    uuid: 1
+  }, {
+    name: "uuid_1_unique",
+    unique: true,
+  });
+
   return mongoose.model<CADStatus>("CADStatus", modelSchema, "massive_cad_status", { overwriteModels: true });
 }
 

package/src/models/cad-vehicle-status-history.ts

@@ -17,12 +17,10 @@ export default async function CADVehicleStatusHistoryModule(mongoose: MongooseMo
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     vehicleId: {
       type: String,
       default: "",
-      index: true,
     },
     radioName: {
       type: String,
@@ -78,6 +76,53 @@ export default async function CADVehicleStatusHistoryModule(mongoose: MongooseMo
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    incidentNumber: 1,
+    requested: -1
+  }, {
+    name: "departmentId_1_incidentNumber_1_requested__1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    requestedAt: -1,
+    requestDelay: 1
+  }, {
+    name: "departmentId_1_requestedAt_-1_requestDelay_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    requested: -1,
+    requestDelay: 1
+  }, {
+    name: "departmentId_1_requested_-1_requestDelay_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    vehicleId: 1,
+    requestedAt: -1
+  }, {
+    name: "departmentId_1_vehicleId_1_requestedAt_-1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    vehicleId: 1,
+    requested: -1,
+  }, {
+    name: "departmentId_1_vehicleId_1_requested_-1",
+  });
+
+  modelSchema.index({
+    requested: 1,
+  }, {
+    name: "ttl_30d_requested_1",
+    expireAfterSeconds: 2654300,
+  });
+
   return mongoose.model<CADVehicleStatusHistory>("CADVehicleStatusHistory", modelSchema, "massive_cad_vehicle_status_history", { overwriteModels: true });
 }