tabletcommand-backend-models 5.39.5 → 7.0.0

package/test/mock.js

@@ -172,7 +172,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const agency = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: new mongoose.Types.ObjectId("56131f724143487a10000001"),
     code: "TC",
     name: "Tablet Command",
@@ -270,11 +270,11 @@ module.exports = function mockModule(dependencies) {
     units: [battalionUnit]
   };
 
-  const checklistId = mongoose.Types.ObjectId();
+  const checklistId = new mongoose.Types.ObjectId();
   const checklistUUID = "150cf1ca-ffbb-42c9-bd4c-fd64be45d888";
 
   const checklistItem = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     uuid: "150cf1ca-ffbb-42c9-bd4c-fd64be45d887",
     checklist_uuid: checklistUUID,
     position: 1,
@@ -342,7 +342,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const cadIncident = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     uuid: "150cf1ca-ffbb-42c9-bd4c-fd64be45d679",
     departmentId: "56131f724143487a10000001",
     AgencyID: "BDC",
@@ -501,7 +501,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const cadStatus = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     code: "AV",
     codeDisplay: "RS",
     color: {
@@ -554,7 +554,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const cadVehicle = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     uuid: "30f8d7c7-20a3-4a12-b911-a424f5037003",
     radioName: "T01",
     vehicleId: "7705",
@@ -597,7 +597,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const department = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     department: "Test Department",
     addressDetails: {
       city: "San Francisco",
@@ -734,7 +734,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const deviceMapping = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     nick: "Test",
     departmentId: "d123",
     deviceType: "hello",
@@ -748,7 +748,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const esri = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: new mongoose.Types.ObjectId("56131f724143487a10000001"),
     modified_unix_date: 1432230780,
     auth: {
@@ -782,7 +782,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const gstMapping = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: "d123",
     unitId: "E123",
     modified_unix_date: 1432230780,
@@ -816,7 +816,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const incidentTakeover = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     incident_id: "i1234",
     incident_name: "Test Incident",
     incident_number: "TC-12345",
@@ -829,7 +829,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const incidentNotified = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: "d123",
     IncidentNumber: "T-1536603902",
     incidentTypes: [
@@ -850,7 +850,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const location = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: "d123",
     userId: "542a40db20783c000000153d",
     uuid: "92c8f732-52b7-46cc-855a-d54fddfe3172",
@@ -876,7 +876,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const managedIncident = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     CallerNumber: "(720) 275-6765",
     CommandChannel: "ACPRI",
     TacticalAltChannel: "ACOPSB",
@@ -1017,7 +1017,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const monitor = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: "546ace2b3cd8d60d1d00256a",
     agencyId: "123",
     notificationType: "maps-auth-error",
@@ -1027,7 +1027,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const rateLimit = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     username: "test123",
     modified_unix_date: 1426983552.49945,
     count: 8
@@ -1062,7 +1062,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const user = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     nick: "Test",
     email: "test@save.me",
     mapId: "TEST",
@@ -1159,7 +1159,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const personnelImport = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     PersonnelID: "AM0111",
     PersonnelName: "Test User",
     PersonnelRank: "Eng",
@@ -1180,7 +1180,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const csvImport = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     batchId: "AM0111",
     departmentId: "1234",
     agencyId: "abcd1234",
@@ -1195,7 +1195,7 @@ module.exports = function mockModule(dependencies) {
   };
 
   const validationReport = {
-    _id: mongoose.Types.ObjectId(),
+    _id: new mongoose.Types.ObjectId(),
     departmentId: new mongoose.Types.ObjectId("56131f724143487a10000001"),
     modified: new Date("2022-11-13T22:02:01Z"),
     location: [],

package/test/monitor.js

@@ -1,36 +1,29 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("Monitor", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("Monitor", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.monitor;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", async function() {
+
+  it("is saved", async function () {
     const item = new models.Monitor(testItem);
-    const sut = await item.save();
-    assert.isNotNull(sut._id);
+    const ress = await item.save();
+    assert.isNotNull(ress._id);
 
-    assert.equal(testItem.departmentId, sut.departmentId);
-    assert.equal(testItem.agencyId, sut.agencyId);
-    assert.equal(testItem.notificationType, sut.notificationType);
-    assert.equal(testItem.status, sut.status);
-    assert.equal(testItem.sentUnixDate, sut.sentUnixDate);
+    assert.equal(testItem.departmentId, ress.departmentId);
+    assert.equal(testItem.agencyId, ress.agencyId);
+    assert.equal(testItem.notificationType, ress.notificationType);
+    assert.equal(testItem.status, ress.status);
+    assert.equal(testItem.sentUnixDate, ress.sentUnixDate);
   });
 });

package/test/personnel-import.js

@@ -1,51 +1,44 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("PersonnelImport", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("PersonnelImport", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.personnelImport;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", async function() {
+
+  it("is saved", async function () {
     const item = new models.PersonnelImport(testItem);
-    const sut = await item.save();
-    assert.equal(testItem._id, sut._id);
-    assert.equal(testItem.PersonnelID, sut.PersonnelID);
-    assert.equal(testItem.PersonnelName, sut.PersonnelName);
-    assert.equal(testItem.PersonnelRank, sut.PersonnelRank);
-    assert.equal(testItem.PersonnelWorkCode, sut.PersonnelWorkCode);
-    assert.equal(testItem.PersonnelNote, sut.PersonnelNote);
-    assert.equal(testItem.departmentId, sut.departmentId);
-    assert.equal(testItem.radioNames[0], sut.radioNames[0]);
-    assert.equal(testItem.radioNames[1], sut.radioNames[1]);
-    assert.equal(sut.radioNames.length, 2);
-    assert.equal(testItem.shiftStartTime, sut.shiftStartTime);
-    assert.equal(testItem.shiftEndTime, sut.shiftEndTime);
-    assert.equal(testItem.modified_unix_date, sut.modified_unix_date);
-    assert.equal(testItem.active, sut.active);
-    assert.equal(testItem.agencyName, sut.agencyName);
-    assert.equal(testItem.agencyCode, sut.agencyCode);
-    assert.equal(testItem.agencyId, sut.agencyId);
-    assert.equal(testItem.importNotes, sut.importNotes);
-    assert.equal(testItem.modified.toString(), sut.modified.toISOString());
-    assert.equal(testItem.shiftStart.toString(), sut.shiftStart.toISOString());
-    assert.equal(testItem.shiftEnd.toString(), sut.shiftEnd.toISOString());
+    const ress = await item.save();
+    assert.equal(testItem._id, ress._id);
+    assert.equal(testItem.PersonnelID, ress.PersonnelID);
+    assert.equal(testItem.PersonnelName, ress.PersonnelName);
+    assert.equal(testItem.PersonnelRank, ress.PersonnelRank);
+    assert.equal(testItem.PersonnelWorkCode, ress.PersonnelWorkCode);
+    assert.equal(testItem.PersonnelNote, ress.PersonnelNote);
+    assert.equal(testItem.departmentId, ress.departmentId);
+    assert.equal(testItem.radioNames[0], ress.radioNames[0]);
+    assert.equal(testItem.radioNames[1], ress.radioNames[1]);
+    assert.equal(ress.radioNames.length, 2);
+    assert.equal(testItem.shiftStartTime, ress.shiftStartTime);
+    assert.equal(testItem.shiftEndTime, ress.shiftEndTime);
+    assert.equal(testItem.modified_unix_date, ress.modified_unix_date);
+    assert.equal(testItem.active, ress.active);
+    assert.equal(testItem.agencyName, ress.agencyName);
+    assert.equal(testItem.agencyCode, ress.agencyCode);
+    assert.equal(testItem.agencyId, ress.agencyId);
+    assert.equal(testItem.importNotes, ress.importNotes);
+    assert.equal(testItem.modified.toString(), ress.modified.toISOString());
+    assert.equal(testItem.shiftStart.toString(), ress.shiftStart.toISOString());
+    assert.equal(testItem.shiftEnd.toString(), ress.shiftEnd.toISOString());
   });
 });
 

package/test/rate-limit.js

@@ -1,38 +1,29 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("RateLimit", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("RateLimit", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.rateLimit;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", function(done) {
+
+  it("is saved", function () {
     var item = new models.RateLimit(testItem);
-    item.save(function(err, sut) {
-      assert.isNull(err, "Should not err");
+    item.save().then((ress) => {
 
       assert.isNotNull(testItem._id);
-      assert.equal(sut.user, testItem.user);
-      assert.equal(sut.modified_unix_date, testItem.modified_unix_date);
-      assert.equal(sut.count, testItem.count);
+      assert.equal(ress.user, testItem.user);
+      assert.equal(ress.modified_unix_date, testItem.modified_unix_date);
+      assert.equal(ress.count, testItem.count);
 
-      return done();
-    });
+    }).catch((err) => { assert.isNull(err, "Should not err"); });
   });
 });

package/test/release-note.js

@@ -5,10 +5,10 @@ const assert = require("chai").assert;
 const m = require("..");
 const config = require("./config");
 
-describe("ReleaseNote", function() {
+describe("ReleaseNote", function () {
   let models, mongoose;
   let testItem;
-  beforeEach(async function() {
+  beforeEach(async function () {
     const c = await m.connect(config.url);
     models = c.models;
     mongoose = c.mongoose;
@@ -18,15 +18,10 @@ describe("ReleaseNote", function() {
     });
     testItem = mock.releaseNote;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", function(done) {
+  it("is saved", function () {
     var item = new models.ReleaseNote(testItem);
-    item.save(function(err, sut) {
-      assert.isNull(err, "Should not err");
-
+    item.save().then((ress) => {
       assert.isNotNull(testItem._id);
       assert.equal(testItem.title, sut.title);
       assert.equal(testItem.notes, sut.notes);
@@ -34,7 +29,6 @@ describe("ReleaseNote", function() {
       assert.equal(testItem.releaseDate, sut.releaseDate);
       assert.equal(testItem.status, sut.status);
 
-      return done();
-    });
+    }).catch((err) => { assert.isNull(err, "Should not err"); });
   });
 });

package/test/session.js

@@ -1,49 +1,40 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("Session", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("Session", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.session;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", function(done) {
+
+  it("is saved", function () {
     var item = new models.Session(testItem);
-    item.save(function(err, sut) {
-      assert.isNull(err, "Should not err");
+    item.save().then((ress) => {
 
       assert.isNotNull(testItem._id);
-      assert.equal(sut.user, testItem.user);
-      assert.equal(sut.email, testItem.email);
-      assert.equal(sut.nick, testItem.nick);
-      assert.equal(sut.departmentId, testItem.departmentId);
-      assert.isFalse(sut.active);
-      assert.equal(sut.deviceId, testItem.deviceId);
-      assert.equal(sut.remoteAddress, testItem.remoteAddress);
-      assert.equal(sut.userAgent, testItem.userAgent);
-      assert.equal(sut.source, testItem.source);
-      assert.equal(sut.token, testItem.token);
-      assert.equal(sut.ended, testItem.ended);
-      assert.equal(sut.departmentId, testItem.departmentId);
-      assert.equal(sut.when, testItem.when);
-      assert.equal(sut.id, sut._id);
+      assert.equal(ress.user, testItem.user);
+      assert.equal(ress.email, testItem.email);
+      assert.equal(ress.nick, testItem.nick);
+      assert.equal(ress.departmentId, testItem.departmentId);
+      assert.isFalse(ress.active);
+      assert.equal(ress.deviceId, testItem.deviceId);
+      assert.equal(ress.remoteAddress, testItem.remoteAddress);
+      assert.equal(ress.userAgent, testItem.userAgent);
+      assert.equal(ress.source, testItem.source);
+      assert.equal(ress.token, testItem.token);
+      assert.equal(ress.ended, testItem.ended);
+      assert.equal(ress.departmentId, testItem.departmentId);
+      assert.equal(ress.when, testItem.when);
+      assert.equal(ress.id, ress._id);
 
-      return done();
-    });
+    }).catch((err) => { assert.isNull(err, "Should not err"); });
   });
 });

package/test/template.js

@@ -1,48 +1,39 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("Template", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("Template", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.template;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", function(done) {
+
+  it("is saved", function () {
     var item = new models.Template(testItem);
-    item.save(function(err, sut) {
-      assert.isNull(err, "Should not err");
+    item.save().then((ress) => {
 
       assert.isNotNull(item._id);
-      assert.equal(item._id, sut.id);
-      assert.equal(sut.id, sut._id);
-      assert.equal(testItem.position, sut.position);
-      assert.equal(testItem.active, sut.active);
-      assert.equal(testItem.name, sut.name);
-      assert.equal(testItem.userId, sut.userId);
-      assert.equal(testItem.departmentId, sut.departmentId);
-      assert.equal(testItem.isMandatory, sut.isMandatory);
+      assert.equal(item._id, ress.id);
+      assert.equal(ress.id, ress._id);
+      assert.equal(testItem.position, ress.position);
+      assert.equal(testItem.active, ress.active);
+      assert.equal(testItem.name, ress.name);
+      assert.equal(testItem.userId, ress.userId);
+      assert.equal(testItem.departmentId, ress.departmentId);
+      assert.equal(testItem.isMandatory, ress.isMandatory);
       assert.isArray(testItem.group);
       assert.isArray(testItem.checklist);
-      assert.equal(testItem.agencyId, sut.agencyId);
+      assert.equal(testItem.agencyId, ress.agencyId);
       const expectedDate = new Date().valueOf() / 1000.0;
-      const timeDelta = expectedDate - sut.modified_unix_date;
+      const timeDelta = expectedDate - ress.modified_unix_date;
       assert.isTrue(timeDelta < 1);
-      return done();
-    });
+    }).catch((err) => { assert.isNull(err, "Should not err"); });
   });
 });

package/test/user-device.js

@@ -1,56 +1,49 @@
 "use strict";
 
 const assert = require("chai").assert;
-
-const m = require("..");
-const config = require("./config");
-
-describe("UserDevice", function() {
-  let models, mongoose;
+const mongoose = require('mongoose');
+describe("UserDevice", function () {
+  let models = mongoose.models;
   let testItem;
-  beforeEach(async function() {
-    const c = await m.connect(config.url);
-    models = c.models;
-    mongoose = c.mongoose;
+  beforeEach(async function () {
+
 
     const mock = require("./mock")({
       mongoose
     });
     testItem = mock.userDevice;
   });
-  afterEach(function() {
-    mongoose.disconnect();
-  });
 
-  it("is saved", async function() {
+
+  it("is saved", async function () {
     const item = new models.UserDevice(testItem);
-    const sut = await item.save();
+    const ress = await item.save();
 
     assert.isNotNull(testItem._id);
-    assert.equal(sut.id, sut._id);
-    assert.equal(testItem.userId, sut.userId);
-    assert.equal(testItem.departmentId, sut.departmentId);
-    assert.equal(sut.devices.length, 1);
-    assert.equal(testItem.devices[0].token, sut.devices[0].token);
-    assert.equal(testItem.devices[0].env, sut.devices[0].env);
-    assert.equal(testItem.devices[0].ua, sut.devices[0].ua);
-    assert.equal(testItem.devices[0].time, sut.devices[0].time);
-    assert.equal(testItem.devices[0].drift, sut.devices[0].drift);
-    assert.equal(testItem.devices[0].bundleIdentifier, sut.devices[0].bundleIdentifier);
-    assert.equal(testItem.devices[0].silentEnabled, sut.devices[0].silentEnabled);
-    assert.equal(testItem.devices[0].criticalAlertsEnabled, sut.devices[0].criticalAlertsEnabled);
-    assert.equal(testItem.devices[0].session, sut.devices[0].session);
-    assert.equal(testItem.devices[0].active, sut.devices[0].active);
-    assert.equal(testItem.devices[0].offDuty, sut.devices[0].offDuty);
-    assert.equal(testItem.notificationCount, sut.notificationCount);
-    assert.equal(JSON.stringify(testItem.notificationIncidentSettings[0]), JSON.stringify(sut.notificationIncidentSettings[0]));
-    assert.equal(JSON.stringify(testItem.notificationUnitSettings[0]), JSON.stringify(sut.notificationUnitSettings[0]));
+    assert.equal(ress.id, ress._id);
+    assert.equal(testItem.userId, ress.userId);
+    assert.equal(testItem.departmentId, ress.departmentId);
+    assert.equal(ress.devices.length, 1);
+    assert.equal(testItem.devices[0].token, ress.devices[0].token);
+    assert.equal(testItem.devices[0].env, ress.devices[0].env);
+    assert.equal(testItem.devices[0].ua, ress.devices[0].ua);
+    assert.equal(testItem.devices[0].time, ress.devices[0].time);
+    assert.equal(testItem.devices[0].drift, ress.devices[0].drift);
+    assert.equal(testItem.devices[0].bundleIdentifier, ress.devices[0].bundleIdentifier);
+    assert.equal(testItem.devices[0].silentEnabled, ress.devices[0].silentEnabled);
+    assert.equal(testItem.devices[0].criticalAlertsEnabled, ress.devices[0].criticalAlertsEnabled);
+    assert.equal(testItem.devices[0].session, ress.devices[0].session);
+    assert.equal(testItem.devices[0].active, ress.devices[0].active);
+    assert.equal(testItem.devices[0].offDuty, ress.devices[0].offDuty);
+    assert.equal(testItem.notificationCount, ress.notificationCount);
+    assert.equal(JSON.stringify(testItem.notificationIncidentSettings[0]), JSON.stringify(ress.notificationIncidentSettings[0]));
+    assert.equal(JSON.stringify(testItem.notificationUnitSettings[0]), JSON.stringify(ress.notificationUnitSettings[0]));
     assert.equal(testItem.offDuty, true);
     assert.equal(testItem.criticalAlertsVolume, "MED");
 
-    assert.isObject(sut.notificationSounds);
-    assert.deepEqual(sut.notificationSounds, item.notificationSounds);
-    assert.isObject(sut.notificationSounds.ios);
-    assert.isObject(sut.notificationSounds.android);
+    assert.isObject(ress.notificationSounds);
+    assert.deepEqual(ress.notificationSounds, item.notificationSounds);
+    assert.isObject(ress.notificationSounds.ios);
+    assert.isObject(ress.notificationSounds.android);
   });
 });