tabletcommand-incident 0.4.11 → 0.4.13

package/src/ruleProcessorLegacy.js

@@ -10,9 +10,7 @@ const cleanupNull = require("./ruleLegacy/cleanupNull");
 const closeIncidentAfterHours = require("./ruleLegacy/closeIncidentAfterHours");
 const closeIncidentMatchingIncidentNumber = require("./ruleLegacy/closeIncidentMatchingIncidentNumber");
 const closeIncidentOfCertainType = require("./ruleLegacy/closeIncidentOfCertainType");
-const removePersonFromUnit = require("./ruleLegacy/removePersonFromUnit");
 const removeEmptyPersonFromUnit = require("./ruleLegacy/removeEmptyPersonFromUnit");
-const setFireMapEmptyString = require("./ruleLegacy/setFireMapEmptyString");
 const setChannelFromRadioChannels = require("./ruleLegacy/setChannelsFromRadioChannels");
 const rebuildUnitDispatchNumber = require("./ruleLegacy/rebuildUnitDispatchNumber");
 const removeField = require("./ruleLegacy/removeField");
@@ -22,7 +20,6 @@ const setFormatUnitsPulsepoint = require("./ruleLegacy/setFormatUnitsPulsepoint"
 const mapUnitDatesVerdugo = require("./ruleLegacy/mapUnitDatesVerdugo");
 const setMapIncidentTypePulsepoint = require("./ruleLegacy/setMapIncidentTypePulsepoint");
 const setLatitudeLongitude = require("./ruleLegacy/setLatitudeLongitude");
-const setCommunicationChannelsFromRadioNamesModule = require("./ruleLegacy/setCommunicationChannelsFromRadioNames");
 const setRadioChannelsFromLegacyChannelsModule = require("./ruleLegacy/setRadioChannelsFromLegacyChannels");
 const setRadioChannelsFromRadioNamesModule = require("./ruleLegacy/setRadioChannelsFromRadioNames");
 const setFireMapSantaClaraCity = require("./ruleLegacy/setFireMapSantaClaraCity");
@@ -36,8 +33,6 @@ const setUnitDispatchNumberAsString = require("./ruleLegacy/setUnitDispatchNumbe
 const setLegacyPriorIncidentChanged = require("./ruleLegacy/setLegacyPriorIncidentChanged");
 const setLegacyRenameUnit = require("./ruleLegacy/setLegacyRenameUnit");
 
-const setAgencyCallTypeClarkCounty = require("./ruleLegacy/setAgencyCallTypeClarkCounty");
-
 // Applies to the raw incident, whatever we get from the CAD
 function ruleProcessor(incident, department) {
   if (!_.isObject(incident)) {
@@ -184,14 +179,6 @@ function ruleProcessor(incident, department) {
   // Copy LocationComment as Comment
   // Move LocationComment to CommonPlaceName
 
-  // Clark County
-  if (departmentId === "5c1016b2ebcdc419d00a3ecb") {
-    rule.setAgencyCallTypeClarkCounty = [{
-      is: "setAgencyCallTypeClarkCountyResolved",
-      use: setAgencyCallTypeClarkCounty
-    }];
-  }
-
   // Richmond Hill Fire Department/Versaterm: production, testing, development
   if (departmentId === "592ba375e47dac145f680bab" ||
     departmentId === "5a6631f0923ce109270975bd" ||
@@ -273,81 +260,6 @@ function ruleProcessor(incident, department) {
     }];
   }
 
-  // Santa Cruz Regional Communications
-  if (departmentId === "51b8bea159aaf4fa3e000378") {
-    /* cSpell:disable */
-    const setCommunicationChannelsFromRadioNamesSCRC = setCommunicationChannelsFromRadioNamesModule(
-      ["FBLK", "FBLK1", "FBLK2", "FBLK3", "FBLK4", "FBLU",
-        "FBLU1", "FBLU2", "FBLU3", "FBLU4", "FGRN", "FGRN1",
-        "FGRN2", "FGRN3", "FGRN4", "FORNG", "FORNG1", "FORNG2",
-        "FORNG3", "FORNG4", "FSILV", "FSILV1", "FSILV2", "FSILV3",
-        "FSILV4", "HTAC1", "HTAC2", "UCTAC", "VFIR21", "VFIR22",
-        "VFIR23", "VFIR24", "VFIR25", "VFIR26", "FCORD", "FCORDH"], // Tactical
-      [], // TacticalAlt
-      ["FRED", "FRED1", "FRED2", "FRED3", "FRED4", "FYELL",
-        "FYELL1", "FYELL2", "FYELL3", "FYELL4", "FCZU", "FBEU"] // Command
-    );
-
-    rule.setCommunicationChannelsFromRadioNamesSCRC = [{
-      is: "setCommunicationChannelsFromRadioNamesSCRCResolved",
-      use: setCommunicationChannelsFromRadioNamesSCRC
-    }];
-    /* cSpell:enable */
-  }
-
-  // San Mateo County Dispatch - Production, Training, Testing
-  const isSanMateoCounty = departmentId === "5238fb0228dd530000000132" || // Production
-    departmentId === "5578fd8ee06887fe660000f9" || // Training
-    departmentId === "5f31cf7587aabc6af4559da7"; // Testing
-  if (isSanMateoCounty) {
-    const removePersonFromUnitSanMateo = removePersonFromUnit();
-
-    rule.removePersonFromUnitSanMateo = [{
-      is: "removePersonFromUnitSanMateoResolved",
-      use: removePersonFromUnitSanMateo
-    }];
-
-    const setFireMapEmptyStringSanMateo = setFireMapEmptyString();
-
-    rule.setFireMapEmptyStringSanMateo = [{
-      is: "setFireMapEmptyStringSanMateoResolved",
-      use: setFireMapEmptyStringSanMateo
-    }];
-
-    /* cSpell:disable */
-    const setCommunicationChannelsFromRadioNamesSMC = setCommunicationChannelsFromRadioNamesModule(
-      ["TAC15", "TAC16", "TAC17", "TAC25", "TAC26", "TAC27", "TAC35", "TAC36", "TAC37",
-        "TAC45", "TAC46", "TAC47", "VFIR21", "VFIR22", "VFIR23", "VFIR24", "VFIR25", "VFIR26"], // Tactical
-      [], // TacticalAlt
-      ["CM11X1", "CM11X2", "CM11X3", "CM11X4", "CM11X5", "CM21X1", "CM21X2", "CM21X3",
-        "CM21X4", "CM21X5", "CM31X1", "CM31X2", "CM31X3", "CM31X4", "CM31X5", "CM41X1",
-        "CM41X2", "CM41X3", "CM41X4", "CM41X5", "CM51X1", "CM51X2", "CM51X3", "CM51X4",
-        "CM51X5"] // Command
-    );
-    /* cSpell:enable */
-
-    rule.setCommunicationChannelsFromRadioNames = [{
-      is: "setCommunicationChannelsFromRadioNamesResolved",
-      use: setCommunicationChannelsFromRadioNamesSMC
-    }];
-
-    const sanMateoAutoCloseTypes = [
-      "FIRE INFORMATION ADVISEMENT"
-    ];
-    const sanMateoAutoCloseDelay = 1; // After 1 second
-    const closeIncidentOfCertainTypeSanMateo = closeIncidentOfCertainType(sanMateoAutoCloseTypes, sanMateoAutoCloseDelay);
-
-    rule.closeIncidentOfCertainTypeSanMateo = [{
-      is: "closeIncidentOfCertainTypeSanMateoResolved",
-      use: closeIncidentOfCertainTypeSanMateo
-    }];
-
-    rule.cleanupComments = [{
-      is: "cleanupCommentsSMCResolved",
-      use: cleanupCommentsModule(cleanupCommentsFilters.missingDate)
-    }];
-  }
-
   // Santa Clara City, Santa Clara City-Hexagon Test
   if (departmentId === "5a3e9340432ea42a8dc0d6de" ||
     departmentId === "5b05e02b14f3f758ae9501cb") {

package/src/rules/index.ts

@@ -28,6 +28,7 @@ import { IncidentRuleMapUnitDatesVerdugo } from "./map-unit-dates-verdugo";
 import { IncidentRuleNotImplemented } from "./not-implemented";
 import { IncidentRuleRemovePersonFromUnit } from "./remove-person-from-unit";
 import { IncidentRuleSetAddress } from "./set-address";
+import { IncidentRuleSetAlarmAtDispatchFromAlarmLevel } from "./set-fire-alarm-at-dispatch-from-alarm-level";
 import { IncidentRuleSetChannelsFromRadioChannels } from "./set-channels-from-radio-channels";
 import { IncidentRuleSetCityAlameda } from "./set-city-alameda";
 import { IncidentRuleSetCityCalfireLNU } from "./set-city-calfire-lnu";
@@ -39,15 +40,15 @@ import { IncidentRuleSetCommonPlaceName } from "./set-common-place-name";
 import { IncidentRuleSetCommunicationChannelsFromRadioNames } from "./set-communication-channels-from-radio-names";
 import { IncidentRuleSetCrossStreets } from "./set-cross-streets";
 import { IncidentRuleSetFireMapFromMapPagesSouthernMarin } from "./set-fire-map-from-map-pages-southern-marin";
+import { IncidentRuleSetFireMapPagesOntario } from "./set-fire-map-pages-ontario";
 import { IncidentRuleSetFireMapSantaClaraCity } from "./set-fire-map-santa-clara-city";
 import { IncidentRuleSetFormatUnitsPulsePoint } from "./set-format-units-pulsepoint";
+import { IncidentRuleSetIncidentTypeOntario } from "./set-incident-type-ontario";
 import { IncidentRuleSetLocationPreference } from "./set-location-preference";
 import { IncidentRuleSetLocationPreferenceDerry } from "./set-location-preference-derry";
 import { IncidentRuleSetMapIncidentTypePulsePoint } from "./set-map-incident-type-pulsepoint";
 import { IncidentRuleSetPriorIncidentCommentField } from "./set-prior-incident-comment-field";
 import { IncidentRuleSetStreetNumber } from "./set-street-number";
-import { IncidentRuleSetIncidentTypeOntario } from "./set-incident-type-ontario";
-import { IncidentRuleSetFireMapPagesOntario } from "./set-fire-map-pages-ontario";
 
 import {
   IncidentRuleCleanUpComments,
@@ -76,6 +77,75 @@ export function rulesForDepartment(department: Partial<Department>): IncidentRul
     items.push(new IncidentRuleSetCityCalfireLNU());
   }
 
+  // Clark County
+  if (departmentId === "5c1016b2ebcdc419d00a3ecb") {
+    items.push(new IncidentRuleJoinCallTypePriority("PrioCallType"));
+  }
+
+  // Jackson County - Testing
+  if (departmentId === "661db49dc30f898ba3594c9a") {
+    items.push(new IncidentRuleJoinCallTypePriority("CallTypePrio", "-"));
+    items.push(new IncidentRuleSetAlarmAtDispatchFromAlarmLevel());
+  }
+
+  // San Mateo County Dispatch - Production, Training, Testing
+  const isSanMateoCounty = departmentId === "5238fb0228dd530000000132" || // Production
+    departmentId === "5578fd8ee06887fe660000f9" || // Training
+    departmentId === "5f31cf7587aabc6af4559da7"; // Testing
+  if (isSanMateoCounty) {
+    items.push(new IncidentRuleRemovePersonFromUnit());
+    items.push(new IncidentRuleClearField("FireMap"));
+    // cSpell:disable
+    items.push(new IncidentRuleSetCommunicationChannelsFromRadioNames(
+      // Tactical
+      [
+        "TAC15", "TAC16", "TAC17", "TAC25", "TAC26", "TAC27", "TAC35", "TAC36", "TAC37",
+        "TAC45", "TAC46", "TAC47", "VFIR21", "VFIR22", "VFIR23", "VFIR24", "VFIR25", "VFIR26",
+      ],
+      // Tactical Alt
+      [],
+      // Command
+      [
+        "CM11X1", "CM11X2", "CM11X3", "CM11X4", "CM11X5", "CM21X1", "CM21X2", "CM21X3",
+        "CM21X4", "CM21X5", "CM31X1", "CM31X2", "CM31X3", "CM31X4", "CM31X5", "CM41X1",
+        "CM41X2", "CM41X3", "CM41X4", "CM41X5", "CM51X1", "CM51X2", "CM51X3", "CM51X4",
+        "CM51X5",
+      ]
+    ));
+    // cSpell:enable
+    items.push(new IncidentRuleCloseIncidentOfCertainType(
+      [
+        "FIRE INFORMATION ADVISEMENT",
+      ],
+      1, // After 1 second
+    ));
+    items.push(new IncidentRuleCleanUpComments(cleanUpFilterMissingDates));
+  }
+
+  // Santa Cruz Regional Communications
+  if (departmentId === "51b8bea159aaf4fa3e000378") {
+    // cSpell:disable
+    items.push(new IncidentRuleSetCommunicationChannelsFromRadioNames(
+      // Tactical
+      [
+        "FBLK", "FBLK1", "FBLK2", "FBLK3", "FBLK4", "FBLU",
+        "FBLU1", "FBLU2", "FBLU3", "FBLU4", "FGRN", "FGRN1",
+        "FGRN2", "FGRN3", "FGRN4", "FORNG", "FORNG1", "FORNG2",
+        "FORNG3", "FORNG4", "FSILV", "FSILV1", "FSILV2", "FSILV3",
+        "FSILV4", "HTAC1", "HTAC2", "UCTAC", "VFIR21", "VFIR22",
+        "VFIR23", "VFIR24", "VFIR25", "VFIR26", "FCORD", "FCORDH",
+      ],
+      // Tactical Alt
+      [],
+      // Command
+      [
+        "FRED", "FRED1", "FRED2", "FRED3", "FRED4", "FYELL",
+        "FYELL1", "FYELL2", "FYELL3", "FYELL4", "FCZU", "FBEU",
+      ]
+    ));
+    // cSpell:enable
+  }
+
   // Southern Marin / Southern Marin Test
   if (departmentId === "5175b66dd114ea2bee000037" ||
     departmentId === "5a30abc8bed2e86d05c9e68e"
@@ -91,10 +161,30 @@ export function rulesForDepartment(department: Partial<Department>): IncidentRul
     ));
   }
 
+  // Verdugo
   if (departmentId === "6387f8028dc3b9c15bd2afc8" || departmentId === "54ef74f5b034810000000e38") {
     items.push(new IncidentRuleSetCityVerdugo());
   }
 
+  // Yolo Emergency Communications Agency
+  if (departmentId === "660c60e25a572c9f4a20972a") {
+    // cSpell:disable
+    items.push(new IncidentRuleSetCommunicationChannelsFromRadioNames(
+      // Tactical
+      [
+        "BLACK", "BROWN",
+        "ECHO6", "ECHO7", "ECHO8", "ECHO9",
+        "VFIRE22", "VFIRE23", "VFIRE24", "VFIRE25", "VFIRE26",
+        "WDLDTAC",
+      ],
+      // Tactical Alt
+      [],
+      // Command
+      []
+    ));
+    // cSpell:enable
+  }
+
   // Cleanup City that were not previously processed
   items.push(new IncidentRuleSetCityCleanUp());
 
@@ -132,11 +222,6 @@ export function rulesForDepartment(department: Partial<Department>): IncidentRul
 
   //. Moved...
 
-  // Clark County
-  if (departmentId === "5c1016b2ebcdc419d00a3ecb") {
-    items.push(new IncidentRuleJoinCallTypePriority());
-  }
-
   // Verdugo
   if (departmentId === "54ef74f5b034810000000e38" ||
     departmentId === "6387f8028dc3b9c15bd2afc8"
@@ -170,64 +255,6 @@ export function rulesForDepartment(department: Partial<Department>): IncidentRul
     items.push(new IncidentRuleCloseIncidentAfterHours(4));
   }
 
-  // Santa Cruz Regional Communications
-  if (departmentId === "51b8bea159aaf4fa3e000378") {
-    // cSpell:disable
-    items.push(new IncidentRuleSetCommunicationChannelsFromRadioNames(
-      // Tactical
-      [
-        "FBLK", "FBLK1", "FBLK2", "FBLK3", "FBLK4", "FBLU",
-        "FBLU1", "FBLU2", "FBLU3", "FBLU4", "FGRN", "FGRN1",
-        "FGRN2", "FGRN3", "FGRN4", "FORNG", "FORNG1", "FORNG2",
-        "FORNG3", "FORNG4", "FSILV", "FSILV1", "FSILV2", "FSILV3",
-        "FSILV4", "HTAC1", "HTAC2", "UCTAC", "VFIR21", "VFIR22",
-        "VFIR23", "VFIR24", "VFIR25", "VFIR26", "FCORD", "FCORDH",
-      ],
-      // Tactical Alt
-      [],
-      // Command
-      [
-        "FRED", "FRED1", "FRED2", "FRED3", "FRED4", "FYELL",
-        "FYELL1", "FYELL2", "FYELL3", "FYELL4", "FCZU", "FBEU",
-      ]
-    ));
-    // cSpell:enable
-  }
-
-  // San Mateo County Dispatch - Production, Training, Testing
-  const isSanMateoCounty = departmentId === "5238fb0228dd530000000132" || // Production
-    departmentId === "5578fd8ee06887fe660000f9" || // Training
-    departmentId === "5f31cf7587aabc6af4559da7"; // Testing
-  if (isSanMateoCounty) {
-    items.push(new IncidentRuleRemovePersonFromUnit());
-    items.push(new IncidentRuleClearField("FireMap"));
-    // cSpell:disable
-    items.push(new IncidentRuleSetCommunicationChannelsFromRadioNames(
-      // Tactical
-      [
-        "TAC15", "TAC16", "TAC17", "TAC25", "TAC26", "TAC27", "TAC35", "TAC36", "TAC37",
-        "TAC45", "TAC46", "TAC47", "VFIR21", "VFIR22", "VFIR23", "VFIR24", "VFIR25", "VFIR26",
-      ],
-      // Tactical Alt
-      [],
-      // Command
-      [
-        "CM11X1", "CM11X2", "CM11X3", "CM11X4", "CM11X5", "CM21X1", "CM21X2", "CM21X3",
-        "CM21X4", "CM21X5", "CM31X1", "CM31X2", "CM31X3", "CM31X4", "CM31X5", "CM41X1",
-        "CM41X2", "CM41X3", "CM41X4", "CM41X5", "CM51X1", "CM51X2", "CM51X3", "CM51X4",
-        "CM51X5",
-      ]
-    ));
-    // cSpell:enable
-    items.push(new IncidentRuleCloseIncidentOfCertainType(
-      [
-        "FIRE INFORMATION ADVISEMENT",
-      ],
-      1, // After 1 second
-    ));
-    items.push(new IncidentRuleCleanUpComments(cleanUpFilterMissingDates));
-  }
-
   // Santa Clara City, Santa Clara City-Hexagon Test
   if (departmentId === "5a3e9340432ea42a8dc0d6de" ||
     departmentId === "5b05e02b14f3f758ae9501cb"

package/src/rules/join-call-type-priority.ts

@@ -3,14 +3,20 @@ import _ from "lodash";
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
 
+export type JoinCallTypeOrder = "PrioCallType" | "CallTypePrio";
+
 export class IncidentRuleJoinCallTypePriority implements IncidentRule {
   name = "Join Call Type - Priority";
   matched = false;
   changed = false;
   changes: IncidentRuleChange[] = [];
 
-  constructor() {
-    // Not necessary, example for when needed 
+  joinOrder: JoinCallTypeOrder = "PrioCallType";
+  separator = "";
+
+  constructor(j: JoinCallTypeOrder, s = "") {
+    this.joinOrder = j;
+    this.separator = s;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -24,7 +30,26 @@ export class IncidentRuleJoinCallTypePriority implements IncidentRule {
 
     const priorityDescription = _.trim(item.AgencyIncidentPriorityDescription);
     const callTypeDescription = _.trim(item.AgencyIncidentCallTypeDescription);
-    const nextCallType = `${priorityDescription} ${callTypeDescription}`;
+    const parts: string[] = [];
+    switch (this.joinOrder) {
+      case "CallTypePrio":
+        parts.push(callTypeDescription);
+        if (this.separator !== "") {
+          parts.push(this.separator);
+        }
+        parts.push(priorityDescription);
+        break;
+
+      default:
+        parts.push(priorityDescription);
+        if (this.separator !== "") {
+          parts.push(this.separator);
+        }
+        parts.push(callTypeDescription);
+        break;
+    }
+
+    const nextCallType = parts.join(" ");
     item.AgencyIncidentCallTypeDescription = nextCallType;
 
     this.matched = true;

package/src/rules/set-fire-alarm-at-dispatch-from-alarm-level.ts

@@ -0,0 +1,67 @@
+import _ from "lodash";
+import { CADIncident } from "tabletcommand-backend-models";
+import { IncidentRule, IncidentRuleChange } from ".";
+import { CADUnit } from "../types";
+
+export class IncidentRuleSetAlarmAtDispatchFromAlarmLevel implements IncidentRule {
+  name = "Set Unit.AlarmAtDispatch from Incident.AlarmLevel";
+  matched = false;
+  changed = false;
+  changes: IncidentRuleChange[] = [];
+
+  constructor() {
+    //
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  apply(item: Partial<CADIncident>, _atDate: Date): Partial<CADIncident> {
+    const hasAlarmLevel = (_.isString(item.AlarmLevel) && _.trim(item.AlarmLevel) !== "") || _.isNumber(item.AlarmLevel);
+    if (!hasAlarmLevel) {
+      return item;
+    }
+
+    // To handle when AlarmLevel is a number
+    const alarmLevel = _.trim(`${item.AlarmLevel}`);
+    let changed = false;
+    let matched = false;
+    const change: Record<string, string> = {};
+
+    // Process if unit is from Stream
+    if (_.isArray(item.Unit as CADUnit[])) {
+      (item.Unit as CADUnit[]).forEach((unit: CADUnit) => {
+        if (_.isString(unit.AlarmAtDispatch) && unit.AlarmAtDispatch !== "") {
+          return;
+        }
+        unit.AlarmAtDispatch = alarmLevel;
+        changed = true;
+        matched = true;
+        change[unit.UnitID ?? "-"] = `AlarmAtDispatch: ${alarmLevel}`;
+      });
+    }
+
+    // Process if unit is from  Incident
+    if (_.isArray(item.units)) {
+      item.units.forEach((unit: CADUnit) => {
+        if (_.isString(unit.AlarmAtDispatch) && unit.AlarmAtDispatch !== "") {
+          return;
+        }
+        unit.AlarmAtDispatch = alarmLevel;
+        changed = true;
+        matched = true;
+        change[unit.UnitID ?? "-"] = `AlarmAtDispatch: ${alarmLevel}`;
+      });
+    }
+
+    this.matched = matched;
+    this.changed = changed;
+
+    this.changes.push({
+      name: this.name,
+      matched: this.matched,
+      changed: this.changed,
+      change,
+    });
+
+    return item;
+  }
+}

package/src/test/domain.ts

@@ -1,9 +1,7 @@
-import chai from "chai";
+import { assert } from "chai";
 import "mocha";
 import _ from "lodash";
 
-const assert = chai.assert;
-
 import domain from "../domain";
 import { CADComment, CADUnit } from "../types";
 import { CADIncident } from "tabletcommand-backend-models";
@@ -63,10 +61,12 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
         {
          radioName: "Z1",
          active: true,
+         source: ""
         }, 
         {
          radioName: "BBBB123",
-         active: false
+         active: false,
+         source: ""
         }
       ],
       shiftStartTime: 1559446299,
@@ -80,6 +80,7 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
         {
           radioName: "Z1",
           active: true,
+          source: ""
         }
       ],
       shiftStartTime: 1559446299,
@@ -94,10 +95,12 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
         {
           radioName: "Z0",
           active: true,
+          source: ""
         }, 
         {
           radioName: "Z1",
           active: true,
+          source: ""
         }
       ],
       shiftStartTime: 1559446299,
@@ -160,6 +163,7 @@ describe("mergeIncidents", function() {
         {
           "name": "z5",
           "channel": "z5",
+          "channelDescription": "d-z5",
           "url": "u-z5",
         }
       ]
@@ -171,6 +175,7 @@ describe("mergeIncidents", function() {
         {
           "name": "e1",
           "channel": "e1",
+          "channelDescription": "d-e1",
           "url": "u-e1",
         }
       ]