tabletcommand-incident 0.6.4 → 0.6.5
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/incidentProcessor.js +1 -2
- package/build/incidentProcessor.js.map +1 -1
- package/build/store.js +27 -0
- package/build/store.js.map +1 -1
- package/definitions/incidentProcessor.d.ts.map +1 -1
- package/definitions/store.d.ts +4 -3
- package/definitions/store.d.ts.map +1 -1
- package/package.json +7 -7
- package/src/incidentProcessor.ts +1 -2
- package/src/store.ts +30 -1
|
@@ -170,8 +170,7 @@ function incidentProcessorLib({ ruleProcessor, store, setIncidentType, artificia
|
|
|
170
170
|
}
|
|
171
171
|
try {
|
|
172
172
|
debug("CADIncident.save()");
|
|
173
|
-
|
|
174
|
-
await mergedItemWithPersonnel.save();
|
|
173
|
+
await store.saveIncidentV3(mergedItemWithPersonnel);
|
|
175
174
|
result = {
|
|
176
175
|
incident: mergedItemWithPersonnel,
|
|
177
176
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incidentProcessor.js","sourceRoot":"","sources":["../src/incidentProcessor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"incidentProcessor.js","sourceRoot":"","sources":["../src/incidentProcessor.ts"],"names":[],"mappings":"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"}
|
package/build/store.js
CHANGED
|
@@ -60,6 +60,7 @@ function storeModule({ models }) {
|
|
|
60
60
|
};
|
|
61
61
|
try {
|
|
62
62
|
const items = await models.PersonnelImport.find(personnelQuery);
|
|
63
|
+
debug(`PersonnelImport.find:${JSON.stringify(personnelQuery)} items => ${items.length}.`);
|
|
63
64
|
return items;
|
|
64
65
|
}
|
|
65
66
|
catch (error) {
|
|
@@ -93,6 +94,7 @@ function storeModule({ models }) {
|
|
|
93
94
|
const projection = {
|
|
94
95
|
_id: 1,
|
|
95
96
|
};
|
|
97
|
+
debug(`CADIncident.findOne:${JSON.stringify(query)}.`);
|
|
96
98
|
return await models.CADIncident.findOne(query, projection);
|
|
97
99
|
}
|
|
98
100
|
async function incidentStreamFromDate(departmentId, incidentNumber, date, direction, limit = 10) {
|
|
@@ -171,6 +173,30 @@ function storeModule({ models }) {
|
|
|
171
173
|
async function convertItemWithPersonnelToModel(mergedItemWithPersonnel) {
|
|
172
174
|
return new models.CADIncident(mergedItemWithPersonnel);
|
|
173
175
|
}
|
|
176
|
+
async function saveIncidentV3(item) {
|
|
177
|
+
debug(`Saving CADIncident:${JSON.stringify(item)}.`);
|
|
178
|
+
// as CADIncident to silence Partial<> messing with .save()
|
|
179
|
+
const toSave = item;
|
|
180
|
+
// All items that are arrays, mark them as modified
|
|
181
|
+
// Workaround for race condition where
|
|
182
|
+
// setting the keypath `unit.31.Personnel`
|
|
183
|
+
// would propagate it to the wrong array
|
|
184
|
+
const alwaysModified = [
|
|
185
|
+
"Comment",
|
|
186
|
+
"PriorIncident",
|
|
187
|
+
"ReportNumber",
|
|
188
|
+
"events",
|
|
189
|
+
"notificationType",
|
|
190
|
+
"radioChannels",
|
|
191
|
+
"sharedTo",
|
|
192
|
+
"simulationSequences",
|
|
193
|
+
"units",
|
|
194
|
+
];
|
|
195
|
+
for (const mod of alwaysModified) {
|
|
196
|
+
toSave.markModified(mod);
|
|
197
|
+
}
|
|
198
|
+
await toSave.save();
|
|
199
|
+
}
|
|
174
200
|
return {
|
|
175
201
|
retrievePersonnel,
|
|
176
202
|
previousIncident,
|
|
@@ -178,6 +204,7 @@ function storeModule({ models }) {
|
|
|
178
204
|
incidentStreamFromDate,
|
|
179
205
|
previousIncidentsV1,
|
|
180
206
|
saveIncidentV1,
|
|
207
|
+
saveIncidentV3,
|
|
181
208
|
convertItemWithPersonnelToModel,
|
|
182
209
|
};
|
|
183
210
|
}
|
package/build/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAiC;AACjC,oDAAuB;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incidentProcessor.d.ts","sourceRoot":"","sources":["../src/incidentProcessor.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,iBAAiB,EACjB,UAAU,EAEX,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,kCAAkC,EAClC,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAa,EACb,KAAK,EACL,eAAe,EACf,eAAe,GAChB,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,KAAK,EAAE,WAAW,CAAC;IACnB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;+BAiEmC,OAAO,KAAG,OAAO;qDA9CW,iBAAiB,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI,KAAG,QAAQ,kCAAkC,CAAC;6DA2DtG,MAAM,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI,KAAG,QAAQ,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"incidentProcessor.d.ts","sourceRoot":"","sources":["../src/incidentProcessor.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,iBAAiB,EACjB,UAAU,EAEX,MAAM,8BAA8B,CAAC;AAOtC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EACL,kCAAkC,EAClC,mBAAmB,EACpB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAa,EACb,KAAK,EACL,eAAe,EACf,eAAe,GAChB,EAAE;IACD,aAAa,EAAE,mBAAmB,CAAC;IACnC,KAAK,EAAE,WAAW,CAAC;IACnB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;+BAiEmC,OAAO,KAAG,OAAO;qDA9CW,iBAAiB,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI,KAAG,QAAQ,kCAAkC,CAAC;6DA2DtG,MAAM,cAAc,QAAQ,UAAU,CAAC,UAAU,IAAI,KAAG,QAAQ,kCAAkC,CAAC;EAkH1K;AAED,MAAM,MAAM,uBAAuB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
package/definitions/store.d.ts
CHANGED
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
/// <reference types="mongoose/types/utility" />
|
|
24
24
|
/// <reference types="mongoose/types/validation" />
|
|
25
25
|
/// <reference types="mongoose/types/virtuals" />
|
|
26
|
-
/// <reference types="mongoose" />
|
|
27
26
|
/// <reference types="mongoose/types/inferschematype" />
|
|
27
|
+
import { Document } from "mongoose";
|
|
28
28
|
import { BackendModels, Department, CADIncident, PersonnelImport, CADIncidentStream } from "tabletcommand-backend-models";
|
|
29
29
|
export default function storeModule({ models }: {
|
|
30
30
|
models: BackendModels;
|
|
@@ -34,10 +34,11 @@ export default function storeModule({ models }: {
|
|
|
34
34
|
monitor: () => Promise<Pick<CADIncident, "_id"> | null>;
|
|
35
35
|
incidentStreamFromDate: (departmentId: string, incidentNumber: string, date: Date, direction: "after" | "before", limit?: number) => Promise<CADIncidentStream[]>;
|
|
36
36
|
previousIncidentsV1: (incident: Partial<CADIncident>, department: Partial<Department>) => Promise<Partial<CADIncident>[]>;
|
|
37
|
-
saveIncidentV1: (item: Partial<CADIncident>) => Promise<
|
|
37
|
+
saveIncidentV1: (item: Partial<CADIncident>) => Promise<Document<unknown, {}, CADIncident> & CADIncident & Required<{
|
|
38
38
|
_id: import("mongoose").Types.ObjectId;
|
|
39
39
|
}>>;
|
|
40
|
-
|
|
40
|
+
saveIncidentV3: (item: Partial<CADIncident>) => Promise<void>;
|
|
41
|
+
convertItemWithPersonnelToModel: (mergedItemWithPersonnel: Partial<CADIncident>) => Promise<Document<unknown, {}, CADIncident> & CADIncident & Required<{
|
|
41
42
|
_id: import("mongoose").Types.ObjectId;
|
|
42
43
|
}>>;
|
|
43
44
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,OAAO,EACL,QAAQ,EAGT,MAAM,UAAU,CAAC;AAGlB,OAAO,EACL,aAAa,EACb,UAAU,EACV,WAAW,EACX,eAAe,EACf,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAAE,MAAM,EAAE,EAAE;IAC9C,MAAM,EAAE,aAAa,CAAC;CACvB;sCAOgD,MAAM,qBAAqB,MAAM,cAAc,MAAM,EAAE,KAAG,QAAQ,QAAQ,eAAe,CAAC,EAAE,CAAC;iCAsClG,QAAQ,WAAW,CAAC,cAAc,QAAQ,UAAU,CAAC,KAAG,QAAQ,QAAQ,WAAW,CAAC,CAAC;mBAmBrG,QAAQ,KAAK,WAAW,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC;2CAYd,MAAM,kBAAkB,MAAM,QAAQ,IAAI,aAAa,OAAO,GAAG,QAAQ,qBAAe,QAAQ,iBAAiB,EAAE,CAAC;oCAwC3H,QAAQ,WAAW,CAAC,cAAc,QAAQ,UAAU,CAAC;2BA4B9D,QAAQ,WAAW,CAAC;;;2BAiBpB,QAAQ,WAAW,CAAC;+DAJgB,QAAQ,WAAW,CAAC;;;EA0C7F;AAED,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-incident",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.5",
|
|
4
4
|
"description": "Tablet Command Incident",
|
|
5
5
|
"main": "build/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,21 +13,21 @@
|
|
|
13
13
|
"types": "definitions/index.d.ts",
|
|
14
14
|
"dependencies": {
|
|
15
15
|
"@sentry/node": "^7.119.2",
|
|
16
|
-
"debug": "^4.
|
|
16
|
+
"debug": "^4.4.0",
|
|
17
17
|
"karka": "0.0.1",
|
|
18
18
|
"lodash": "~4.17.21",
|
|
19
19
|
"moment-timezone": "^0.5.46",
|
|
20
|
-
"tabletcommand-backend-models": "~7.2.
|
|
21
|
-
"
|
|
22
|
-
"
|
|
20
|
+
"tabletcommand-backend-models": "~7.2.15",
|
|
21
|
+
"uuid": "^9.0.1",
|
|
22
|
+
"xregexp": "~5.1.1"
|
|
23
23
|
},
|
|
24
24
|
"devDependencies": {
|
|
25
25
|
"@types/chai": "^4.3.20",
|
|
26
26
|
"@types/debug": "^4.1.12",
|
|
27
27
|
"@types/express": "^4.17.21",
|
|
28
|
-
"@types/lodash": "^4.17.
|
|
28
|
+
"@types/lodash": "^4.17.14",
|
|
29
29
|
"@types/mocha": "^10.0.10",
|
|
30
|
-
"@types/node": "^22.10.
|
|
30
|
+
"@types/node": "^22.10.5",
|
|
31
31
|
"@types/uuid": "^9.0.8",
|
|
32
32
|
"@typescript-eslint/eslint-plugin": "^6.21.0",
|
|
33
33
|
"@typescript-eslint/parser": "^6.21.0",
|
package/src/incidentProcessor.ts
CHANGED
|
@@ -203,8 +203,7 @@ export default function incidentProcessorLib({
|
|
|
203
203
|
|
|
204
204
|
try {
|
|
205
205
|
debug("CADIncident.save()");
|
|
206
|
-
|
|
207
|
-
await (mergedItemWithPersonnel as unknown as Document<CADIncident>).save();
|
|
206
|
+
await store.saveIncidentV3(mergedItemWithPersonnel);
|
|
208
207
|
result = {
|
|
209
208
|
incident: (mergedItemWithPersonnel as CADIncident),
|
|
210
209
|
};
|
package/src/store.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import debug_module from "debug";
|
|
2
2
|
import _ from "lodash";
|
|
3
3
|
import {
|
|
4
|
+
Document,
|
|
4
5
|
FilterQuery,
|
|
5
|
-
SortOrder
|
|
6
|
+
SortOrder,
|
|
6
7
|
} from "mongoose";
|
|
7
8
|
import * as Sentry from "@sentry/node";
|
|
8
9
|
|
|
@@ -52,6 +53,7 @@ export default function storeModule({ models }: {
|
|
|
52
53
|
|
|
53
54
|
try {
|
|
54
55
|
const items = await models.PersonnelImport.find(personnelQuery);
|
|
56
|
+
debug(`PersonnelImport.find:${JSON.stringify(personnelQuery)} items => ${items.length}.`);
|
|
55
57
|
return items;
|
|
56
58
|
} catch (error: unknown) {
|
|
57
59
|
Sentry.captureException(error);
|
|
@@ -87,6 +89,7 @@ export default function storeModule({ models }: {
|
|
|
87
89
|
const projection = {
|
|
88
90
|
_id: 1,
|
|
89
91
|
};
|
|
92
|
+
debug(`CADIncident.findOne:${JSON.stringify(query)}.`);
|
|
90
93
|
return await models.CADIncident.findOne(query, projection);
|
|
91
94
|
}
|
|
92
95
|
|
|
@@ -175,6 +178,31 @@ export default function storeModule({ models }: {
|
|
|
175
178
|
return new models.CADIncident(mergedItemWithPersonnel);
|
|
176
179
|
}
|
|
177
180
|
|
|
181
|
+
async function saveIncidentV3(item: Partial<CADIncident>) {
|
|
182
|
+
debug(`Saving CADIncident:${JSON.stringify(item)}.`);
|
|
183
|
+
// as CADIncident to silence Partial<> messing with .save()
|
|
184
|
+
const toSave = item as unknown as Document<CADIncident>;
|
|
185
|
+
// All items that are arrays, mark them as modified
|
|
186
|
+
// Workaround for race condition where
|
|
187
|
+
// setting the keypath `unit.31.Personnel`
|
|
188
|
+
// would propagate it to the wrong array
|
|
189
|
+
const alwaysModified: (keyof CADIncident)[] = [
|
|
190
|
+
"Comment",
|
|
191
|
+
"PriorIncident",
|
|
192
|
+
"ReportNumber",
|
|
193
|
+
"events",
|
|
194
|
+
"notificationType",
|
|
195
|
+
"radioChannels",
|
|
196
|
+
"sharedTo",
|
|
197
|
+
"simulationSequences",
|
|
198
|
+
"units",
|
|
199
|
+
];
|
|
200
|
+
for (const mod of alwaysModified) {
|
|
201
|
+
toSave.markModified(mod);
|
|
202
|
+
}
|
|
203
|
+
await toSave.save();
|
|
204
|
+
}
|
|
205
|
+
|
|
178
206
|
return {
|
|
179
207
|
retrievePersonnel,
|
|
180
208
|
previousIncident,
|
|
@@ -184,6 +212,7 @@ export default function storeModule({ models }: {
|
|
|
184
212
|
|
|
185
213
|
previousIncidentsV1,
|
|
186
214
|
saveIncidentV1,
|
|
215
|
+
saveIncidentV3,
|
|
187
216
|
|
|
188
217
|
convertItemWithPersonnelToModel,
|
|
189
218
|
};
|