tabletcommand-incident 0.6.2 → 0.6.3
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.
|
@@ -156,12 +156,11 @@ function incidentProcessorLib({ ruleProcessor, store, setIncidentType, artificia
|
|
|
156
156
|
const mergedItemWithDept = domain_1.default.updateWithUUIDAndDepartment(mergedItemWithFields, department, atDate);
|
|
157
157
|
// Append Personnel
|
|
158
158
|
const mergedItemWithPersonnel = await applyPersonnel(departmentId, mergedItemWithDept, atDate);
|
|
159
|
-
const mergedItemWithPersonnelModel = await store.convertItemWithPersonnelToModel(mergedItemWithPersonnel);
|
|
160
159
|
await ((_e = artificialDelay === null || artificialDelay === void 0 ? void 0 : artificialDelay.afterApplyPersonnel) === null || _e === void 0 ? void 0 : _e.call(artificialDelay));
|
|
161
160
|
try {
|
|
162
161
|
// as CADIncident to silence Partial<> messing with .validate()
|
|
163
162
|
debug("CADIncident.validate()");
|
|
164
|
-
await
|
|
163
|
+
await mergedItemWithPersonnel.validate();
|
|
165
164
|
}
|
|
166
165
|
catch (error) {
|
|
167
166
|
debug("validate error", error);
|
|
@@ -172,16 +171,16 @@ function incidentProcessorLib({ ruleProcessor, store, setIncidentType, artificia
|
|
|
172
171
|
try {
|
|
173
172
|
debug("CADIncident.save()");
|
|
174
173
|
// as CADIncident to silence Partial<> messing with .save()
|
|
175
|
-
await
|
|
174
|
+
await mergedItemWithPersonnel.save();
|
|
176
175
|
result = {
|
|
177
|
-
incident:
|
|
176
|
+
incident: mergedItemWithPersonnel,
|
|
178
177
|
};
|
|
179
178
|
}
|
|
180
179
|
catch (error) {
|
|
181
180
|
debug("save error", error);
|
|
182
181
|
// Sleep between 50 and 800 ms, Necessary mostly for running parallel tests
|
|
183
182
|
const randomSleepMS = Math.random() * (800 - 50) + 50;
|
|
184
|
-
console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${
|
|
183
|
+
console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${mergedItemWithPersonnel.departmentId} ${mergedItemWithPersonnel.IncidentNumber} v${mergedItemWithPersonnel.__v}`);
|
|
185
184
|
await domain_1.default.sleep(randomSleepMS);
|
|
186
185
|
// Most of the times, this happens when trying to insert a document with the same unique key
|
|
187
186
|
return await processIncidentRequestsV3(streamItems, department, new Date(), attemptsLeft - 1);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incidentProcessor.js","sourceRoot":"","sources":["../src/incidentProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAiC;AACjC,oDAAuB;AAEvB,qDAAuC;
|
|
1
|
+
{"version":3,"file":"incidentProcessor.js","sourceRoot":"","sources":["../src/incidentProcessor.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;
|
|
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;EAmH1K;AAED,MAAM,MAAM,uBAAuB,GAAG,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC"}
|
package/package.json
CHANGED
package/src/incidentProcessor.ts
CHANGED
|
@@ -10,6 +10,10 @@ import {
|
|
|
10
10
|
PersonnelImport,
|
|
11
11
|
} from "tabletcommand-backend-models";
|
|
12
12
|
|
|
13
|
+
import {
|
|
14
|
+
Document,
|
|
15
|
+
} from "mongoose";
|
|
16
|
+
|
|
13
17
|
import domain from "./domain";
|
|
14
18
|
import { StoreModule } from "./store";
|
|
15
19
|
|
|
@@ -184,13 +188,12 @@ export default function incidentProcessorLib({
|
|
|
184
188
|
|
|
185
189
|
// Append Personnel
|
|
186
190
|
const mergedItemWithPersonnel = await applyPersonnel(departmentId, mergedItemWithDept, atDate);
|
|
187
|
-
const mergedItemWithPersonnelModel = await store.convertItemWithPersonnelToModel(mergedItemWithPersonnel);
|
|
188
191
|
await artificialDelay?.afterApplyPersonnel?.();
|
|
189
192
|
|
|
190
193
|
try {
|
|
191
194
|
// as CADIncident to silence Partial<> messing with .validate()
|
|
192
195
|
debug("CADIncident.validate()");
|
|
193
|
-
await
|
|
196
|
+
await (mergedItemWithPersonnel as unknown as Document<CADIncident>).validate();
|
|
194
197
|
} catch (error: unknown) {
|
|
195
198
|
debug("validate error", error);
|
|
196
199
|
return {
|
|
@@ -201,15 +204,15 @@ export default function incidentProcessorLib({
|
|
|
201
204
|
try {
|
|
202
205
|
debug("CADIncident.save()");
|
|
203
206
|
// as CADIncident to silence Partial<> messing with .save()
|
|
204
|
-
await
|
|
207
|
+
await (mergedItemWithPersonnel as unknown as Document<CADIncident>).save();
|
|
205
208
|
result = {
|
|
206
|
-
incident:
|
|
209
|
+
incident: (mergedItemWithPersonnel as CADIncident),
|
|
207
210
|
};
|
|
208
211
|
} catch (error: unknown) {
|
|
209
212
|
debug("save error", error);
|
|
210
213
|
// Sleep between 50 and 800 ms, Necessary mostly for running parallel tests
|
|
211
214
|
const randomSleepMS = Math.random() * (800 - 50) + 50;
|
|
212
|
-
console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${
|
|
215
|
+
console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${mergedItemWithPersonnel.departmentId} ${mergedItemWithPersonnel.IncidentNumber} v${mergedItemWithPersonnel.__v}`);
|
|
213
216
|
await domain.sleep(randomSleepMS);
|
|
214
217
|
|
|
215
218
|
// Most of the times, this happens when trying to insert a document with the same unique key
|