tabletcommand-incident 0.4.16 → 0.5.0

package/src/test/rules/map-unit-dates-verdugo.ts

@@ -1,11 +1,11 @@
 import { assert } from "chai";
-import { CADUnit } from "../../types";
 import "mocha";
 import _ from "lodash";
 
 import {
   IncidentRuleMapUnitDatesVerdugo,
 } from "../../rules/map-unit-dates-verdugo";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 describe("IncidentRuleMapUnitDatesVerdugo", function describeFunc() {
   it("sets city from city code", function() {
@@ -30,7 +30,7 @@ describe("IncidentRuleMapUnitDatesVerdugo", function describeFunc() {
     assert.isTrue(rule.matched);
     assert.isTrue(rule.changed);
 
-    const u: CADUnit | undefined = _.first(result.Unit as CADUnit[]);
+    const u: CADUnitType | undefined = _.first(result.Unit as CADUnitType[]);
     assert.isObject(u);
 
     if (!u) {

package/src/test/rules/remove-person-from-unit.ts

@@ -5,7 +5,7 @@ import _ from "lodash";
 import {
   IncidentRuleRemovePersonFromUnit,
 } from "../../rules/remove-person-from-unit";
-import { CADUnit } from "../../types";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 describe("IncidentRuleRemovePersonFromUnit", function describeFunc() {
   it("removes apparatus units", function() {
@@ -66,7 +66,7 @@ describe("IncidentRuleRemovePersonFromUnit", function describeFunc() {
     const result = rule.apply(testMatchIncident, atDate);
     assert.isTrue(rule.matched);
     assert.isTrue(rule.changed);
-    const unit = _.first(_.filter(result.Unit as Partial<CADUnit>[], (u) => u?.UnitID === "T9"));
+    const unit = _.first(_.filter(result.Unit as Partial<CADUnitType>[], (u) => u?.UnitID === "T9"));
     assert.isObject(unit);
     assert.equal(unit?.Personnel?.length, 6);
     assert.equal(unit?.PersonnelCount, 6);

package/src/test/rules/set-format-units-pulsepoint.ts

@@ -2,10 +2,10 @@ import { assert } from "chai";
 import "mocha";
 import _ from "lodash";
 
-import { CADUnit } from "../../types";
 import {
   IncidentRuleSetFormatUnitsPulsePoint,
 } from "../../rules/set-format-units-pulsepoint";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 describe("IncidentRuleSetFormatUnitsPulsePoint", function describeFunc() {
   it("sets common place name", function() {
@@ -38,8 +38,8 @@ describe("IncidentRuleSetFormatUnitsPulsePoint", function describeFunc() {
     const result = rule.apply(testItem, atDate);
     assert.isTrue(rule.matched);
     assert.isTrue(rule.changed);
-    assert.equal((result.Unit as CADUnit[]).length, 1);
-    const u = _.first(result.Unit as CADUnit[]);
+    assert.equal((result.Unit as CADUnitType[]).length, 1);
+    const u = _.first(result.Unit as CADUnitType[]);
     if (!u) {
       assert.fail("No unit parsed");
       return;

package/src/types.ts

@@ -7,57 +7,6 @@ export type RuleProcessorModule = {
   ruleProcessor(incident: Partial<CADIncident>, department: Partial<Department>): void;
 }
 
-// Copied of CADPerson from backend-models (until we find a better way to reference that type)
-export interface CADPerson extends Record<string, unknown> {
-  PersonnelID: string,
-  PersonnelName: string,
-  PersonnelNote: string,
-  PersonnelRank: string,
-  PersonnelWorkCode: string,
-}
-
-// Copied from CADUnit
-export interface CADUnit extends Record<string, unknown> {
-  UnitID: string,
-  UnitDispatchNumber: string,
-
-  AlarmAtDispatch: string,
-  TimeDispatched: string,
-  TimeEnroute: string,
-  TimeArrived: string,
-  TimeStaged: string,
-  TimeCleared: string,
-  TimeAtHospital: string,
-  TimePatient: string,
-  TimeTransport: string,
-  TimeTransporting: string,
-
-  PersonnelCount: number,
-  Personnel: CADPerson[],
-  uuid: string,
-}
-
-export interface CADRadioChannel extends Record<string, unknown> {
-  name: string,
-  channel: string,
-  channelDescription: string,
-  url: string,
-}
-
-// Copied from "tabletcommand-backend-models
-// to be removed once we migrate backend-models to proper Typescript
-export interface CADComment extends Record<string, string | boolean | Record<string, string> | undefined> {
-  Comment: string
-  CommentSource: string
-  CommentDateTime: string
-  // These should be optional, but there are not compatible with the properties exported from the models
-  CommentConfidential: boolean,
-  CommentOpts: {
-    type: string,
-    item: string,
-  },
-}
-
 export interface CADReportNumber extends Record<string, string | undefined> {
   name?: string
   number?: string