tabletcommand-location 1.0.6 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.buildkite/pipeline.yml +5 -0
- package/.eslintrc.js +2 -1
- package/build/index.js +1 -0
- package/build/index.js.map +1 -1
- package/build/location.js +6 -5
- package/build/location.js.map +1 -1
- package/build/store.js +2 -0
- package/build/store.js.map +1 -1
- package/build/test/location.js +14 -14
- package/build/test/location.js.map +1 -1
- package/build/types.js +0 -1
- package/build/types.js.map +1 -1
- package/definitions/index.d.ts.map +1 -1
- package/definitions/location.d.ts.map +1 -1
- package/definitions/store.d.ts.map +1 -1
- package/gulpfile.js +0 -1
- package/package.json +16 -18
- package/src/index.ts +2 -5
- package/src/location.ts +6 -5
- package/src/store.ts +3 -2
- package/src/test/location.ts +15 -16
- package/src/types.ts +1 -1
- package/test.sh +32 -0
package/.eslintrc.js
CHANGED
|
@@ -7,7 +7,8 @@ module.exports = {
|
|
|
7
7
|
extends: [
|
|
8
8
|
"eslint:recommended",
|
|
9
9
|
"plugin:@typescript-eslint/recommended",
|
|
10
|
-
"plugin:@typescript-eslint/recommended-requiring-type-checking"
|
|
10
|
+
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
11
|
+
"plugin:security/recommended-legacy",
|
|
11
12
|
],
|
|
12
13
|
ignorePatterns: [
|
|
13
14
|
".eslintrc.js",
|
package/build/index.js
CHANGED
package/build/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAwC;AACxC,oDAAkC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAwC;AACxC,oDAAkC;AAOlC,oDAAuB;AAEvB,SAAgB,GAAG,CACjB,eAAgC,EAChC,aAA4B,EAC5B,eAAgC;IAEhC,MAAM,KAAK,GAAG,IAAA,eAAW,EAAC,eAAe,EAAE,aAAa,EAAE,eAAe,CAAC,CAAC;IAC3E,MAAM,QAAQ,GAAG,IAAA,kBAAc,EAAC,KAAK,CAAC,CAAC;IACvC,8FAA8F;IAC9F,uCAAuC;IACvC,IAAI;IAEJ,KAAK,UAAU,gBAAgB,CAAC,UAA+B,EAAE,KAA2C;QAC1G,MAAM,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QAC1B,IAAI;YACF,IAAI,gBAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,gBAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC3C,OAAO,EAAE,CAAC;aACX;YACD,IAAI,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC1C,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;aACjB;YACD,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACtE,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;YAC3C,MAAM,GAAG,CAAC;SACX;IACH,CAAC;IAED,iJAAiJ;IACjJ,UAAU;IACV,qDAAqD;IACrD,mBAAmB;IACnB,QAAQ;IACR,oDAAoD;IACpD,yBAAyB;IACzB,QAAQ;IACR,sFAAsF;IACtF,qBAAqB;IACrB,oBAAoB;IACpB,iBAAiB;IACjB,MAAM;IACN,IAAI;IAEJ,OAAO;QACL,kBAAkB;QAClB,gBAAgB;QAChB,wBAAwB;KACzB,CAAC;AACJ,CAAC;AAhDD,kBAgDC;AAED,kBAAe,GAAG,CAAC"}
|
package/build/location.js
CHANGED
|
@@ -67,7 +67,7 @@ function location(store) {
|
|
|
67
67
|
active: true,
|
|
68
68
|
username: item.radioName,
|
|
69
69
|
userId,
|
|
70
|
-
departmentId: department._id,
|
|
70
|
+
departmentId: String(department._id),
|
|
71
71
|
session: userId,
|
|
72
72
|
version: 2,
|
|
73
73
|
shared: sharingEnabled,
|
|
@@ -90,21 +90,22 @@ function location(store) {
|
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
async function processVehicle(departmentExceptions, item, department, atDate) {
|
|
93
|
+
const departmentId = String(department._id);
|
|
93
94
|
// need function to validate the item (As concerns vehicleId and radioName)
|
|
94
|
-
const isBidirectionalException = departmentExceptions.indexOf(
|
|
95
|
+
const isBidirectionalException = departmentExceptions.indexOf(departmentId) !== -1;
|
|
95
96
|
// Determine if vehicle is active or not
|
|
96
|
-
const cadItem = await store.getVehicle(item,
|
|
97
|
+
const cadItem = await store.getVehicle(item, departmentId);
|
|
97
98
|
if (!lodash_1.default.isObject(cadItem) &&
|
|
98
99
|
department.cadOneWayVehiclesEnabled &&
|
|
99
100
|
(department.cadBidirectionalEnabled !== true || isBidirectionalException)) {
|
|
100
101
|
const vehicleItem = {
|
|
101
|
-
departmentId:
|
|
102
|
+
departmentId: departmentId,
|
|
102
103
|
modifiedDate: atDate.valueOf() / 1000.0,
|
|
103
104
|
modified: atDate.toISOString(),
|
|
104
105
|
radioName: item.radioName,
|
|
105
106
|
vehicleId: item.vehicleId,
|
|
106
107
|
};
|
|
107
|
-
await store.updateVehicle(vehicleItem,
|
|
108
|
+
await store.updateVehicle(vehicleItem, departmentId);
|
|
108
109
|
}
|
|
109
110
|
return cadItem;
|
|
110
111
|
}
|
package/build/location.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location.js","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"location.js","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":"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"}
|
package/build/store.js
CHANGED
|
@@ -84,7 +84,9 @@ function store(departmentModel, locationModel, cadVehicleModel) {
|
|
|
84
84
|
}
|
|
85
85
|
const locationDelta = {};
|
|
86
86
|
for (const [key, value] of Object.entries(updateObject)) {
|
|
87
|
+
// eslint-disable-next-line security/detect-object-injection
|
|
87
88
|
if (JSON.stringify(value) !== JSON.stringify(locationRecord[key])) {
|
|
89
|
+
// eslint-disable-next-line security/detect-object-injection
|
|
88
90
|
locationDelta[key] = value;
|
|
89
91
|
}
|
|
90
92
|
}
|
package/build/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAgC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
package/build/test/location.js
CHANGED
|
@@ -37,7 +37,6 @@ let location;
|
|
|
37
37
|
let store;
|
|
38
38
|
const mock = (0, mock_1.default)(modelsModule);
|
|
39
39
|
const mockDepartment = mock.department;
|
|
40
|
-
const mockAgency = mock.agency;
|
|
41
40
|
let models;
|
|
42
41
|
describe("location", () => {
|
|
43
42
|
before(async () => {
|
|
@@ -88,7 +87,7 @@ describe("location", () => {
|
|
|
88
87
|
avlTime: "1602563495"
|
|
89
88
|
}
|
|
90
89
|
];
|
|
91
|
-
|
|
90
|
+
await location.processItems(department, items, atDate);
|
|
92
91
|
const locationRecords = await models.Location.find({});
|
|
93
92
|
assert.equal(locationRecords[0].userId, "BEEDOO1-BEEDOO1");
|
|
94
93
|
assert.equal(locationRecords[0].departmentId, "5195426cc4e016a988000969");
|
|
@@ -104,6 +103,7 @@ describe("location", () => {
|
|
|
104
103
|
assert.equal(vehicles.length, 2);
|
|
105
104
|
});
|
|
106
105
|
it("Will save locations (long lat numbers) and add CAD Vehicle records: ", async () => {
|
|
106
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
107
107
|
const atDate = new Date();
|
|
108
108
|
const department = mockDepartment;
|
|
109
109
|
const items = [{
|
|
@@ -118,18 +118,18 @@ describe("location", () => {
|
|
|
118
118
|
locationDestination: "Gru's House",
|
|
119
119
|
avlTime: "1602563494"
|
|
120
120
|
}];
|
|
121
|
-
|
|
122
|
-
const locationRecord = await models.Location.
|
|
123
|
-
assert.equal(locationRecord.userId, "BEEDOO1-BEEDOO1");
|
|
124
|
-
assert.equal(locationRecord.departmentId, "5195426cc4e016a988000969");
|
|
125
|
-
assert.equal(locationRecord.username, "BEEDOO1");
|
|
126
|
-
assert.equal(locationRecord.locationGeoJSON.coordinates[0], -119.0669);
|
|
127
|
-
assert.equal(locationRecord.locationGeoJSON.coordinates[1], 34.35264);
|
|
128
|
-
assert.equal(locationRecord.speed, -1);
|
|
129
|
-
const vehicle = await models.CADVehicle.
|
|
130
|
-
assert.equal(vehicle.vehicleId, "BEEDOO1");
|
|
131
|
-
assert.equal(vehicle.radioName, "BEEDOO1");
|
|
132
|
-
assert.equal(vehicle.mapHidden, false);
|
|
121
|
+
await location.processItems(department, items, atDate);
|
|
122
|
+
const locationRecord = await models.Location.find({});
|
|
123
|
+
assert.equal((_a = locationRecord[0]) === null || _a === void 0 ? void 0 : _a.userId, "BEEDOO1-BEEDOO1");
|
|
124
|
+
assert.equal((_b = locationRecord[0]) === null || _b === void 0 ? void 0 : _b.departmentId, "5195426cc4e016a988000969");
|
|
125
|
+
assert.equal((_c = locationRecord[0]) === null || _c === void 0 ? void 0 : _c.username, "BEEDOO1");
|
|
126
|
+
assert.equal((_d = locationRecord[0]) === null || _d === void 0 ? void 0 : _d.locationGeoJSON.coordinates[0], -119.0669);
|
|
127
|
+
assert.equal((_e = locationRecord[0]) === null || _e === void 0 ? void 0 : _e.locationGeoJSON.coordinates[1], 34.35264);
|
|
128
|
+
assert.equal((_f = locationRecord[0]) === null || _f === void 0 ? void 0 : _f.speed, -1);
|
|
129
|
+
const vehicle = await models.CADVehicle.find({});
|
|
130
|
+
assert.equal((_g = vehicle[0]) === null || _g === void 0 ? void 0 : _g.vehicleId, "BEEDOO1");
|
|
131
|
+
assert.equal((_h = vehicle[0]) === null || _h === void 0 ? void 0 : _h.radioName, "BEEDOO1");
|
|
132
|
+
assert.equal((_j = vehicle[0]) === null || _j === void 0 ? void 0 : _j.mapHidden, false);
|
|
133
133
|
/* cSpell:enable */
|
|
134
134
|
});
|
|
135
135
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location.js","sourceRoot":"","sources":["../../src/test/location.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,iBAAe;AACf,2EAA6D;
|
|
1
|
+
{"version":3,"file":"location.js","sourceRoot":"","sources":["../../src/test/location.ts"],"names":[],"mappings":"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"}
|
package/build/types.js
CHANGED
package/build/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EACf,aAAa,EACb,eAAe,EACf,UAAU,EACX,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,wBAAgB,GAAG,CACjB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe;mCAQY,QAAQ,UAAU,CAAC,SAAS,eAAe,EAAE,GAAG,IAAI,GAAG,SAAS;EAqC7G;AAED,eAAe,GAAG,CAAC;AACnB,oBAAY,SAAS,GAAG,UAAU,CAAC,OAAO,GAAG,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":";AACA,OAAO,EACL,UAAU,EAEV,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW;2CAmGW,MAAM,EAAE,QAAQ,eAAe,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI;+
|
|
1
|
+
{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../src/location.ts"],"names":[],"mappings":";AACA,OAAO,EACL,UAAU,EAEV,UAAU,EACX,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,eAAe,EAChB,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,wBAAgB,QAAQ,CAAC,KAAK,EAAE,WAAW;2CAmGW,MAAM,EAAE,QAAQ,eAAe,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI;+BAqB1F,QAAQ,UAAU,CAAC,SAAS,eAAe,EAAE,UAAU,IAAI;EA4BpG;AAED,eAAe,QAAQ,CAAC;AACxB,oBAAY,cAAc,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";AACA,OAAO,EACL,eAAe,
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";AACA,OAAO,EACL,eAAe,EACf,QAAQ,EACR,aAAa,EACb,eAAe,EACf,UAAU,EACX,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAkB,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1D,wBAAgB,KAAK,CACnB,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,aAAa,EAC5B,eAAe,EAAE,eAAe;uBAIA,eAAe,gBAAgB,MAAM;0BAQlC,QAAQ,UAAU,CAAC,gBAAgB,MAAM;2BAaxC,QAAQ,QAAQ,CAAC,UAAU,IAAI;EA4FpE;AACD,eAAe,KAAK,CAAC;AACrB,oBAAY,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC"}
|
package/gulpfile.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-location",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.8",
|
|
4
4
|
"description": "Tablet Command Location",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -14,43 +14,41 @@
|
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"debug": "^4.3.4",
|
|
16
16
|
"lodash": "~4.17.21",
|
|
17
|
-
"tabletcommand-backend-models": "~5.
|
|
17
|
+
"tabletcommand-backend-models": "~5.36.5"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
|
-
"@types/chai": "^4.3.
|
|
20
|
+
"@types/chai": "^4.3.11",
|
|
21
21
|
"@types/debug": "^4.1.12",
|
|
22
22
|
"@types/express": "^4.17.21",
|
|
23
|
-
"@types/lodash": "^4.14.
|
|
24
|
-
"@types/mocha": "^10.0.
|
|
23
|
+
"@types/lodash": "^4.14.202",
|
|
24
|
+
"@types/mocha": "^10.0.6",
|
|
25
25
|
"@types/mongodb": "~3.6.20",
|
|
26
26
|
"@types/mongoose": "~5.10.5",
|
|
27
|
-
"@types/node": "^20.
|
|
28
|
-
"@types/uuid": "^9.0.
|
|
29
|
-
"@typescript-eslint/eslint-plugin": "^6.
|
|
30
|
-
"@typescript-eslint/parser": "^6.
|
|
27
|
+
"@types/node": "^20.11.17",
|
|
28
|
+
"@types/uuid": "^9.0.8",
|
|
29
|
+
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
|
30
|
+
"@typescript-eslint/parser": "^6.21.0",
|
|
31
31
|
"bson": "~4.7.0",
|
|
32
32
|
"chai": "^4.3.10",
|
|
33
33
|
"cspell": "^7.3.8",
|
|
34
34
|
"del": "^6.0.0",
|
|
35
|
-
"eslint": "^8.
|
|
35
|
+
"eslint": "^8.56.0",
|
|
36
36
|
"eslint-plugin-node": "^11.1.0",
|
|
37
37
|
"eslint-plugin-promise": "^6.1.1",
|
|
38
|
-
"eslint-plugin-security": "^1.
|
|
38
|
+
"eslint-plugin-security": "^2.1.0",
|
|
39
39
|
"gulp": "^4.0.2",
|
|
40
|
-
"gulp-mocha": "^8.0.0",
|
|
41
40
|
"gulp-shell": "^0.8.0",
|
|
42
|
-
"mocha": "^10.
|
|
41
|
+
"mocha": "^10.3.0",
|
|
43
42
|
"mongoose": "~5.10.19",
|
|
44
|
-
"ts-node": "^10.9.
|
|
45
|
-
"type-coverage": "^2.27.
|
|
43
|
+
"ts-node": "^10.9.2",
|
|
44
|
+
"type-coverage": "^2.27.1",
|
|
46
45
|
"typescript": "~4.7.4"
|
|
47
46
|
},
|
|
48
47
|
"typeCoverage": {
|
|
49
|
-
"atLeast": 99.
|
|
48
|
+
"atLeast": 99.3,
|
|
50
49
|
"ignoreCatch": true,
|
|
51
50
|
"ignoreFiles": [
|
|
52
51
|
"src/test/**/*.ts"
|
|
53
|
-
]
|
|
54
|
-
"suppressError": true
|
|
52
|
+
]
|
|
55
53
|
}
|
|
56
54
|
}
|
package/src/index.ts
CHANGED
|
@@ -1,14 +1,10 @@
|
|
|
1
1
|
import locationModule from "./location";
|
|
2
2
|
import storeModule from "./store";
|
|
3
|
-
import {
|
|
4
|
-
AgencyModel,
|
|
3
|
+
import {
|
|
5
4
|
DepartmentModel,
|
|
6
5
|
LocationModel,
|
|
7
6
|
CADVehicleModel,
|
|
8
|
-
CADVehicle,
|
|
9
|
-
Location,
|
|
10
7
|
Department,
|
|
11
|
-
Agency
|
|
12
8
|
} from "tabletcommand-backend-models";
|
|
13
9
|
import _ from "lodash";
|
|
14
10
|
import { LocationPayload } from "./types";
|
|
@@ -35,6 +31,7 @@ export function lib(
|
|
|
35
31
|
const result = await location.processItems(department, items, atDate);
|
|
36
32
|
return result;
|
|
37
33
|
} catch (err) {
|
|
34
|
+
console.log("err processLocations: ", err);
|
|
38
35
|
throw err;
|
|
39
36
|
}
|
|
40
37
|
}
|
package/src/location.ts
CHANGED
|
@@ -83,7 +83,7 @@ export function location(store: StoreModule) {
|
|
|
83
83
|
active: true,
|
|
84
84
|
username: item.radioName,
|
|
85
85
|
userId,
|
|
86
|
-
departmentId: department._id,
|
|
86
|
+
departmentId: String(department._id),
|
|
87
87
|
session: userId,
|
|
88
88
|
version: 2,
|
|
89
89
|
shared: sharingEnabled,
|
|
@@ -110,21 +110,22 @@ export function location(store: StoreModule) {
|
|
|
110
110
|
}
|
|
111
111
|
|
|
112
112
|
async function processVehicle(departmentExceptions: string[], item: LocationPayload, department: Partial<Department>, atDate: Date) {
|
|
113
|
+
const departmentId = String(department._id);
|
|
113
114
|
// need function to validate the item (As concerns vehicleId and radioName)
|
|
114
|
-
const isBidirectionalException = departmentExceptions.indexOf(
|
|
115
|
+
const isBidirectionalException = departmentExceptions.indexOf(departmentId) !== -1;
|
|
115
116
|
// Determine if vehicle is active or not
|
|
116
|
-
const cadItem = await store.getVehicle(item,
|
|
117
|
+
const cadItem = await store.getVehicle(item, departmentId);
|
|
117
118
|
if (!_.isObject(cadItem) &&
|
|
118
119
|
department.cadOneWayVehiclesEnabled &&
|
|
119
120
|
(department.cadBidirectionalEnabled !== true || isBidirectionalException)) {
|
|
120
121
|
const vehicleItem: Partial<CADVehicle> = {
|
|
121
|
-
departmentId:
|
|
122
|
+
departmentId: departmentId,
|
|
122
123
|
modifiedDate: atDate.valueOf() / 1000.0,
|
|
123
124
|
modified: atDate.toISOString(),
|
|
124
125
|
radioName: item.radioName,
|
|
125
126
|
vehicleId: item.vehicleId,
|
|
126
127
|
};
|
|
127
|
-
await store.updateVehicle(vehicleItem,
|
|
128
|
+
await store.updateVehicle(vehicleItem, departmentId);
|
|
128
129
|
}
|
|
129
130
|
return cadItem;
|
|
130
131
|
}
|
package/src/store.ts
CHANGED
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import debugModule from "debug";
|
|
2
2
|
import {
|
|
3
3
|
DepartmentModel,
|
|
4
|
-
Department,
|
|
5
4
|
Location,
|
|
6
5
|
LocationModel,
|
|
7
6
|
CADVehicleModel,
|
|
8
7
|
CADVehicle,
|
|
9
8
|
} from "tabletcommand-backend-models";
|
|
10
9
|
import _ from "lodash";
|
|
11
|
-
import {
|
|
10
|
+
import { LocationObject, LocationPayload } from "./types";
|
|
12
11
|
|
|
13
12
|
export function store(
|
|
14
13
|
departmentModel: DepartmentModel,
|
|
@@ -99,7 +98,9 @@ export function store(
|
|
|
99
98
|
}
|
|
100
99
|
const locationDelta: Partial<LocationObject> = {};
|
|
101
100
|
for (const [key, value] of Object.entries(updateObject)) {
|
|
101
|
+
// eslint-disable-next-line security/detect-object-injection
|
|
102
102
|
if (JSON.stringify(value) !== JSON.stringify(locationRecord[key])) {
|
|
103
|
+
// eslint-disable-next-line security/detect-object-injection
|
|
103
104
|
locationDelta[key] = value;
|
|
104
105
|
}
|
|
105
106
|
}
|
package/src/test/location.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import chai from "chai";
|
|
2
2
|
import "mocha";
|
|
3
3
|
import * as modelsModule from "tabletcommand-backend-models";
|
|
4
|
-
import _ from "lodash";
|
|
5
4
|
import storeModule, { StoreModule } from "../store";
|
|
6
5
|
import mockModule from "./mock";
|
|
7
6
|
import locationModule, { LocationModule } from "../location";
|
|
8
7
|
import { LocationPayload } from "../types";
|
|
8
|
+
import { BackendModels } from "tabletcommand-backend-models";
|
|
9
9
|
|
|
10
10
|
const assert = chai.assert;
|
|
11
11
|
let location: LocationModule;
|
|
@@ -13,8 +13,7 @@ let store: StoreModule;
|
|
|
13
13
|
|
|
14
14
|
const mock = mockModule(modelsModule);
|
|
15
15
|
const mockDepartment = mock.department;
|
|
16
|
-
|
|
17
|
-
let models: any;
|
|
16
|
+
let models: BackendModels;
|
|
18
17
|
|
|
19
18
|
describe("location", () => {
|
|
20
19
|
before(async () => {
|
|
@@ -72,7 +71,7 @@ describe("location", () => {
|
|
|
72
71
|
locationDestination: "Gru's House2",
|
|
73
72
|
avlTime: "1602563495"
|
|
74
73
|
}] as unknown as LocationPayload[];
|
|
75
|
-
|
|
74
|
+
await location.processItems(department, items, atDate);
|
|
76
75
|
const locationRecords = await models.Location.find({});
|
|
77
76
|
assert.equal(locationRecords[0].userId, "BEEDOO1-BEEDOO1");
|
|
78
77
|
assert.equal(locationRecords[0].departmentId, "5195426cc4e016a988000969");
|
|
@@ -102,18 +101,18 @@ describe("location", () => {
|
|
|
102
101
|
locationDestination: "Gru's House",
|
|
103
102
|
avlTime: "1602563494"
|
|
104
103
|
}] as unknown as LocationPayload[];
|
|
105
|
-
|
|
106
|
-
const locationRecord = await models.Location.
|
|
107
|
-
assert.equal(locationRecord
|
|
108
|
-
assert.equal(locationRecord
|
|
109
|
-
assert.equal(locationRecord
|
|
110
|
-
assert.equal(locationRecord
|
|
111
|
-
assert.equal(locationRecord
|
|
112
|
-
assert.equal(locationRecord
|
|
113
|
-
const vehicle = await models.CADVehicle.
|
|
114
|
-
assert.equal(vehicle
|
|
115
|
-
assert.equal(vehicle
|
|
116
|
-
assert.equal(vehicle
|
|
104
|
+
await location.processItems(department, items, atDate);
|
|
105
|
+
const locationRecord = await models.Location.find({});
|
|
106
|
+
assert.equal(locationRecord[0]?.userId, "BEEDOO1-BEEDOO1");
|
|
107
|
+
assert.equal(locationRecord[0]?.departmentId, "5195426cc4e016a988000969");
|
|
108
|
+
assert.equal(locationRecord[0]?.username, "BEEDOO1");
|
|
109
|
+
assert.equal(locationRecord[0]?.locationGeoJSON.coordinates[0], -119.0669);
|
|
110
|
+
assert.equal(locationRecord[0]?.locationGeoJSON.coordinates[1], 34.35264);
|
|
111
|
+
assert.equal(locationRecord[0]?.speed, -1);
|
|
112
|
+
const vehicle = await models.CADVehicle.find({});
|
|
113
|
+
assert.equal(vehicle[0]?.vehicleId, "BEEDOO1");
|
|
114
|
+
assert.equal(vehicle[0]?.radioName, "BEEDOO1");
|
|
115
|
+
assert.equal(vehicle[0]?.mapHidden, false);
|
|
117
116
|
/* cSpell:enable */
|
|
118
117
|
});
|
|
119
118
|
});
|
package/src/types.ts
CHANGED
package/test.sh
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
set -e
|
|
4
|
+
|
|
5
|
+
if [ -f ~/.bash_profile ]; then
|
|
6
|
+
source ~/.bash_profile
|
|
7
|
+
fi
|
|
8
|
+
|
|
9
|
+
if [ -f ~/.profile ]; then
|
|
10
|
+
source ~/.profile
|
|
11
|
+
fi
|
|
12
|
+
|
|
13
|
+
# MacOS
|
|
14
|
+
if hash brew 2>/dev/null; then
|
|
15
|
+
if [ -f $(brew --prefix nvm)/nvm.sh ]; then
|
|
16
|
+
source $(brew --prefix nvm)/nvm.sh
|
|
17
|
+
fi
|
|
18
|
+
fi
|
|
19
|
+
|
|
20
|
+
NODE_VERSION="v16.19.0"
|
|
21
|
+
|
|
22
|
+
nvm use $NODE_VERSION || nvm install $NODE_VERSION
|
|
23
|
+
|
|
24
|
+
npm install
|
|
25
|
+
echo "--- spelling"
|
|
26
|
+
npx cspell
|
|
27
|
+
echo "--- type coverage"
|
|
28
|
+
npx type-coverage
|
|
29
|
+
echo "--- lint"
|
|
30
|
+
npm run lint
|
|
31
|
+
echo "--- test"
|
|
32
|
+
npm test
|