tabletcommand-backend-models 7.0.15 → 7.1.0

package/src/models/chart-managed-incident.ts

@@ -1,10 +1,8 @@
 import { Model } from "mongoose";
 import {
   MongooseModule,
-  MongooseDocument,
 } from "../helpers";
 
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { ChartItemType, ChartManagedIncidentType } from "../types/chart";
 
 export interface ChartManagedIncident extends ChartManagedIncidentType { }
@@ -57,20 +55,11 @@ export default async function ChartManagedIncidentModule(mongoose: MongooseModul
       default: [],
     },
   }, {
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
-  modelSchema.set("autoIndex", false);
-
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-  });
-
-  modelSchema.virtual("id").get(function(this: MongooseDocument) {
-    // tslint:disable-next-line: no-unsafe-any
-    return this._id.toString();
-  });
-
-  modelSchema.plugin(mongooseLeanVirtuals);
 
   return mongoose.model<ChartManagedIncident>("ChartManagedIncident", modelSchema, "massive_chart_managed_incident", { overwriteModels: true });
 }

package/src/models/chart-user.ts

@@ -1,10 +1,8 @@
 import { Model } from "mongoose";
 import {
   MongooseModule,
-  MongooseDocument,
 } from "../helpers";
 
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { ChartUserType } from "../types/chart";
 const defaultDate = new Date("2013-01-01T00:26:40.000Z"); // Chart fallback date, before sync
 
@@ -37,20 +35,11 @@ export default async function ChartUserModule(mongoose: MongooseModule) {
       default: [],
     },
   }, {
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
-  modelSchema.set("autoIndex", false);
-
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-  });
-
-  modelSchema.virtual("id").get(function(this: MongooseDocument) {
-    // tslint:disable-next-line: no-unsafe-any
-    return this._id.toString();
-  });
-
-  modelSchema.plugin(mongooseLeanVirtuals);
 
   return mongoose.model<ChartUser>("ChartUser", modelSchema, "massive_chart_user", { overwriteModels: true });
 }

package/src/models/checklist-item.ts

@@ -62,8 +62,8 @@ export function ChecklistItemSchema(mongoose: MongooseModule) {
       default: ""
     }
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
   return modelSchema;
 }
 

package/src/models/checklist.ts

@@ -73,8 +73,8 @@ export function ChecklistSchema(mongoose: MongooseModule) {
       default: [],
     }
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
   modelSchema.virtual("id").get(function(this: MongooseDocument) {
     // tslint:disable-next-line: no-unsafe-any
     return this._id.toString();

package/src/models/csv-import.ts

@@ -68,8 +68,8 @@ export default async function CSVImportModule(mongoose: MongooseModule) {
       default: false
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<CSVImport>("CSVImport", modelSchema, "massive_csv_import", { overwriteModels: true });
 }

package/src/models/department.ts

@@ -1,5 +1,5 @@
 import * as uuid from "uuid";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import { mongooseLeanVirtuals } from "mongoose-lean-virtuals";
 
 import {
   currentDate,
@@ -1640,11 +1640,10 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
       default: ForwardingConfigDefault,
     },
   }, {
-  });
-
-  modelSchema.set("autoIndex", false);
-  modelSchema.set("timestamps", {
-    updatedAt: "modified",
+    "autoIndex": false,
+    "timestamps": {
+      updatedAt: "modified",
+    }
   });
 
   modelSchema.virtual("id").get(function(this: Department) {
@@ -1656,7 +1655,6 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
     versionKey: false,
   });
 
-
   modelSchema.plugin(mongooseLeanVirtuals);
 
   return mongoose.model<Department>("Department", modelSchema, "massive_admin", { overwriteModels: true });

package/src/models/device-mapping.ts

@@ -77,8 +77,8 @@ export default async function DeviceMappingModule(mongoose: MongooseModule) {
       default: false,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<DeviceMapping>("DeviceMapping", modelSchema, "massive_device_mapping", { overwriteModels: true });
 }

package/src/models/esri.ts

@@ -108,17 +108,10 @@ export function EsriSchema(mongoose: MongooseModule) {
       default: new Date("1970-01-01T00:00:00.000Z"),
     },
   }, {
-  });
-  modelSchema.set("autoIndex", false);
-
-  // Deprecated. Check which apps rely on .id instead of using ._id.
-  modelSchema.virtual("id").get(function(this: Esri) {
-    return this._id.toHexString();
-  });
-
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
 
   return modelSchema;

package/src/models/gst-mapping.ts

@@ -70,8 +70,8 @@ export default async function GSTMappingModule(mongoose: MongooseModule) {
       default: "",
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<GSTMapping>("GSTMapping", modelSchema, "massive_gst_mapping", { overwriteModels: true });
 }

package/src/models/incident-event.ts

@@ -5,7 +5,7 @@ import {
   MongooseModule,
   retrieveCurrentUnixTime,
 } from "../helpers";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import { mongooseLeanVirtuals } from "mongoose-lean-virtuals";
 import { EventUserType, IncidentEventType } from "../types/incident-events";
 
 export interface IncidentEvent extends IncidentEventType { }
@@ -112,6 +112,7 @@ export function IncidentEventSchema(mongoose: MongooseModule) {
       default: false,
     },
   }, {
+    autoIndex: false,
   });
   modelSchema.set("toJSON", {
     virtuals: true,
@@ -124,7 +125,6 @@ export function IncidentEventSchema(mongoose: MongooseModule) {
   });
 
   modelSchema.plugin(mongooseLeanVirtuals);
-  modelSchema.set("autoIndex", false);
   return modelSchema;
 }
 

package/src/models/incident-notified.ts

@@ -78,8 +78,8 @@ export default async function IncidentNotifiedModule(mongoose: MongooseModule) {
       default: currentDate,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<IncidentNotified>("IncidentNotified", modelSchema, "massive_incident_notified", { overwriteModels: true });
 }

package/src/models/incident-takeover.ts

@@ -71,8 +71,8 @@ export default async function IncidentTakeoverModule(mongoose: MongooseModule) {
       default: 0,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<IncidentTakeover>("IncidentTakeover", modelSchema, "massive_incident_takeover", { overwriteModels: true });
 }

package/src/models/job-log.ts

@@ -1,10 +1,8 @@
 import { Model } from "mongoose";
 import {
-  MongooseDocument,
   MongooseModule,
   currentDate,
 } from "../helpers";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { JobLogType } from "../types/job-log";
 
 export interface JobLog extends JobLogType { }
@@ -43,18 +41,11 @@ export default async function JobLogModule(mongoose: MongooseModule) {
       default: false,
     },
   }, {
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-  });
-
-  modelSchema.virtual("id").get(function(this: MongooseDocument) {
-    return this._id.toHexString();
-  });
-
-  modelSchema.plugin(mongooseLeanVirtuals);
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<JobLog>("JobLog", modelSchema, "massive_job_log", { overwriteModels: true });
 }

package/src/models/location.ts

@@ -6,7 +6,7 @@ import {
   MongooseDocument,
   MongooseModule,
 } from "../helpers";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import { mongooseLeanVirtuals } from "mongoose-lean-virtuals";
 import ColorModule from "./schema/color";
 import GeoJSONPointModule from "./schema/geojson-point";
 import { Model } from "mongoose";
@@ -182,6 +182,7 @@ export default async function LocationModule(mongoose: MongooseModule) {
       default: [],
     },
   }, {
+    autoIndex: false,
   });
 
   modelSchema.set("toJSON", {
@@ -220,7 +221,6 @@ export default async function LocationModule(mongoose: MongooseModule) {
   });
 
   modelSchema.plugin(mongooseLeanVirtuals);
-  modelSchema.set("autoIndex", false);
   return mongoose.model<Location>("Location", modelSchema, "massive_location", { overwriteModels: true });
 }
 

package/src/models/mail-log.ts

@@ -76,8 +76,8 @@ export default async function MailLogModule(mongoose: MongooseModule) {
       default: currentDate,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<MailLog>("MailLog", modelSchema, "massive_mail_log", { overwriteModels: true });
 }

package/src/models/managed-incident.ts

@@ -1,4 +1,4 @@
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import { mongooseLeanVirtuals } from "mongoose-lean-virtuals";
 import * as uuid from "uuid";
 import {
   currentDate,
@@ -561,8 +561,8 @@ export default async function ManagedIncidentModule(mongoose: MongooseModule) {
       type: SharedSource,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   modelSchema.virtual("id").get(function(this: ManagedIncident) {
     return this._id.toHexString();

package/src/models/mark43-incident-retry.ts

@@ -83,8 +83,8 @@ export default async function Mark43IncidentRetryModule(mongoose: MongooseModule
       type: String,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<Mark43IncidentRetry>("Mark43IncidentRetry", modelSchema, "massive_mark43_incident_retry", { overwriteModels: true });
 }

package/src/models/message.ts

@@ -95,8 +95,8 @@ export default async function MessageModule(mongoose: MongooseModule) {
       default: {},
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<Message>("Message", modelSchema, "massive_message", { overwriteModels: true });
 }

package/src/models/monitor.ts

@@ -4,7 +4,6 @@ import {
   MongooseModule,
   retrieveCurrentUnixTime,
 } from "../helpers";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { MonitorType } from "../types/monitor";
 
 export interface Monitor extends MonitorType { }
@@ -56,14 +55,11 @@ export default async function MonitorModule(mongoose: MongooseModule) {
       default: 1,
     },
   }, {
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-  });
-
-  modelSchema.plugin(mongooseLeanVirtuals);
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<Monitor>("Monitor", modelSchema, "massive_monitor", { overwriteModels: true });
 }

package/src/models/personnel-import.ts

@@ -111,8 +111,8 @@ export function PersonnelImportSchema(mongoose: MongooseModule) {
       default: "",
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return modelSchema;
 }

package/src/models/rate-limit.ts

@@ -33,8 +33,8 @@ export default async function RateLimitModule(mongoose: MongooseModule) {
       default: "",
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<RateLimit>("RateLimit", modelSchema, "massive_rate_limit", { overwriteModels: true });
 }

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

@@ -4,7 +4,7 @@ import {
 } from "../../helpers";
 
 import * as uuid from "uuid";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import { mongooseLeanVirtuals } from "mongoose-lean-virtuals";
 import { IncidentEventSchema } from "../incident-event";
 import {
   CADPersonSchema,

package/src/models/session.ts

@@ -75,8 +75,8 @@ export default async function SessionModule(mongoose: MongooseModule) {
       default: null,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   modelSchema.pre("save", function(next) {
     this._id = this.get("token"); // Copy _id from token

package/src/models/smtp-unhandled.ts

@@ -1,9 +1,7 @@
 import { Model } from "mongoose";
 import {
-  MongooseDocument,
   MongooseModule,
 } from "../helpers";
-import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { SMTPUnhandledType } from "../types/smtp-unhandled";
 
 export interface SMTPUnhandled extends SMTPUnhandledType { }
@@ -27,18 +25,11 @@ export default async function SMTPUnhandledModule(mongoose: MongooseModule) {
       required: true,
     },
   }, {
+    autoIndex: false,
+    toJSON: {
+      versionKey: false,
+    }
   });
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-  });
-
-  modelSchema.virtual("id").get(function(this: MongooseDocument) {
-    return this._id.toHexString();
-  });
-
-  modelSchema.plugin(mongooseLeanVirtuals);
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<SMTPUnhandled>("SMTPUnhandled", modelSchema, "massive_smtp_unhandled", { overwriteModels: true });
 }

package/src/models/template.ts

@@ -102,8 +102,8 @@ export function TemplateSchema(mongoose: MongooseModule) {
       default: null,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
   modelSchema.virtual("id").get(function(this: Template) {
     return this._id.toHexString();
   });

package/src/models/user-device.ts

@@ -195,8 +195,8 @@ export default async function UserDeviceModule(mongoose: MongooseModule) {
       default: false,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return mongoose.model<UserDevice>("UserDevice", modelSchema, "massive_user_device", { overwriteModels: true });
 }

package/src/models/validation-report.ts

@@ -56,8 +56,8 @@ export function ValidationReportSchema(mongoose: MongooseModule) {
       default: currentDate,
     },
   }, {
+    autoIndex: false,
   });
-  modelSchema.set("autoIndex", false);
 
   return modelSchema;
 }

package/src/mongoose-lean-virtuals.d.ts

@@ -1,6 +1,5 @@
 declare module "mongoose-lean-virtuals" {
   import { Schema } from "mongoose";
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const mongooseLeanVirtuals: <T>(schema: Schema<T>, opts?: any) => void;
-  export default mongooseLeanVirtuals;
+  export function mongooseLeanVirtuals<T>(schema: Schema<T>, opts?: any): void;
 }

package/src/test/esri.ts

@@ -28,7 +28,6 @@ describe("Esri", function() {
     assert.isNotNull(sut._id);
     assert.isNotNull(sut.id);
     assert.equal(sut._id.toString(), testItem._id?.toString());
-    assert.equal(sut.toJSON().id, testItem._id?.toString());
     assert.equal(sut.departmentId, testItem.departmentId);
 
     assert.equal(sut.auth.username, testItem.auth?.username);