tabletcommand-backend-models 5.17.10 → 5.17.11
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/build/models/department.js +5 -3
- package/build/models/department.js.map +1 -1
- package/build/models/managed-incident.js +9 -0
- package/build/models/managed-incident.js.map +1 -1
- package/build/models/schema/pubnub-token.js +26 -0
- package/build/models/schema/pubnub-token.js.map +1 -0
- package/build/models/user.js +4 -19
- package/build/models/user.js.map +1 -1
- package/definitions/models/department.d.ts +15 -2
- package/definitions/models/department.d.ts.map +1 -1
- package/definitions/models/managed-incident.d.ts.map +1 -1
- package/definitions/models/schema/pubnub-token.d.ts +20 -0
- package/definitions/models/schema/pubnub-token.d.ts.map +1 -0
- package/definitions/models/user.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/models/department.ts +6 -3
- package/src/models/managed-incident.ts +13 -0
- package/src/models/schema/pubnub-token.ts +29 -0
- package/src/models/user.ts +4 -20
- package/test/department.js +3 -3
- package/test/mock.js +5 -1
|
@@ -4,8 +4,10 @@ exports.DepartmentModule = void 0;
|
|
|
4
4
|
const uuid = require("uuid");
|
|
5
5
|
const mongooseLeanVirtuals = require("mongoose-lean-virtuals");
|
|
6
6
|
const helpers_1 = require("../helpers");
|
|
7
|
+
const pubnub_token_1 = require("./schema/pubnub-token");
|
|
7
8
|
async function DepartmentModule(mongoose) {
|
|
8
9
|
const { Schema, Types } = mongoose;
|
|
10
|
+
const PubNubToken = (0, pubnub_token_1.default)(mongoose);
|
|
9
11
|
const SafetyPriorityKeyword = (0, helpers_1.createSchema)(Schema, {
|
|
10
12
|
priority: {
|
|
11
13
|
type: Number,
|
|
@@ -285,9 +287,9 @@ async function DepartmentModule(mongoose) {
|
|
|
285
287
|
type: String,
|
|
286
288
|
default: "",
|
|
287
289
|
},
|
|
288
|
-
|
|
289
|
-
type:
|
|
290
|
-
default:
|
|
290
|
+
pubNubV3: {
|
|
291
|
+
type: PubNubToken,
|
|
292
|
+
default: null,
|
|
291
293
|
},
|
|
292
294
|
// Move this to a different collection
|
|
293
295
|
esriGeoJSONFilename: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"department.js","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,+DAA+D;AAE/D,wCAWoB;
|
|
1
|
+
{"version":3,"file":"department.js","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ManagedIncidentModule = void 0;
|
|
4
|
+
const mongooseLeanVirtuals = require("mongoose-lean-virtuals");
|
|
4
5
|
const uuid = require("uuid");
|
|
5
6
|
const helpers_1 = require("../helpers");
|
|
6
7
|
async function ManagedIncidentModule(mongoose) {
|
|
@@ -419,7 +420,15 @@ async function ManagedIncidentModule(mongoose) {
|
|
|
419
420
|
modelSchema.set("toJSON", {
|
|
420
421
|
virtuals: true,
|
|
421
422
|
versionKey: false,
|
|
423
|
+
transform(doc, ret) {
|
|
424
|
+
ret.id = ret._id;
|
|
425
|
+
},
|
|
426
|
+
});
|
|
427
|
+
modelSchema.virtual("id").get(function () {
|
|
428
|
+
// tslint:disable-next-line: no-unsafe-any
|
|
429
|
+
return this._id.toString();
|
|
422
430
|
});
|
|
431
|
+
modelSchema.plugin(mongooseLeanVirtuals);
|
|
423
432
|
return (0, helpers_1.createModel)(mongoose, "ManagedIncident", modelSchema);
|
|
424
433
|
}
|
|
425
434
|
exports.ManagedIncidentModule = ManagedIncidentModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-incident.js","sourceRoot":"","sources":["../../src/models/managed-incident.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"managed-incident.js","sourceRoot":"","sources":["../../src/models/managed-incident.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const helpers_1 = require("../../helpers");
|
|
4
|
+
function PubNubTokenSchema(mongoose) {
|
|
5
|
+
const { Schema } = mongoose;
|
|
6
|
+
const Item = (0, helpers_1.createSchema)(Schema, {
|
|
7
|
+
token: {
|
|
8
|
+
type: String,
|
|
9
|
+
default: "",
|
|
10
|
+
},
|
|
11
|
+
expireAt: {
|
|
12
|
+
type: Date,
|
|
13
|
+
default: helpers_1.currentDate,
|
|
14
|
+
},
|
|
15
|
+
runAt: {
|
|
16
|
+
type: Date,
|
|
17
|
+
default: "",
|
|
18
|
+
},
|
|
19
|
+
}, {
|
|
20
|
+
_id: false,
|
|
21
|
+
id: false,
|
|
22
|
+
});
|
|
23
|
+
return Item;
|
|
24
|
+
}
|
|
25
|
+
exports.default = PubNubTokenSchema;
|
|
26
|
+
//# sourceMappingURL=pubnub-token.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pubnub-token.js","sourceRoot":"","sources":["../../../src/models/schema/pubnub-token.ts"],"names":[],"mappings":";;AAAA,2CAIuB;AAEvB,SAAwB,iBAAiB,CAAC,QAAwB;IAChE,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE5B,MAAM,IAAI,GAAG,IAAA,sBAAY,EAAC,MAAM,EAAE;QAChC,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,qBAAW;SACrB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,EAAE;SACZ;KACF,EAAE;QACD,GAAG,EAAE,KAAK;QACV,EAAE,EAAE,KAAK;KACV,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAtBD,oCAsBC"}
|
package/build/models/user.js
CHANGED
|
@@ -5,10 +5,12 @@ const uuid = require("uuid");
|
|
|
5
5
|
const helpers_1 = require("../helpers");
|
|
6
6
|
const esri_auth_1 = require("./schema/esri-auth");
|
|
7
7
|
const esri_error_1 = require("./schema/esri-error");
|
|
8
|
+
const pubnub_token_1 = require("./schema/pubnub-token");
|
|
8
9
|
async function UserModule(mongoose) {
|
|
9
10
|
const { Schema } = mongoose;
|
|
10
11
|
const EsriAuth = (0, esri_auth_1.default)(mongoose);
|
|
11
12
|
const EsriError = (0, esri_error_1.default)(mongoose);
|
|
13
|
+
const PubNubToken = (0, pubnub_token_1.default)(mongoose);
|
|
12
14
|
const VehicleSchema = (0, helpers_1.createSchema)(Schema, {
|
|
13
15
|
radioName: {
|
|
14
16
|
type: String,
|
|
@@ -22,23 +24,6 @@ async function UserModule(mongoose) {
|
|
|
22
24
|
_id: false,
|
|
23
25
|
id: false,
|
|
24
26
|
});
|
|
25
|
-
const PubNubTokenSchema = (0, helpers_1.createSchema)(Schema, {
|
|
26
|
-
token: {
|
|
27
|
-
type: String,
|
|
28
|
-
default: "",
|
|
29
|
-
},
|
|
30
|
-
expireAt: {
|
|
31
|
-
type: Date,
|
|
32
|
-
default: helpers_1.currentDate,
|
|
33
|
-
},
|
|
34
|
-
runAt: {
|
|
35
|
-
type: Date,
|
|
36
|
-
default: "",
|
|
37
|
-
},
|
|
38
|
-
}, {
|
|
39
|
-
_id: false,
|
|
40
|
-
id: false,
|
|
41
|
-
});
|
|
42
27
|
const modelSchema = (0, helpers_1.createSchema)(Schema, {
|
|
43
28
|
nick: {
|
|
44
29
|
type: String,
|
|
@@ -166,11 +151,11 @@ async function UserModule(mongoose) {
|
|
|
166
151
|
default: "",
|
|
167
152
|
},
|
|
168
153
|
pubNubV2: {
|
|
169
|
-
type:
|
|
154
|
+
type: PubNubToken,
|
|
170
155
|
default: null,
|
|
171
156
|
},
|
|
172
157
|
pubNubV3: {
|
|
173
|
-
type:
|
|
158
|
+
type: PubNubToken,
|
|
174
159
|
default: null,
|
|
175
160
|
},
|
|
176
161
|
// Password Reset
|
package/build/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,wCAWoB;AACpB,kDAAgD;AAChD,oDAAkD;
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="mongoose" />
|
|
2
|
-
import { MongooseModule, ItemTypeFromTypeSchemaFunction, ModelTypeFromTypeSchemaFunction, ReplaceModelReturnType } from "../helpers";
|
|
2
|
+
import { currentDate, MongooseModule, ItemTypeFromTypeSchemaFunction, ModelTypeFromTypeSchemaFunction, ReplaceModelReturnType } from "../helpers";
|
|
3
3
|
export declare function DepartmentModule(mongoose: MongooseModule): Promise<import("mongoose").Model<import("mongoose").Document & Record<string, unknown> & {
|
|
4
4
|
_id: import("bson").ObjectID;
|
|
5
5
|
uuid: string;
|
|
@@ -59,7 +59,20 @@ export declare function DepartmentModule(mongoose: MongooseModule): Promise<impo
|
|
|
59
59
|
mowsEnabled: boolean;
|
|
60
60
|
rtsEnabled: boolean;
|
|
61
61
|
rtsChannelPrefix: string;
|
|
62
|
-
|
|
62
|
+
pubNubV3: import("../helpers").MongooseInterface<{
|
|
63
|
+
token: {
|
|
64
|
+
type: StringConstructor;
|
|
65
|
+
default: string;
|
|
66
|
+
};
|
|
67
|
+
expireAt: {
|
|
68
|
+
type: DateConstructor;
|
|
69
|
+
default: typeof currentDate;
|
|
70
|
+
};
|
|
71
|
+
runAt: {
|
|
72
|
+
type: DateConstructor;
|
|
73
|
+
default: string;
|
|
74
|
+
};
|
|
75
|
+
}>;
|
|
63
76
|
esriGeoJSONFilename: string;
|
|
64
77
|
customWebUrl: string;
|
|
65
78
|
customWebName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"department.d.ts","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":";AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"department.d.ts","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":";AAGA,OAAO,EAGL,WAAW,EAGX,cAAc,EAEd,8BAA8B,EAC9B,+BAA+B,EAC/B,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAGpB,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiZ9D;AAED,MAAM,WAAW,UAAW,SAAQ,8BAA8B,CAAC,OAAO,gBAAgB,CAAC;CAAI;AAC/F,MAAM,WAAW,eAAgB,SAAQ,+BAA+B,CAAC,UAAU,CAAC;CAAI;;AACxF,wBAAoG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"managed-incident.d.ts","sourceRoot":"","sources":["../../src/models/managed-incident.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"managed-incident.d.ts","sourceRoot":"","sources":["../../src/models/managed-incident.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAKL,8BAA8B,EAC9B,+BAA+B,EAG/B,cAAc,EACd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6bnE;AAED,MAAM,WAAW,eAAgB,SAAQ,8BAA8B,CAAC,OAAO,qBAAqB,CAAC;CAAI;AACzG,MAAM,WAAW,oBAAqB,SAAQ,+BAA+B,CAAC,eAAe,CAAC;CAAI;;AAClG,wBAAmH"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/// <reference types="mongoose" />
|
|
2
|
+
import { MongooseModule, currentDate } from "../../helpers";
|
|
3
|
+
export default function PubNubTokenSchema(mongoose: MongooseModule): import("mongoose").Schema<any> & {
|
|
4
|
+
_interface: import("../../helpers").MongooseInterface<{
|
|
5
|
+
token: {
|
|
6
|
+
type: StringConstructor;
|
|
7
|
+
default: string;
|
|
8
|
+
};
|
|
9
|
+
expireAt: {
|
|
10
|
+
type: DateConstructor;
|
|
11
|
+
default: typeof currentDate;
|
|
12
|
+
};
|
|
13
|
+
runAt: {
|
|
14
|
+
type: DateConstructor;
|
|
15
|
+
default: string;
|
|
16
|
+
};
|
|
17
|
+
}>;
|
|
18
|
+
_methods: unknown;
|
|
19
|
+
};
|
|
20
|
+
//# sourceMappingURL=pubnub-token.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pubnub-token.d.ts","sourceRoot":"","sources":["../../../src/models/schema/pubnub-token.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,cAAc,EAEd,WAAW,EACZ,MAAM,eAAe,CAAC;AAEvB,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;EAsBjE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,cAAc,EAEd,8BAA8B,EAC9B,+BAA+B,EAC/B,sBAAsB,EACtB,WAAW,EACZ,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,cAAc,EAEd,8BAA8B,EAC9B,+BAA+B,EAC/B,sBAAsB,EACtB,WAAW,EACZ,MAAM,YAAY,CAAC;AAKpB,wBAAsB,UAAU,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuOxD;AAED,MAAM,WAAW,IAAK,SAAQ,8BAA8B,CAAC,OAAO,UAAU,CAAC;CAAI;AACnF,MAAM,WAAW,SAAU,SAAQ,+BAA+B,CAAC,IAAI,CAAC;CAAI;;AAC5E,wBAAkF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-backend-models",
|
|
3
|
-
"version": "5.17.
|
|
3
|
+
"version": "5.17.11",
|
|
4
4
|
"description": "Tablet Command Backend Models",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "gulp",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"types": "definitions/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"bluebird": "^3.7.2",
|
|
20
|
-
"debug": "^4.3.
|
|
20
|
+
"debug": "^4.3.3",
|
|
21
21
|
"lodash": "^4.17.21",
|
|
22
22
|
"moment-timezone": "^0.5.34",
|
|
23
23
|
"mongoose": "=5.10.19",
|
|
@@ -26,12 +26,12 @@
|
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
28
|
"@types/bluebird": "^3.5.36",
|
|
29
|
-
"@types/chai": "^4.
|
|
30
|
-
"@types/lodash": "^4.14.
|
|
29
|
+
"@types/chai": "^4.3.0",
|
|
30
|
+
"@types/lodash": "^4.14.178",
|
|
31
31
|
"@types/mocha": "^8.2.3",
|
|
32
32
|
"@types/mongodb": "^3.6.20",
|
|
33
33
|
"@types/mongoose": "~5.10.5",
|
|
34
|
-
"@types/uuid": "~8.3.
|
|
34
|
+
"@types/uuid": "~8.3.4",
|
|
35
35
|
"@typescript-eslint/eslint-plugin": "^4.31.2",
|
|
36
36
|
"@typescript-eslint/parser": "^4.31.2",
|
|
37
37
|
"chai": "^4.3.4",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"gulp-mocha": "^8.0.0",
|
|
42
42
|
"gulp-shell": "^0.8.0",
|
|
43
43
|
"mocha": "^9.1.3",
|
|
44
|
-
"typescript": "^4.5.
|
|
44
|
+
"typescript": "^4.5.4",
|
|
45
45
|
"yargs-parser": ">=21.0.0"
|
|
46
46
|
}
|
|
47
47
|
}
|
package/src/models/department.ts
CHANGED
|
@@ -13,9 +13,11 @@ import {
|
|
|
13
13
|
ModelTypeFromTypeSchemaFunction,
|
|
14
14
|
ReplaceModelReturnType,
|
|
15
15
|
} from "../helpers";
|
|
16
|
+
import PubNubTokenSchema from "./schema/pubnub-token";
|
|
16
17
|
|
|
17
18
|
export async function DepartmentModule(mongoose: MongooseModule) {
|
|
18
19
|
const { Schema, Types } = mongoose;
|
|
20
|
+
const PubNubToken = PubNubTokenSchema(mongoose);
|
|
19
21
|
|
|
20
22
|
const SafetyPriorityKeyword = createSchema(Schema, {
|
|
21
23
|
priority: {
|
|
@@ -296,6 +298,7 @@ export async function DepartmentModule(mongoose: MongooseModule) {
|
|
|
296
298
|
type: Boolean,
|
|
297
299
|
default: false
|
|
298
300
|
},
|
|
301
|
+
|
|
299
302
|
// RTS
|
|
300
303
|
rtsEnabled: {
|
|
301
304
|
type: Boolean,
|
|
@@ -305,9 +308,9 @@ export async function DepartmentModule(mongoose: MongooseModule) {
|
|
|
305
308
|
type: String,
|
|
306
309
|
default: "",
|
|
307
310
|
},
|
|
308
|
-
|
|
309
|
-
type:
|
|
310
|
-
default:
|
|
311
|
+
pubNubV3: {
|
|
312
|
+
type: PubNubToken,
|
|
313
|
+
default: null,
|
|
311
314
|
},
|
|
312
315
|
|
|
313
316
|
// Move this to a different collection
|
|
@@ -1,10 +1,14 @@
|
|
|
1
|
+
import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
|
|
1
2
|
import * as uuid from "uuid";
|
|
2
3
|
import {
|
|
3
4
|
createModel,
|
|
4
5
|
createSchema,
|
|
5
6
|
currentDate,
|
|
7
|
+
DocumentTypeFromSchema,
|
|
6
8
|
ItemTypeFromTypeSchemaFunction,
|
|
7
9
|
ModelTypeFromTypeSchemaFunction,
|
|
10
|
+
ModelFromSchema,
|
|
11
|
+
MongooseDocument,
|
|
8
12
|
MongooseModule,
|
|
9
13
|
ReplaceModelReturnType,
|
|
10
14
|
} from "../helpers";
|
|
@@ -442,8 +446,17 @@ export async function ManagedIncidentModule(mongoose: MongooseModule) {
|
|
|
442
446
|
modelSchema.set("toJSON", {
|
|
443
447
|
virtuals: true,
|
|
444
448
|
versionKey: false,
|
|
449
|
+
transform(doc: ModelFromSchema<typeof modelSchema>, ret: DocumentTypeFromSchema<typeof modelSchema>) {
|
|
450
|
+
ret.id = ret._id;
|
|
451
|
+
},
|
|
452
|
+
});
|
|
453
|
+
|
|
454
|
+
modelSchema.virtual("id").get(function(this: MongooseDocument) {
|
|
455
|
+
// tslint:disable-next-line: no-unsafe-any
|
|
456
|
+
return this._id.toString();
|
|
445
457
|
});
|
|
446
458
|
|
|
459
|
+
modelSchema.plugin(mongooseLeanVirtuals);
|
|
447
460
|
return createModel(mongoose, "ManagedIncident", modelSchema);
|
|
448
461
|
}
|
|
449
462
|
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import {
|
|
2
|
+
MongooseModule,
|
|
3
|
+
createSchema,
|
|
4
|
+
currentDate,
|
|
5
|
+
} from "../../helpers";
|
|
6
|
+
|
|
7
|
+
export default function PubNubTokenSchema(mongoose: MongooseModule) {
|
|
8
|
+
const { Schema } = mongoose;
|
|
9
|
+
|
|
10
|
+
const Item = createSchema(Schema, {
|
|
11
|
+
token: {
|
|
12
|
+
type: String,
|
|
13
|
+
default: "",
|
|
14
|
+
},
|
|
15
|
+
expireAt: {
|
|
16
|
+
type: Date,
|
|
17
|
+
default: currentDate,
|
|
18
|
+
},
|
|
19
|
+
runAt: {
|
|
20
|
+
type: Date,
|
|
21
|
+
default: "",
|
|
22
|
+
},
|
|
23
|
+
}, {
|
|
24
|
+
_id: false,
|
|
25
|
+
id: false,
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
return Item;
|
|
29
|
+
}
|
package/src/models/user.ts
CHANGED
|
@@ -13,11 +13,13 @@ import {
|
|
|
13
13
|
} from "../helpers";
|
|
14
14
|
import EsriAuthSchema from "./schema/esri-auth";
|
|
15
15
|
import EsriErrorSchema from "./schema/esri-error";
|
|
16
|
+
import PubNubTokenSchema from "./schema/pubnub-token";
|
|
16
17
|
|
|
17
18
|
export async function UserModule(mongoose: MongooseModule) {
|
|
18
19
|
const { Schema } = mongoose;
|
|
19
20
|
const EsriAuth = EsriAuthSchema(mongoose);
|
|
20
21
|
const EsriError = EsriErrorSchema(mongoose);
|
|
22
|
+
const PubNubToken = PubNubTokenSchema(mongoose);
|
|
21
23
|
|
|
22
24
|
const VehicleSchema = createSchema(Schema, {
|
|
23
25
|
radioName: {
|
|
@@ -33,24 +35,6 @@ export async function UserModule(mongoose: MongooseModule) {
|
|
|
33
35
|
id: false,
|
|
34
36
|
});
|
|
35
37
|
|
|
36
|
-
const PubNubTokenSchema = createSchema(Schema, {
|
|
37
|
-
token: {
|
|
38
|
-
type: String,
|
|
39
|
-
default: "",
|
|
40
|
-
},
|
|
41
|
-
expireAt: {
|
|
42
|
-
type: Date,
|
|
43
|
-
default: currentDate,
|
|
44
|
-
},
|
|
45
|
-
runAt: {
|
|
46
|
-
type: Date,
|
|
47
|
-
default: "",
|
|
48
|
-
},
|
|
49
|
-
}, {
|
|
50
|
-
_id: false,
|
|
51
|
-
id: false,
|
|
52
|
-
});
|
|
53
|
-
|
|
54
38
|
const modelSchema = createSchema(Schema, {
|
|
55
39
|
nick: {
|
|
56
40
|
type: String,
|
|
@@ -182,11 +166,11 @@ export async function UserModule(mongoose: MongooseModule) {
|
|
|
182
166
|
default: "",
|
|
183
167
|
},
|
|
184
168
|
pubNubV2: {
|
|
185
|
-
type:
|
|
169
|
+
type: PubNubToken,
|
|
186
170
|
default: null,
|
|
187
171
|
},
|
|
188
172
|
pubNubV3: {
|
|
189
|
-
type:
|
|
173
|
+
type: PubNubToken,
|
|
190
174
|
default: null,
|
|
191
175
|
},
|
|
192
176
|
|
package/test/department.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
1
|
const assert = require("chai").assert;
|
|
4
2
|
|
|
5
3
|
const m = require("..");
|
|
@@ -37,7 +35,9 @@ describe("Department", function() {
|
|
|
37
35
|
assert.isTrue(sut.personnelStaffingEnabled);
|
|
38
36
|
assert.isTrue(sut.rtsEnabled);
|
|
39
37
|
assert.equal(sut.rtsChannelPrefix, testItem.rtsChannelPrefix);
|
|
40
|
-
assert.equal(sut.
|
|
38
|
+
assert.equal(sut.pubNubV3.token, testItem.pubNubV3.token);
|
|
39
|
+
assert.equal(sut.pubNubV3.expireAt.toISOString(), testItem.pubNubV3.expireAt);
|
|
40
|
+
assert.equal(sut.pubNubV3.runAt.toISOString(), testItem.pubNubV3.runAt);
|
|
41
41
|
assert.equal(sut.signupKey, testItem.signupKey);
|
|
42
42
|
assert.equal(sut.incidentTypes.length, 1);
|
|
43
43
|
assert.equal(sut.agencyIds.length, 1);
|
package/test/mock.js
CHANGED
|
@@ -377,7 +377,11 @@ module.exports = function(dependencies) {
|
|
|
377
377
|
personnelStaffingEnabled: true,
|
|
378
378
|
rtsEnabled: true,
|
|
379
379
|
rtsChannelPrefix: "CH_TEST",
|
|
380
|
-
|
|
380
|
+
pubNubV3: {
|
|
381
|
+
token: "CH_AUTH_TOKEN",
|
|
382
|
+
expireAt: "2021-09-10T23:25:02.196Z",
|
|
383
|
+
runAt: "2021-09-10T08:25:02.196Z",
|
|
384
|
+
},
|
|
381
385
|
agencyIds: [
|
|
382
386
|
new mongoose.Types.ObjectId(agency._id)
|
|
383
387
|
],
|