tabletcommand-incident 0.6.11 → 0.6.13

package/src/rules/remove-incident-field.ts

@@ -0,0 +1,104 @@
+import _ from "lodash";
+
+import { CADIncident } from "tabletcommand-backend-models";
+import { IncidentRule, IncidentRuleChange } from ".";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
+import { CADPersonSchemaType } from "tabletcommand-backend-models/definitions/types/common-incident";
+
+export type FieldToClear = keyof CADIncident;
+
+export class IncidentRuleRemovePersonFromUnit implements IncidentRule {
+  name = "Remove Person From Unit";
+  matched = false;
+  changed = false;
+  changes: IncidentRuleChange[] = [];
+
+  constructor() {
+    //
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  apply(item: Partial<CADIncident>, _atDate: Date): Partial<CADIncident> {
+    if (!_.isArray(item.Unit)) {
+      return item;
+    }
+
+    let ruleMatched = false;
+
+    _.each(item.Unit as CADUnitType[], function(unit) {
+      if (!_.isObject(unit)) {
+        return;
+      }
+
+      if (!_.isArray(unit.Personnel) || unit.Personnel.length === 0) {
+        return;
+      }
+
+      const revisedItems: CADPersonSchemaType[] = [];
+      let personnelCount = (_.isNumber(unit.PersonnelCount) && _.isFinite(unit.PersonnelCount) && unit.PersonnelCount > 0) ? unit.PersonnelCount : 0;
+      _.each(unit.Personnel, function(person: CADPersonSchemaType) {
+        if (!_.isObject(person) || !_.isString(person.PersonnelName)) {
+          return;
+        }
+
+        if (shouldRemovePerson(person) && personnelCount > 0) {
+          personnelCount = personnelCount - 1;
+          ruleMatched = true;
+        } else {
+          revisedItems.push(person);
+        }
+      });
+      unit.Personnel = revisedItems;
+      unit.PersonnelCount = personnelCount;
+    });
+
+    this.matched = ruleMatched;
+    this.changed = ruleMatched;
+    this.changes.push({
+      name: this.name,
+      matched: this.matched,
+      changed: this.changed,
+      change: {
+        Unit: item.Unit,
+      }
+    });
+
+    return item;
+  }
+}
+
+export function shouldRemovePerson(item: Partial<CADPersonSchemaType>): boolean {
+  if (!_.isString(item.PersonnelName)) {
+    return false;
+  }
+  const name = item.PersonnelName;
+
+  // Names have a comma (e.g. Smith, John)
+  const hasComma = name.indexOf(",") >= 0;
+  if (hasComma) {
+    return false;
+  }
+
+  // Names do not have number
+  if (/\d/g.test(name)) {
+    return true;
+  }
+
+  const apparatus = [
+    "battalion",
+    "bc",
+    "engine",
+    "rescue",
+    "truck",
+  ];
+
+  let matchedApparatus = false;
+  apparatus.forEach((a) => {
+    const shouldRemove = name.toLowerCase().indexOf(a.toLowerCase()) >= 0;
+    if (shouldRemove) {
+      matchedApparatus = true;
+      return;
+    }
+  });
+  return matchedApparatus;
+}

package/src/rules/set-address.ts

@@ -47,28 +47,28 @@ export class IncidentRuleSetAddress implements IncidentRule {
   }
 }
 
-function keyIsValid(object: Record<string, unknown> | undefined, key: string): boolean {
+function strValueForKey(object: Record<string, unknown> | undefined, key: string): string {
   if (!_.isObject(object)) {
-    return false;
+    return "";
   }
 
-  if (_.isString(object[key]) && (object[key] as string).length > 0) {
-    return true;
+  if (_.isString(object[key])) {
+    return object[key].trim();
   }
 
   if (_.isNumber(object[key]) && _.isFinite(object[key])) {
-    return true;
+    return `${object[key]}`;
   }
 
-  return false;
+  return "";
 }
 
 function buildLineOutOfParts(object: Partial<CADIncident>, parts: string[]): string {
   const pieces: string[] = [];
   _.forEach(parts, function(part) {
-    const isKeyValid = keyIsValid(object, part);
-    if (object && object[part] && isKeyValid) {
-      pieces.push(`${object[part]}`);
+    const value = strValueForKey(object, part);
+    if (object && object[part] && value !== "") {
+      pieces.push(value);
     }
   });
 

package/src/test/index.ts

@@ -2,6 +2,7 @@ import { assert } from "chai";
 import "mocha";
 import _ from "lodash";
 import * as modelsModule from "tabletcommand-backend-models";
+import { BackendModels } from "tabletcommand-backend-models";
 
 import {
   HandleProcessIncidentRequestResult,
@@ -14,6 +15,7 @@ import {
 import mockModule from "./mock";
 import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
+let modelsLib: BackendModels;
 let mock: ReturnType<typeof mockModule>;
 let incidentProcessor: IncidentProcessorModule;
 
@@ -24,6 +26,7 @@ describe("index", function() {
       mongoose,
       models
     } = await modelsModule.connect(process.env.NODE_MONGO_URL || "");
+    modelsLib = models;
 
     mock = mockModule({
       mongoose,
@@ -693,7 +696,7 @@ describe("index", function() {
     const atDate = new Date();
     const sampleIncidentNumber = "Yolo-Communications-0001";
 
-    function validateRulesResult(sut: HandleProcessIncidentRequestResult) {
+    function validateRulesResult(sut: HandleProcessIncidentRequestResult, step: number) {
       if ("error" in sut) {
         assert.fail(sut.error.toString());
       } else {
@@ -702,37 +705,64 @@ describe("index", function() {
         } = sut;
 
         assert.strictEqual(incident?.TacticalChannel, "BROWN/ECHO6/VFIRE25");
+        switch (step) {
+          case 0:
+            assert.equal(incident?.AgencyIncidentCallTypeDescription, "*MEDAID Medical Incident - C2"); // cspell: words MEDAID
+            break;
+          case 1:
+            assert.equal(incident?.AgencyIncidentCallTypeDescription, "Traumatic Injuries - A - C2");
+            break;
+          case 2:
+            assert.equal(incident?.AgencyIncidentCallTypeDescription, "*MEDAID Medical Incident - C3");
+            break;
+          case 3:
+            assert.equal(incident?.AgencyIncidentCallTypeDescription, "BURN Control Burn");
+            break;
+          default:
+            assert.fail(`Unhandled step ${step}.`);
+          // break;
+        }
       }
     }
 
     it("process stream through legacy", async function() {
       const department = mock.departmentYolo;
       const departmentId = department._id.toString();
-      const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
-      const streamItem = _.first(existingStreamItems);
 
-      if (!streamItem) {
-        assert.fail("Expecting a stream item");
-        return;
+      // Clear incident stream
+      await mock.clearTestIncidentStream(departmentId, sampleIncidentNumber);
+      const candidateStreamItems = mock.incidentStreamItems.filter((x) => {
+        return x.departmentId === departmentId && x.incidentNumber === sampleIncidentNumber;
+      });
+      // Hack to process incident requests one by one
+      let step = 0;
+      for (const streamItem of candidateStreamItems) {
+        // Save each stream item then run legacy processor
+        const s = await new modelsLib.CADIncidentStream(streamItem).save();
+        const sut = await incidentProcessor.handleProcessIncidentRequestLegacy(s, department, atDate);
+        validateRulesResult(sut, step);
+        step = step + 1;
       }
-
-      const sut = await incidentProcessor.handleProcessIncidentRequestLegacy(streamItem, department, atDate);
-      validateRulesResult(sut);
     });
 
     it("process stream through correction", async function() {
       const department = mock.departmentYolo;
       const departmentId = department._id.toString();
-      const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
-      const streamItem = _.first(existingStreamItems);
 
-      if (!streamItem) {
-        assert.fail("Expecting a stream item");
-        return;
+      // Clear incident stream
+      await mock.clearTestIncidentStream(departmentId, sampleIncidentNumber);
+      const candidateStreamItems = mock.incidentStreamItems.filter((x) => {
+        return x.departmentId === departmentId && x.incidentNumber === sampleIncidentNumber;
+      });
+      // Hack to process incident requests one by one
+      let step = 0;
+      for (const streamItem of candidateStreamItems) {
+        // Save each stream item then run legacy processor
+        const s = await new modelsLib.CADIncidentStream(streamItem).save();
+        const sut = await incidentProcessor.handleProcessIncidentRequestCorrection(s.incidentNumber, department, atDate);
+        validateRulesResult(sut, step);
+        step = step + 1;
       }
-
-      const sut = await incidentProcessor.handleProcessIncidentRequestCorrection(streamItem.incidentNumber, department, atDate);
-      validateRulesResult(sut);
     });
   });
 });

package/src/test/mock.ts

@@ -6,6 +6,9 @@ import {
   Department,
   MongooseModule,
 } from "tabletcommand-backend-models";
+import {
+  FilterQuery,
+} from "mongoose";
 
 export default function({
   models,
@@ -707,7 +710,7 @@ export default function({
       "incidentNumber": "Verdugo-0001",
       "uuid": "d3d23200-e0fa-443f-b647-5f18d150b5c0",
       "tag": "871e3d05-1572-4d81-ba29-0ab01b4e6d91",
-      "createdAt": new Date("2024-01-22T10:11:47.617+0000"),
+      "createdAt": new Date("2024-01-22T10:11:47.617Z"),
       "payload": {
         "AgencyID": "EMS1143",
         "IncidentNumber": "Verdugo-0001",
@@ -768,7 +771,7 @@ export default function({
       "incidentNumber": "Yolo-Communications-0001",
       "uuid": "d3d23200-e0fa-443f-b647-5f18d150b5c0",
       "tag": "871e3d05-1572-4d81-ba29-0ab01b4e6d91",
-      "createdAt": new Date("2024-01-22T10:11:47.617+0000"),
+      "createdAt": new Date("2024-01-22T10:11:47.617Z"),
       "payload": {
         "AgencyID": "EMS1143",
         "IncidentNumber": "Yolo-Communications-0001",
@@ -776,10 +779,8 @@ export default function({
         "EntryDateTime": "2024-01-22T02:08:06-08:00",
         "CallReceivedDateTime": "2024-01-22T02:11:20-08:00",
         "ReportNumber": "PAS",
-        "CallSource": "9",
         "CallerNumber": "213-326-3434",
         "AlarmLevel": "1",
-        "Priority": "3",
         "LocationComment": "BACK HOUSE",
         "StreetNumber": "2019",
         "Predirectional": "E",
@@ -792,8 +793,8 @@ export default function({
         "Longitude": "-118.108744",
         "Latitude": "34.154423",
         "AgencyIncidentCallType": "BREATH",
-        "AgencyIncidentCallTypeDescription": "SHORTNESS OF BREATH",
-        "DispatchDateTime": "2024-01-22T02:11:46-08:00",
+        "AgencyIncidentCallTypeDescription": "*MEDAID Medical Incident", // cspell: words MEDAID
+        "AgencyIncidentPriorityDescription": "Code 2 Response",
         "ClosedDateTime": "",
         "Comment": [
           {
@@ -826,12 +827,66 @@ export default function({
         ],
       },
     },
+    {
+      departmentId: departmentYolo._id.toString(),
+      "incidentNumber": "Yolo-Communications-0001",
+      "uuid": "28b01a6e-472d-4c36-92b9-38fecd6dbb70",
+      "tag": "dc1e6118-b34f-432a-91f9-66c7ee298bbd",
+      "createdAt": new Date("2024-01-22T10:12:00.000Z"),
+      "payload": {
+        "AgencyID": "EMS1143",
+        "IncidentNumber": "Yolo-Communications-0001",
+        "AgencyIncidentCallTypeDescription": "Traumatic Injuries - A",
+        "AgencyIncidentPriorityDescription": "Code 2 Response",
+        "ClosedDateTime": "",
+        "Longitude": -118.108744,
+        "Latitude": 34.154423,
+        "Unit": [
+        ],
+      },
+    },
+    {
+      departmentId: departmentYolo._id.toString(),
+      "incidentNumber": "Yolo-Communications-0001",
+      "uuid": "4d50c25e-8cd3-4bca-8713-abb97ee997f1",
+      "tag": "72e299c0-7686-4ebf-a822-2a71b633be89",
+      "createdAt": new Date("2024-01-22T10:13:00.000Z"),
+      "payload": {
+        "AgencyID": "EMS1143",
+        "IncidentNumber": "Yolo-Communications-0001",
+        "AgencyIncidentCallTypeDescription": "*MEDAID Medical Incident",
+        "AgencyIncidentPriorityDescription": "Code 3 Response",
+        "ClosedDateTime": "",
+        "Longitude": -118.108744,
+        "Latitude": 34.154423,
+        "Unit": [
+        ],
+      },
+    },
+    {
+      departmentId: departmentYolo._id.toString(),
+      "incidentNumber": "Yolo-Communications-0001",
+      "uuid": "b471088c-8fea-4a20-9435-e65d596d7511",
+      "tag": "06c40396-d92d-43d0-8a6e-d6a2b729ec0f",
+      "createdAt": new Date("2024-01-22T10:14:00.000Z"),
+      "payload": {
+        "AgencyID": "EMS1143",
+        "IncidentNumber": "Yolo-Communications-0001",
+        "AgencyIncidentCallTypeDescription": "BURN Control Burn",
+        "AgencyIncidentPriorityDescription": "3 Minor Incidents",
+        "ClosedDateTime": "",
+        "Longitude": -118.108744,
+        "Latitude": 34.154423,
+        "Unit": [
+        ],
+      },
+    },
     {
       departmentId: departmentConfire._id.toString(),
       "incidentNumber": "Confire-SB-0001",
       "uuid": "d3d23200-e0fa-443f-b647-5f18d15bbccc",
       "tag": "871e3d05-1572-4d81-ba29-0ab01b4e6d91",
-      "createdAt": new Date("2024-01-22T10:11:47.617+0000"),
+      "createdAt": new Date("2024-01-22T10:11:47.617Z"),
       "payload": {
         "AgencyID": "EMS1143",
         "IncidentNumber": "Confire-SB-0001",
@@ -853,7 +908,7 @@ export default function({
       "incidentNumber": "Sacramento-SB-0001",
       "uuid": "d3d23200-e0fa-443f-b647-5f18daabbccc",
       "tag": "871e3d05-1572-4d81-ba29-0ab01b4e6d91",
-      "createdAt": new Date("2024-01-22T10:11:47.617+0000"),
+      "createdAt": new Date("2024-01-22T10:11:47.617Z"),
       "payload": {
         "AgencyID": "EMS1143",
         "IncidentNumber": "Sacramento-SB-0001",
@@ -985,15 +1040,24 @@ export default function({
   }
 
   async function getIncidentStreamItems(departmentId: string, incidentNumber: string): Promise<CADIncidentStream[]> {
-    const items = await models.CADIncidentStream.find({
+    const query: FilterQuery<CADIncidentStream> = {
       departmentId,
       incidentNumber,
-    }).sort({
+    };
+    const items = await models.CADIncidentStream.find(query).sort({
       createdAt: 1,
     });
     return items;
   }
 
+  async function clearTestIncidentStream(departmentId: string, incidentNumber: string) {
+    const deleteQuery: FilterQuery<CADIncidentStream> = {
+      departmentId,
+      incidentNumber,
+    };
+    await models.CADIncidentStream.deleteMany(deleteQuery);
+  }
+
   return {
     departmentId,
 
@@ -1013,6 +1077,7 @@ export default function({
 
     incidentStreamItems,
     getIncidentStreamItems,
+    clearTestIncidentStream,
 
     shouldRun,
     prepareTestData,

package/definitions/rules/set-fire-map-santa-clara-city copy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"set-fire-map-santa-clara-city copy.d.ts","sourceRoot":"","sources":["../../src/rules/set-fire-map-santa-clara-city copy.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,GAAG,CAAC;AAErD,qBAAa,oCAAqC,YAAW,YAAY;IACvE,IAAI,SAAmC;IACvC,OAAO,UAAS;IAChB,OAAO,UAAS;IAChB,OAAO,EAAE,kBAAkB,EAAE,CAAM;;IAOnC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;CAoCvE"}