tabletcommand-backend-models 5.39.7 → 7.0.1

package/definitions/types/user.d.ts

@@ -0,0 +1,132 @@
+import { Types } from "mongoose";
+import { EsriAuthSchemaType, EsriErrorSchemaType } from "./esri";
+import { PubNubTokenSchemaType } from "./pubnub-token";
+export interface UnitSettingType {
+    radioName: string;
+    notificationType: string;
+    notificationMode: string;
+}
+export interface IncidentSettingType {
+    incidentType: string;
+    notificationType: string;
+    notificationMode: string;
+}
+export interface DeviceSchemaType {
+    token: string;
+    env: string;
+    ver: string;
+    ua: string;
+    time: number;
+    t: Date;
+    drift: number;
+    channelId: string;
+    bundleIdentifier: string;
+    silentEnabled: boolean;
+    criticalAlertsEnabled: boolean;
+    session: string;
+    active: boolean;
+    offDuty: boolean;
+}
+export interface SoundSchemaItemType {
+    sound: string;
+    soundType: string;
+    os: string;
+}
+export interface SoundSchemaType {
+    ios: SoundSchemaItemType;
+    android: SoundSchemaItemType;
+}
+export interface UserDeviceType {
+    _id: Types.ObjectId;
+    userId: string;
+    departmentId: string;
+    devices: DeviceSchemaType[];
+    notificationCount: number;
+    notificationUnitSettings: UnitSettingType[];
+    notificationIncidentSettings: IncidentSettingType[];
+    notificationSounds: SoundSchemaType;
+    offDuty: boolean;
+    criticalAlertsVolume: string;
+    allowInStaging: boolean;
+    restrictedCommentsEnabled: boolean;
+}
+export interface UserRegistrationType {
+    email: string;
+    name: string;
+    firstName: string;
+    lastName: string;
+    department: string;
+    title: string;
+    status: string;
+    modifiedDate: number;
+    modified: Date;
+    presentedAt: number;
+    managedIncidentsCount: number;
+    checklistsCount: number;
+    stage: string;
+    firstIncidentUnixTime: number;
+    lastIncidentLocation: string;
+    lastIncidentUnixTime: number;
+    syncedToHubSpot: boolean;
+}
+export interface VehicleSchemaType {
+    radioName: string;
+    vehicleId: string;
+}
+export interface UserType {
+    _id: Types.ObjectId;
+    id?: string;
+    nick: string;
+    email: string;
+    name: string;
+    uuid: string;
+    departmentId: string;
+    modified_date: Date;
+    when: Date;
+    agencyId: Types.ObjectId;
+    managedAgencies: Types.ObjectId[];
+    active: boolean;
+    admin: boolean;
+    superuser: boolean;
+    isPro: boolean;
+    isIncidentManager: boolean;
+    mobileAccess: boolean;
+    webAccess: boolean;
+    cadSimulatorAccess: boolean;
+    canAddRemoveVehicle: boolean;
+    beaconEnabled: boolean;
+    userContributionEnabled: boolean;
+    syncLoggingExpireDate: Date;
+    beacons: string[];
+    salt: string;
+    pass: string;
+    auth: string[];
+    mapHidden: boolean;
+    mapId: string;
+    vehicle: VehicleSchemaType;
+    sessionCountiPhone: number;
+    sessionCountiPad: number;
+    rtsAuthKey: string;
+    pubNubV2: PubNubTokenSchemaType;
+    pubNubV3: PubNubTokenSchemaType;
+    socketIO: PubNubTokenSchemaType;
+    token: string;
+    tokenExpireAt: Date;
+    shareLocationPhone: boolean;
+    shareLocationTablet: boolean;
+    offlineMapsEnabled: boolean;
+    fireMapperProEnabled: boolean;
+    arcGISAuth: EsriAuthSchemaType;
+    arcGISAuthError: EsriErrorSchemaType;
+    offDutyEnabled: boolean;
+    webMapSettings: {
+        defaultZoomLevel: number;
+        defaultCenter: number[];
+        defaultMap: string;
+    };
+    locationToCAD: boolean;
+    logOffEnabled: boolean;
+    restrictedCommentsEnabled: boolean;
+    superUserReadOnly: boolean;
+}
+//# sourceMappingURL=user.d.ts.map

package/definitions/types/user.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/types/user.ts"],"names":[],"mappings":"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"}

package/definitions/types/validation.d.ts

@@ -0,0 +1,21 @@
+import { Types } from "mongoose";
+export interface ValidationErrorItemSchemaType {
+    message: string;
+    firstSeenAt: Date;
+    lastSeenAt: Date;
+    clearedAt: Date;
+    payload: object;
+}
+export interface ValidationReportType {
+    _id: Types.ObjectId;
+    departmentId: Types.ObjectId;
+    location: ValidationErrorItemSchemaType[];
+    statusMap: ValidationErrorItemSchemaType[];
+    status: ValidationErrorItemSchemaType[];
+    vehicleStatus: ValidationErrorItemSchemaType[];
+    vehicle: ValidationErrorItemSchemaType[];
+    incident: ValidationErrorItemSchemaType[];
+    personnel: ValidationErrorItemSchemaType[];
+    modified: Date;
+}
+//# sourceMappingURL=validation.d.ts.map

package/definitions/types/validation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/types/validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,IAAI,CAAC;IAClB,UAAU,EAAE,IAAI,CAAC;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC;IACpB,YAAY,EAAE,KAAK,CAAC,QAAQ,CAAC;IAC7B,QAAQ,EAAE,6BAA6B,EAAE,CAAC;IAC1C,SAAS,EAAE,6BAA6B,EAAE,CAAC;IAC3C,MAAM,EAAE,6BAA6B,EAAE,CAAC;IACxC,aAAa,EAAE,6BAA6B,EAAE,CAAC;IAC/C,OAAO,EAAE,6BAA6B,EAAE,CAAC;IACzC,QAAQ,EAAE,6BAA6B,EAAE,CAAC;IAC1C,SAAS,EAAE,6BAA6B,EAAE,CAAC;IAC3C,QAAQ,EAAE,IAAI,CAAC;CAChB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabletcommand-backend-models",
-  "version": "5.39.7",
+  "version": "7.0.1",
   "description": "Tablet Command Backend Models",
   "scripts": {
     "build": "gulp build",
@@ -21,7 +21,7 @@
     "debug": "^4.3.5",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.45",
-    "mongoose": "=5.10.19",
+    "mongoose": "^7.7.0",
     "mongoose-lean-virtuals": "^0.7.6",
     "uuid": "~10.0.0"
   },
@@ -30,8 +30,6 @@
     "@types/chai": "^4.3.16",
     "@types/lodash": "^4.14.202",
     "@types/mocha": "^10.0.7",
-    "@types/mongodb": "^3.6.20",
-    "@types/mongoose": "~5.10.5",
     "@types/uuid": "~10.0.0",
     "@typescript-eslint/eslint-plugin": "~6.20.0",
     "@typescript-eslint/parser": "~6.20.0",

package/src/constants.ts

@@ -1,8 +1,22 @@
-// These should be converted to Typescript Enum after upgrading mongoose to 6.x or newer
+export enum LocationSource {
+  CAD = "CAD",
+  FleetComplete = "FleetComplete",
+  GST = "GST",
+  Samsara = "Samsara",
+  Skymira = "Skymira",
+  SKYTRAC = "SKYTRAC",
+  Somewear = "Somewear",
+  TCAndroid = "TC-Android",
+  TCIOS = "TC-iOS",
+  TCMobileAndroid = "TCMobile-Android",
+  TCMobileIOS = "TCMobile-iOS",
+  VehicleModem = "VehicleModem"
+}
 
-export type LocationSource =
-  "CAD" | "FleetComplete" | "GST" |
-  "Samsara" | "Skymira" | "SKYTRAC" | "Somewear" |
-  "TC-Android" | "TC-iOS" | "TCMobile-Android" | "TCMobile-iOS" |
-  "VehicleModem";
-export type LocationKindType = "fixed-wing" | "helicopter" | "marine" | "person" | "vehicle";
+export enum LocationKindType {
+  FixedWing = "fixed-wing",
+  Helicopter = "helicopter",
+  Marine = "marine",
+  Person = "person",
+  Vehicle = "vehicle"
+}

package/src/helpers.ts

@@ -1,4 +1,4 @@
-import { SchemaDefinition, SchemaOptions, Schema, Document, Model, Types } from "mongoose";
+import mongoose, { SchemaDefinition, Schema, Document, Model, Types } from "mongoose";
 
 export type MongooseModule = typeof import("mongoose");
 export type MongooseModel<T extends Document, QueryHelpers = Record<string, unknown>> = Model<T, QueryHelpers>;
@@ -49,27 +49,6 @@ export type TypedDocument<T extends TypedSchema<any>> = Document & (
   T extends { _interface: infer U } ? U : never
 );
 
-export function createSchemaDefinition<T extends SchemaDefinition>(c: T) {
-  return c;
-}
-
-export function createSchema
-  <T extends SchemaDefinition, TMethods>(schemaCtor: typeof Schema, p: T, o: SchemaOptions, methods?: TMethods & ThisType<DocumentFromSchemaDefinition<T>>)
-  : Schema & { _interface: MongooseInterface<T>, _methods: TMethods } {
-  const schema = new schemaCtor(p, o);
-  if (methods) {
-    schema.methods = methods;
-  }
-  return schema as unknown as Schema & { _interface: MongooseInterface<T>, _methods: TMethods };
-}
-
-export function createModel<T, TMethods>(mongoose: MongooseModule, name: string, schema: Schema & { _interface: T, _methods?: TMethods }) {
-  if (mongoose.models[name]) {
-    return mongoose.model<Document & T & TMethods>(name) as Model<Document & T & TMethods> & { __methods?: TMethods };
-  } else {
-    return mongoose.model<Document & T & TMethods>(name, schema) as Model<Document & T & TMethods> & { __methods?: TMethods };
-  }
-}
 
 export type ModelFromSchemaDefinition<T extends SchemaDefinition> = ModelFromSchema<Schema & { _interface: MongooseInterface<T> }>;
 export type ModelFromSchema<T extends Schema> = Model<DocumentTypeFromSchema<T>>;
@@ -125,3 +104,22 @@ type Conditions<T> = {
 export function conditions<T extends import("mongoose").Document>(items: import("mongoose").Model<T>, c: Or<Conditions<T>>) {
   return c;
 }
+
+export function convertToObjectId(id: string): Types.ObjectId {
+  if (id) {
+    return new Types.ObjectId(id);
+  }
+  return new Types.ObjectId(); // fal;back if user provides empty string
+}
+
+export async function disconnectMongoose() {
+  return mongoose.disconnect();
+}
+
+export async function closeAllMongooseConnections() {
+  if (mongoose.connections.length) {
+    for (const connection of mongoose.connections) {
+      await connection.close();
+    }
+  }
+}

package/src/index.ts

@@ -1,5 +1,5 @@
 import * as _ from "lodash";
-import { ConnectionOptions } from "mongoose";
+import { ConnectOptions } from "mongoose";
 import { MongooseModule } from "./helpers";
 import {
   LocationKindType,
@@ -125,19 +125,16 @@ export { ValidationReport, ValidationReportModel } from "./models/validation-rep
 
 export * from "./helpers";
 
-export async function connect(url: string, overwriteOpts?: ConnectionOptions) {
+export async function connect(url: string, overwriteOpts?: ConnectOptions) {
   const mongoose = await import("mongoose");
   mongoose.Promise = await import("bluebird");
-
   const models = await wireModels(mongoose);
-  const defaultOpts: ConnectionOptions = {
+  const defaultOpts: ConnectOptions = {
     autoIndex: false,
     readPreference: "primaryPreferred",
-    useNewUrlParser: true,
-    useUnifiedTopology: true,
   };
   // If present, overwrite options
-  const opts: ConnectionOptions = _.assign({}, defaultOpts, overwriteOpts);
+  const opts: ConnectOptions = _.assign({}, defaultOpts, overwriteOpts);
   const connection = await mongoose.connect(url, opts);
 
   return { mongoose, connection, models };
@@ -145,4 +142,5 @@ export async function connect(url: string, overwriteOpts?: ConnectionOptions) {
 
 type UnboxPromise<T extends Promise<unknown>> = T extends Promise<infer U> ? U : never;
 export type BackendModels = UnboxPromise<ReturnType<typeof connect>>["models"];
+export type MongooseTypes = MongooseModule;
 export default connect;

package/src/models/action-log.ts

@@ -1,20 +1,18 @@
 import {
   MongooseModule,
-  createSchema,
-  createModel,
   currentDate,
   retrieveCurrentUnixTime,
-  ModelTypeFromTypeSchemaFunction,
-  ItemTypeFromTypeSchemaFunction,
-  ReplaceModelReturnType,
 } from "../helpers";
+import { Model } from "mongoose";
+import { ActionLogType } from "../types/action-log";
 
-export async function ActionLogModule(mongoose: MongooseModule) {
-  const { Schema, Types } = mongoose;
+export interface ActionLog extends ActionLogType { }
 
-  const modelSchema = createSchema(Schema, {
+export default async function ActionLogModule(mongoose: MongooseModule) {
+  const { Schema } = mongoose;
+  const modelSchema = new Schema<ActionLogType>({
     _id: {
-      type: Types.ObjectId,
+      type: Schema.Types.ObjectId,
       auto: true,
     },
     departmentId: {
@@ -62,12 +60,9 @@ export async function ActionLogModule(mongoose: MongooseModule) {
       default: retrieveCurrentUnixTime,
     },
   }, {
-    collection: "massive_action_log",
+    autoIndex: false
   });
-  modelSchema.set("autoIndex", false);
-  return createModel(mongoose, "ActionLog", modelSchema);
+  return mongoose.model<ActionLog>("ActionLog", modelSchema, "massive_action_log", { overwriteModels: true });
 }
 
-export interface ActionLog extends ItemTypeFromTypeSchemaFunction<typeof ActionLogModule> { }
-export interface ActionLogModel extends ModelTypeFromTypeSchemaFunction<ActionLog> { }
-export default ActionLogModule as ReplaceModelReturnType<typeof ActionLogModule, ActionLogModel>;
+export interface ActionLogModel extends Model<ActionLog> { }

package/src/models/agency.ts

@@ -1,23 +1,22 @@
 import * as uuid from "uuid";
 import {
-  createModel,
-  createSchema,
   currentDate,
-  ItemTypeFromTypeSchemaFunction,
-  ModelTypeFromTypeSchemaFunction,
   MongooseModule,
-  ReplaceModelReturnType,
   retrieveCurrentUnixTime,
 } from "../helpers";
 import AgencyCronConfigModule from "./schema/agency-cron-config";
 import AgencySAMLModule from "./schema/agency-saml";
+import { Model } from "mongoose";
+import { CrossStaffedUnitType, AgencyType } from "../types/agency";
+
+export interface Agency extends AgencyType, Record<string, unknown> { }
 
 export function AgencySchema(mongoose: MongooseModule) {
-  const { Schema, Types } = mongoose;
+  const { Schema } = mongoose;
   const AgencyCronConfig = AgencyCronConfigModule(mongoose);
   const AgencySAML = AgencySAMLModule(mongoose);
 
-  const CrossStaffedUnit = createSchema(Schema, {
+  const CrossStaffedUnit = new Schema<CrossStaffedUnitType>({
     radioName: {
       type: String,
       default: "",
@@ -45,9 +44,9 @@ export function AgencySchema(mongoose: MongooseModule) {
     locationToCAD: 0
   };
 
-  const modelSchema = createSchema(Schema, {
+  const modelSchema = new Schema<AgencyType>({
     _id: {
-      type: Types.ObjectId,
+      type: Schema.Types.ObjectId,
       auto: true,
     },
     code: {
@@ -89,12 +88,12 @@ export function AgencySchema(mongoose: MongooseModule) {
       default: false,
     },
     departmentId: {
-      type: Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: "Department",
       required: true
     },
     administrators: {
-      type: [Types.ObjectId],
+      type: [Schema.Types.ObjectId],
       ref: "User",
       default: []
     },
@@ -128,18 +127,14 @@ export function AgencySchema(mongoose: MongooseModule) {
       default: 0,
     },
   }, {
-    collection: "massive_agency",
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
-
   return modelSchema;
 }
 
-export async function AgencyModule(mongoose: MongooseModule) {
+export default async function AgencyModule(mongoose: MongooseModule) {
   const modelSchema = AgencySchema(mongoose);
-  return createModel(mongoose, "Agency", modelSchema);
+  return mongoose.model<Agency>("Agency", modelSchema, "massive_agency", { overwriteModels: true });
 }
 
-export interface Agency extends ItemTypeFromTypeSchemaFunction<typeof AgencyModule> { }
-export interface AgencyModel extends ModelTypeFromTypeSchemaFunction<Agency> { }
-export default AgencyModule as ReplaceModelReturnType<typeof AgencyModule, AgencyModel>;
+export interface AgencyModel extends Model<Agency> { }

package/src/models/arcgis-group.ts

@@ -1,18 +1,23 @@
 // import * as uuid from "uuid";
+import { Model } from "mongoose";
 import {
-  createModel,
-  createSchema,
   currentDate,
-  ItemTypeFromTypeSchemaFunction,
-  ModelTypeFromTypeSchemaFunction,
   MongooseModule,
-  ReplaceModelReturnType,
 } from "../helpers";
+import {
+  ArcGISGroupUserType,
+  ArcGISUserInvitationType,
+  ArcGISDepartmentUserType,
+  ArcGISDepartmentType,
+  ArcGISGroupType
+} from "../types/arcgis-group";
+
+export interface ArcGISGroup extends ArcGISGroupType { }
 
-export async function ArcGISGroupModule(mongoose: MongooseModule) {
+export default async function ArcGISGroupModule(mongoose: MongooseModule) {
   const { Schema } = mongoose;
 
-  const ArcGISGroupUser = createSchema(Schema, {
+  const ArcGISGroupUser = new Schema<ArcGISGroupUserType>({
     username: {
       type: String,
       default: "",
@@ -34,7 +39,7 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
     id: false,
   });
 
-  const ArcGISUserInvitation = createSchema(Schema, {
+  const ArcGISUserInvitation = new Schema<ArcGISUserInvitationType>({
     username: {
       type: String,
       default: "",
@@ -52,7 +57,7 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
     id: false,
   });
 
-  const ArcGISDepartmentUser = createSchema(Schema, {
+  const ArcGISDepartmentUser = new Schema<ArcGISDepartmentUserType>({
     // ArcGIS username
     username: {
       type: String,
@@ -73,7 +78,7 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
     id: false,
   });
 
-  const ArcGISDepartment = createSchema(Schema, {
+  const ArcGISDepartment = new Schema<ArcGISDepartmentType>({
     department: {
       type: String,
       default: "",
@@ -99,7 +104,7 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
     id: false,
   });
 
-  const modelSchema = createSchema(Schema, {
+  const modelSchema = new Schema<ArcGISGroupType>({
     // Unique, to be able to use replaceInto
     groupId: {
       type: String,
@@ -166,17 +171,14 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
     // if date is in the past, we should refresh this
     // at run success, update this date to a date in the future
     runAt: {
-      type: Date,
+      type: Date || String,
       default: "",
     },
   }, {
-    collection: "massive_arcgis_group",
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
-  return createModel(mongoose, "ArcGISGroup", modelSchema);
+  return mongoose.model<ArcGISGroup>("ArcGISGroup", modelSchema, "massive_arcgis_group", { overwriteModels: true });
 }
 
-export interface ArcGISGroup extends ItemTypeFromTypeSchemaFunction<typeof ArcGISGroupModule> { }
-export interface ArcGISGroupModel extends ModelTypeFromTypeSchemaFunction<ArcGISGroup> { }
-export default ArcGISGroupModule as ReplaceModelReturnType<typeof ArcGISGroupModule, ArcGISGroupModel>;
+export interface ArcGISGroupModel extends Model<ArcGISGroup> { }

package/src/models/assignment.ts

@@ -1,24 +1,21 @@
 import * as uuid from "uuid";
 
 import {
-  createModel,
-  createSchema,
   currentDate,
-  DocumentTypeFromSchema,
-  ItemTypeFromTypeSchemaFunction,
-  ModelFromSchema,
-  ModelTypeFromTypeSchemaFunction,
   MongooseModule,
-  ReplaceModelReturnType,
   retrieveCurrentUnixTime,
 } from "../helpers";
+import { Model } from "mongoose";
+import { AssignmentType } from "../types/assignment";
 
-export async function AssignmentModule(mongoose: MongooseModule) {
-  const { Schema, Types } = mongoose;
+export interface Assignment extends AssignmentType, Record<string, unknown> { }
 
-  const modelSchema = createSchema(Schema, {
+export default async function AssignmentModule(mongoose: MongooseModule) {
+  const { Schema } = mongoose;
+
+  const modelSchema = new Schema<AssignmentType>({
     _id: {
-      type: Types.ObjectId,
+      type: Schema.Types.ObjectId,
       auto: true,
     },
     uuid: {
@@ -52,7 +49,6 @@ export async function AssignmentModule(mongoose: MongooseModule) {
       type: Number,
       default: retrieveCurrentUnixTime,
     },
-
     //
     position: {
       type: Number,
@@ -71,20 +67,18 @@ export async function AssignmentModule(mongoose: MongooseModule) {
       default: "",
     },
   }, {
-    collection: "massive_assignment",
+    autoIndex: false,
   });
   modelSchema.set("autoIndex", false);
+  modelSchema.virtual("id").get(function(this: AssignmentType) {
+    return this._id.toString();
+  });
   modelSchema.set("toJSON", {
     virtuals: true,
     versionKey: false,
-    transform(doc: ModelFromSchema<typeof modelSchema>, ret: DocumentTypeFromSchema<typeof modelSchema>) {
-      ret.id = ret._id.toString();
-    },
   });
 
-  return createModel(mongoose, "Assignment", modelSchema);
+  return mongoose.model<Assignment>("Assignment", modelSchema, "massive_assignment", { overwriteModels: true });
 }
 
-export interface Assignment extends ItemTypeFromTypeSchemaFunction<typeof AssignmentModule> { }
-export interface AssignmentModel extends ModelTypeFromTypeSchemaFunction<Assignment> { }
-export default AssignmentModule as ReplaceModelReturnType<typeof AssignmentModule, AssignmentModel>;
+export interface AssignmentModel extends Model<Assignment> { }