tabletcommand-backend-models 5.15.4 → 5.16.0

package/build/models/location.js

@@ -84,18 +84,6 @@ async function LocationModule(mongoose) {
             type: Number,
             default: 0,
         },
-        location: {
-            longitude: {
-                type: Number,
-                required: true,
-                default: 0,
-            },
-            latitude: {
-                type: Number,
-                required: true,
-                default: 0,
-            },
-        },
         // Shared AVL
         locationGeoJSON: {
             type: GeoJSONPoint,
@@ -139,6 +127,17 @@ async function LocationModule(mongoose) {
     modelSchema.virtual("id").get(function () {
         return this._id.toHexString();
     });
+    modelSchema.virtual("location").get(function () {
+        const location = {
+            latitude: 0,
+            longitude: 0
+        };
+        if (this && this.locationGeoJSON && this.locationGeoJSON.coordinates && this.locationGeoJSON.coordinates.length === 2) {
+            location.longitude = this.locationGeoJSON.coordinates[0];
+            location.latitude = this.locationGeoJSON.coordinates[1];
+        }
+        return location;
+    });
     // Create GeoJSON index
     modelSchema.index({
         locationGeoJSON: "2dsphere",

package/build/models/location.js.map

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

package/definitions/models/location.d.ts

@@ -17,10 +17,6 @@ export declare function LocationModule(mongoose: MongooseModule): Promise<import
     heading: number;
     speed: number;
     esriId: number;
-    location: {
-        longitude: number;
-        latitude: number;
-    };
     locationGeoJSON: import("../helpers").MongooseInterface<{
         type: {
             type: StringConstructor;

package/definitions/models/location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../../src/models/location.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,8BAA8B,EAC9B,+BAA+B,EAE/B,cAAc,EACd,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAKpB,wBAAsB,cAAc,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6J5D;AAED,MAAM,WAAW,QAAS,SAAQ,8BAA8B,CAAC,OAAO,cAAc,CAAC;CAAI;AAC3F,MAAM,WAAW,aAAc,SAAQ,+BAA+B,CAAC,QAAQ,CAAC;CAAI;;AACpF,wBAA8F"}
+{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../../src/models/location.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,8BAA8B,EAC9B,+BAA+B,EAE/B,cAAc,EACd,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAKpB,wBAAsB,cAAc,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6J5D;AAED,MAAM,WAAW,QAAS,SAAQ,8BAA8B,CAAC,OAAO,cAAc,CAAC;CAAI;AAC3F,MAAM,WAAW,aAAc,SAAQ,+BAA+B,CAAC,QAAQ,CAAC;CAAI;;AACpF,wBAA8F"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabletcommand-backend-models",
-  "version": "5.15.4",
+  "version": "5.16.0",
   "description": "Tablet Command Backend Models",
   "scripts": {
     "test": "gulp",

package/src/models/location.ts

@@ -96,18 +96,6 @@ export async function LocationModule(mongoose: MongooseModule) {
       default: 0,
     },
 
-    location: {
-      longitude: {
-        type: Number,
-        required: true,
-        default: 0,
-      },
-      latitude: {
-        type: Number,
-        required: true,
-        default: 0,
-      },
-    },
     // Shared AVL
     locationGeoJSON: {
       type: GeoJSONPoint,
@@ -156,6 +144,18 @@ export async function LocationModule(mongoose: MongooseModule) {
     return this._id.toHexString();
   });
 
+  modelSchema.virtual("location").get(function(this: { locationGeoJSON: { coordinates: number[] }} | null | undefined) {
+    const location = {
+      latitude: 0,
+      longitude: 0
+    };
+    if (this && this.locationGeoJSON && this.locationGeoJSON.coordinates && this.locationGeoJSON.coordinates.length === 2) {
+      location.longitude = this.locationGeoJSON.coordinates[0];
+      location.latitude = this.locationGeoJSON.coordinates[1];
+    }
+    return location;
+  });
+
   // Create GeoJSON index
   modelSchema.index({
     locationGeoJSON: "2dsphere",

package/test/department.js

@@ -26,6 +26,7 @@ describe("Department", function() {
     assert.isObject(testItem);
     const item = new models.Department(testItem);
     const sut = await item.save();
+    const result = await models.Department.findOne({_id: testItem._id}).lean();
     assert.isNotNull(sut._id);
     assert.isNotNull(sut.id);
     assert.equal(sut.department, testItem.department);

package/test/location.js

@@ -25,6 +25,7 @@ describe("Location", function() {
   it("is saved", async function() {
     const item = new models.Location(testItem);
     const sut = await item.save();
+    const result = await models.Location.findOne({_id: testItem._id});
     assert.isNotNull(testItem._id);
     assert.equal(testItem.departmentId, sut.departmentId);
     assert.equal(testItem.userId, sut.userId);
@@ -35,11 +36,11 @@ describe("Location", function() {
     assert.equal(testItem.session, sut.session);
     assert.equal(testItem.active, sut.active);
     assert.equal(testItem.heading, sut.heading);
-    assert.equal(testItem.location.longitude, sut.location.longitude);
-    assert.equal(testItem.location.latitude, sut.location.latitude);
-    assert.equal(testItem.locationGeoJSON.type, "Point");
     assert.equal(testItem.locationGeoJSON.coordinates[0], sut.location.longitude);
     assert.equal(testItem.locationGeoJSON.coordinates[1], sut.location.latitude);
+    assert.equal(testItem.locationGeoJSON.type, "Point");
+    assert.equal(testItem.locationGeoJSON.coordinates[0], sut.locationGeoJSON.coordinates[0]);
+    assert.equal(testItem.locationGeoJSON.coordinates[1], sut.locationGeoJSON.coordinates[1]);
     assert.equal(testItem.opAreaCode, sut.opAreaCode);
     assert.equal(testItem.opAreaName, sut.opAreaName);
     assert.equal(testItem.shared, sut.shared);
@@ -64,7 +65,7 @@ describe("Location", function() {
     };
 
     try {
-      await models.Location.findOne(geoQuery);
+      const result = await models.Location.findOne(geoQuery);
       assert.isFalse(true, "Expecting above to fail.");
     } catch (error) {
       assert.isNotNull(error, "Expecting above to fail");

package/test/mock.js

@@ -593,13 +593,9 @@ module.exports = function(dependencies) {
     device_type: "iPad",
     active: true,
     heading: 43,
-    location: {
-      longitude: -122.304,
-      latitude: 37.541
-    },
     locationGeoJSON: {
       type: "Point",
-      coordinates: [-122.304, 37.541],
+      coordinates: [-120.001, 37.001],
     },
     session: "abcd",
     opAreaCode: "DAL",