tabletcommand-backend-models 5.17.0 → 5.17.4

package/src/models/location.ts

@@ -9,7 +9,6 @@ import {
   MongooseDocument,
   MongooseModule,
   ReplaceModelReturnType,
-  retrieveCurrentUnixTime,
 } from "../helpers";
 import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import ColorModule from "./schema/color";
@@ -152,14 +151,6 @@ export async function LocationModule(mongoose: MongooseModule) {
     return location;
   });
 
-  modelSchema.virtual("modified_unix_date").get(function(this: { modified: Date } | null | undefined) {
-    let newUnixDate = new Date().getTime() / 1000;
-    if (this && this.modified) {
-      newUnixDate = new Date(this.modified).getTime() / 1000;
-    }
-    return newUnixDate;
-  });
-
    // Create GeoJSON index
   modelSchema.index({
     locationGeoJSON: "2dsphere",

package/src/models/managed-incident.ts

@@ -33,6 +33,7 @@ export async function ManagedIncidentModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const modelSchema = createSchema(Schema, {

package/src/models/message.ts

@@ -25,6 +25,7 @@ export async function MessageModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const modelSchema = createSchema(Schema, {

package/src/models/remote-log.ts

@@ -43,6 +43,7 @@ export async function RemoteLogModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const modelSchema = createSchema(Schema, {

package/src/models/schema/cad-status-option-selected.ts

@@ -25,6 +25,7 @@ export default function CADStatusOptionSelectedSchema(mongoose: MongooseModule)
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return Item;

package/src/models/schema/color.ts

@@ -17,6 +17,7 @@ export default function ColorSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return Color;

package/src/models/schema/esri-auth.ts

@@ -17,6 +17,7 @@ export default function EsriAuthSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const EsriAuth = createSchema(Schema, {
@@ -30,6 +31,7 @@ export default function EsriAuthSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return EsriAuth;

package/src/models/schema/esri-error.ts

@@ -25,6 +25,7 @@ export default function EsriErrorSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return EsriError;

package/src/models/schema/esri-map.ts

@@ -45,6 +45,7 @@ export default function EsriMapSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const BaseMap = createSchema(Schema, {
@@ -58,6 +59,7 @@ export default function EsriMapSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   // Use a simpler set for Offline Maps
@@ -103,6 +105,7 @@ export default function EsriMapSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const Map = createSchema(Schema, {
@@ -132,6 +135,7 @@ export default function EsriMapSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return Map;

package/src/models/schema/esri-token.ts

@@ -29,6 +29,7 @@ export default function EsriTokenSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return EsriToken;

package/src/models/schema/firemapper-auth.ts

@@ -17,6 +17,7 @@ export default function FireMapperAuthSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const FireMapperAuth = createSchema(Schema, {
@@ -34,6 +35,7 @@ export default function FireMapperAuthSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return FireMapperAuth;

package/src/models/schema/geojson-point.ts

@@ -20,6 +20,7 @@ export default function GeoJSONPointSchema(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   return GeoJSONPoint;

package/src/models/template.ts

@@ -32,6 +32,7 @@ export async function TemplateModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const GroupOption = createSchema(Schema, {
@@ -45,6 +46,7 @@ export async function TemplateModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const modelSchema = createSchema(Schema, {

package/src/models/user-device.ts

@@ -27,6 +27,7 @@ export async function UserDeviceModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const IncidentSetting = createSchema(Schema, {
@@ -44,6 +45,7 @@ export async function UserDeviceModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const deviceSchema = createSchema(Schema, {
@@ -103,6 +105,7 @@ export async function UserDeviceModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const soundSchemaItem = createSchema(Schema, {
@@ -118,6 +121,7 @@ export async function UserDeviceModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const soundSchema = createSchema(Schema, {
@@ -129,6 +133,7 @@ export async function UserDeviceModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
 
   const modelSchema = createSchema(Schema, {

package/src/models/user.ts

@@ -30,6 +30,7 @@ export async function UserModule(mongoose: MongooseModule) {
     },
   }, {
     _id: false,
+    id: false,
   });
   const modelSchema = createSchema(Schema, {
     nick: {

package/test/cad-incident.js

@@ -22,74 +22,82 @@ describe("CADIncident", function() {
     mongoose.disconnect();
   });
 
-  it("is saved", function(done) {
-    var item = new models.CADIncident(testItem);
-    item.save(function(err, sut) {
-      assert.isNull(err, "Should not err");
+  it("is saved", async function() {
+    const item = new models.CADIncident(testItem);
+    const sut = await item.save();
 
-      assert.isNotNull(testItem._id);
-      assert.equal(sut.uuid, testItem.uuid);
-      assert.equal(sut.departmentId, testItem.departmentId);
-      assert.equal(sut.AgencyID, testItem.AgencyID);
-      assert.equal(sut.IncidentNumber, testItem.IncidentNumber);
-      assert.equal(sut.TransactionID, testItem.TransactionID);
-      assert.equal(sut.AgencyIncidentCallTypeDescription, testItem.AgencyIncidentCallTypeDescription);
-      assert.equal(sut.StreetName, testItem.StreetName);
-      assert.equal(sut.StreetSuffix, testItem.StreetSuffix);
-      assert.equal(sut.Predirectional, testItem.Predirectional);
-      assert.equal(sut.Postdirectional, testItem.Postdirectional);
-      assert.equal(sut.CityOrLocality, testItem.CityOrLocality);
-      assert.equal(sut.Floor, testItem.Floor);
-      assert.equal(sut.Suite, testItem.Suite);
-      assert.equal(sut.City, testItem.City);
-      assert.equal(sut.Building, testItem.Building);
-      assert.equal(sut.StateOrProvince, testItem.StateOrProvince);
-      assert.equal(sut.CommonPlaceName, testItem.CommonPlaceName);
-      assert.equal(sut.LocationComment, testItem.LocationComment);
-      assert.equal(sut.CrossStreet1, testItem.CrossStreet1);
-      assert.equal(sut.CrossStreet2, testItem.CrossStreet2);
-      assert.equal(sut.cross_streets, testItem.cross_streets);
-      assert.equal(sut.PostalCode, testItem.PostalCode);
-      assert.equal(sut.CallerNumber, testItem.CallerNumber);
-      assert.equal(sut.Latitude, testItem.Latitude);
-      assert.equal(sut.Longitude, testItem.Longitude);
-      assert.equal(sut.preference_location, testItem.preference_location);
-      assert.equal(sut.EntryDateTime, testItem.EntryDateTime);
-      assert.equal(sut.ClosedDateTime, testItem.ClosedDateTime);
-      assert.equal(sut.closed_unix_date, testItem.closed_unix_date);
-      assert.equal(sut.start_unix_date, testItem.start_unix_date);
-      assert.equal(sut.modified_unix_date, testItem.modified_unix_date);
+    assert.isNotNull(testItem._id);
+    assert.equal(sut.uuid, testItem.uuid);
+    assert.equal(sut.departmentId, testItem.departmentId);
+    assert.equal(sut.AgencyID, testItem.AgencyID);
+    assert.equal(sut.IncidentNumber, testItem.IncidentNumber);
+    assert.equal(sut.TransactionID, testItem.TransactionID);
+    assert.equal(sut.AgencyIncidentCallTypeDescription, testItem.AgencyIncidentCallTypeDescription);
+    assert.equal(sut.StreetName, testItem.StreetName);
+    assert.equal(sut.StreetSuffix, testItem.StreetSuffix);
+    assert.equal(sut.Predirectional, testItem.Predirectional);
+    assert.equal(sut.Postdirectional, testItem.Postdirectional);
+    assert.equal(sut.CityOrLocality, testItem.CityOrLocality);
+    assert.equal(sut.Floor, testItem.Floor);
+    assert.equal(sut.Suite, testItem.Suite);
+    assert.equal(sut.City, testItem.City);
+    assert.equal(sut.Building, testItem.Building);
+    assert.equal(sut.StateOrProvince, testItem.StateOrProvince);
+    assert.equal(sut.CommonPlaceName, testItem.CommonPlaceName);
+    assert.equal(sut.LocationComment, testItem.LocationComment);
+    assert.equal(sut.CrossStreet1, testItem.CrossStreet1);
+    assert.equal(sut.CrossStreet2, testItem.CrossStreet2);
+    assert.equal(sut.cross_streets, testItem.cross_streets);
+    assert.equal(sut.PostalCode, testItem.PostalCode);
+    assert.equal(sut.CallerNumber, testItem.CallerNumber);
+    assert.equal(sut.Latitude, testItem.Latitude);
+    assert.equal(sut.Longitude, testItem.Longitude);
+    assert.equal(sut.preference_location, testItem.preference_location);
+    assert.equal(sut.EntryDateTime, testItem.EntryDateTime);
+    assert.equal(sut.ClosedDateTime, testItem.ClosedDateTime);
+    assert.equal(sut.closed_unix_date, testItem.closed_unix_date);
+    assert.equal(sut.start_unix_date, testItem.start_unix_date);
+    assert.equal(sut.modified_unix_date, testItem.modified_unix_date);
 
-      assert.isTrue(sut.PriorIncidentChanged);
-      assert.equal(sut.PriorIncidentChanged, testItem.PriorIncidentChanged);
-      assert.equal(sut.PriorIncident.length, 1);
-      if (sut.PriorIncident.length === 1) {
-        var pi = sut.PriorIncident[0];
-        var pid = testItem.PriorIncident[0];
-        assert.equal(pi.IncidentNumber, pid.IncidentNumber);
-        assert.equal(pi.IncidentDateTime, pid.IncidentDateTime);
-        assert.equal(pi.Problem, pid.Problem);
-        assert.equal(pi.Address, pid.Address);
-        assert.equal(pi.Suite, pid.Suite);
-        assert.equal(pi.Jurisdiction, pid.Jurisdiction);
-        assert.equal(pi.Comment[0].Comment, pid.Comment[0].Comment);
-        assert.equal(pi.Comment[0].CommentSource, pid.Comment[0].CommentSource);
-        assert.equal(pi.Comment[0].CommentDateTime, pid.Comment[0].CommentDateTime);
-      }
+    assert.isTrue(sut.PriorIncidentChanged);
+    assert.equal(sut.PriorIncidentChanged, testItem.PriorIncidentChanged);
+    assert.equal(sut.PriorIncident.length, 1);
+    if (sut.PriorIncident.length === 1) {
+      var pi = sut.PriorIncident[0];
+      var pid = testItem.PriorIncident[0];
+      assert.equal(pi.IncidentNumber, pid.IncidentNumber);
+      assert.equal(pi.IncidentDateTime, pid.IncidentDateTime);
+      assert.equal(pi.Problem, pid.Problem);
+      assert.equal(pi.Address, pid.Address);
+      assert.equal(pi.Suite, pid.Suite);
+      assert.equal(pi.Jurisdiction, pid.Jurisdiction);
+      assert.equal(pi.Comment[0].Comment, pid.Comment[0].Comment);
+      assert.equal(pi.Comment[0].CommentSource, pid.Comment[0].CommentSource);
+      assert.equal(pi.Comment[0].CommentDateTime, pid.Comment[0].CommentDateTime);
+    }
 
-      assert.equal(sut.units.length, 1);
-      assert.equal(sut.units[0].UnitDispatchNumber, testItem.units[0].UnitDispatchNumber);
-      assert.equal(sut.units[0].UnitID, testItem.units[0].UnitID);
-      assert.equal(sut.units[0].TimeDispatched, testItem.units[0].TimeDispatched);
+    assert.equal(sut.units.length, 1);
+    assert.equal(sut.units[0].UnitDispatchNumber, testItem.units[0].UnitDispatchNumber);
+    assert.equal(sut.units[0].UnitID, testItem.units[0].UnitID);
+    assert.equal(sut.units[0].TimeDispatched, testItem.units[0].TimeDispatched);
 
-      assert.equal(sut.Comment.length, 1);
-      assert.equal(sut.Comment[0].Comment, testItem.Comment[0].Comment);
-      assert.equal(sut.Comment[0].CommentSource, testItem.Comment[0].CommentSource);
-      assert.equal(sut.Comment[0].CommentDateTime, testItem.Comment[0].CommentDateTime);
+    assert.equal(sut.Comment.length, 1);
+    assert.equal(sut.Comment[0].Comment, testItem.Comment[0].Comment);
+    assert.equal(sut.Comment[0].CommentSource, testItem.Comment[0].CommentSource);
+    assert.equal(sut.Comment[0].CommentDateTime, testItem.Comment[0].CommentDateTime);
+  });
 
-      // assert.equal(sut.incidentTypes[0].name, testItem.incidentTypes[0].name);
+  it("no virtuals id if _id not present", async function() {
+    const item = new models.CADIncident(testItem);
+    await item.save();
 
-      return done();
+    const sut = await models.CADIncident.findOne({ _id: item._id }).lean({
+      virtuals: true
     });
+    assert.equal(sut.units.length, 1);
+    assert.isUndefined(sut.units[0].id);
+
+    assert.equal(sut.Comment.length, 1);
+    assert.isUndefined(sut.Comment[0].id);
   });
 });

package/test/csv-import.js

@@ -39,6 +39,7 @@ describe("CSVImport", function() {
     // assert.equal(testItem.fileLastModified, sut.fileLastModified);
     assert.equal(testItem.records.length, 0);
     assert.equal(testItem.userId, sut.userId);
+    assert.equal(testItem.sendNotification, sut.sendNotification);
   });
 });
 

package/test/location.js

@@ -26,13 +26,11 @@ describe("Location", function() {
     const item = new models.Location(testItem);
     const sut = await item.save();
     const result = await models.Location.findOne({_id: testItem._id});
-    const modifiedToUnix = result.modified ? result.modified / 1000 : new Date() / 1000;
     assert.isNotNull(testItem._id);
     assert.equal(testItem.departmentId, sut.departmentId);
     assert.equal(testItem.userId, sut.userId);
     assert.equal(testItem.uuid, sut.uuid);
     assert.equal(testItem.username, sut.username);
-    assert.equal(modifiedToUnix, sut.modified_unix_date);
     assert.equal(testItem.device_type, sut.device_type);
     assert.equal(testItem.session, sut.session);
     assert.equal(testItem.active, sut.active);

package/test/mock.js

@@ -593,7 +593,6 @@ module.exports = function(dependencies) {
     userId: "542a40db20783c000000153d",
     uuid: "92c8f732-52b7-46cc-855a-d54fddfe3172",
     username: "E23",
-    modified_unix_date: 1426983552.49945,
     device_type: "iPad",
     active: true,
     heading: 43,
@@ -856,7 +855,8 @@ module.exports = function(dependencies) {
     fileSize: 800,
     records: [],
     userId: "4321",
-    status: "success"
+    status: "success",
+    sendNotification: false
   };
 
   async function cleanup() {