tabletcommand-incident 0.4.16 → 0.6.0

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

@@ -2,7 +2,8 @@ import _ from "lodash";
 
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
-import { CADPerson, CADUnit } from "../types";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
+import { CADPersonSchemaType } from "tabletcommand-backend-models/definitions/types/shared-incident";
 
 export type FieldToClear = keyof CADIncident;
 
@@ -24,7 +25,7 @@ export class IncidentRuleRemovePersonFromUnit implements IncidentRule {
 
     let ruleMatched = false;
 
-    _.each(item.Unit as CADUnit[], function(unit: CADUnit) {
+    _.each(item.Unit as CADUnitType[], function(unit) {
       if (!_.isObject(unit)) {
         return;
       }
@@ -33,9 +34,9 @@ export class IncidentRuleRemovePersonFromUnit implements IncidentRule {
         return;
       }
 
-      const revisedItems: CADPerson[] = [];
+      const revisedItems: CADPersonSchemaType[] = [];
       let personnelCount = (_.isNumber(unit.PersonnelCount) && _.isFinite(unit.PersonnelCount) && unit.PersonnelCount > 0) ? unit.PersonnelCount : 0;
-      _.each(unit.Personnel, function(person: CADPerson) {
+      _.each(unit.Personnel, function(person: CADPersonSchemaType) {
         if (!_.isObject(person) || !_.isString(person.PersonnelName)) {
           return;
         }
@@ -66,7 +67,7 @@ export class IncidentRuleRemovePersonFromUnit implements IncidentRule {
   }
 }
 
-export function shouldRemovePerson(item: Partial<CADPerson>): boolean {
+export function shouldRemovePerson(item: Partial<CADPersonSchemaType>): boolean {
   if (!_.isString(item.PersonnelName)) {
     return false;
   }

package/src/rules/set-address.ts

@@ -1,9 +1,9 @@
-import { CADComment } from "../types";
 import _ from "lodash";
 import moment from "moment-timezone";
 
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
+import { CADCommentType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleSetAddress implements IncidentRule {
   name = "Set Address";
@@ -24,15 +24,15 @@ export class IncidentRuleSetAddress implements IncidentRule {
     this.changed = this.matched;
     item.full_address = address;
 
-    const addrComment: Partial<CADComment> = {
+    const addrComment: Partial<CADCommentType> = {
       Comment: `Address: ${address}`,
       CommentDateTime: moment(atDate).format("YYYY-MM-DDTHH:mm:ssZZ"),
       CommentSource: "TC",
     };
     if (!_.isArray(item.Comment)) {
       item.Comment = [];
-    } 
-    item.Comment?.push(addrComment as CADComment); // Silence typescript/mongo mismatch
+    }
+    item.Comment?.push(addrComment as CADCommentType); // Silence typescript/mongo mismatch
 
     this.changes.push({
       name: this.name,

package/src/rules/set-communication-channels-from-radio-names.ts

@@ -1,8 +1,8 @@
-import { CADUnit } from "../types";
 import _ from "lodash";
 
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleSetCommunicationChannelsFromRadioNames implements IncidentRule {
   name = "Set Communication Channels From Radio Names";
@@ -29,7 +29,7 @@ export class IncidentRuleSetCommunicationChannelsFromRadioNames implements Incid
       return item;
     }
 
-    const incomingRadioNames = _.map(item.Unit as Partial<CADUnit>[], (item: Partial<CADUnit>) => {
+    const incomingRadioNames = _.map(item.Unit as Partial<CADUnitType>[], (item: Partial<CADUnitType>) => {
       if (!_.isString(item.UnitID)) {
         return "";
       }

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

@@ -1,7 +1,7 @@
 import _ from "lodash";
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
-import { CADUnit } from "../types";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleSetAlarmAtDispatchFromAlarmLevel implements IncidentRule {
   name = "Set Unit.AlarmAtDispatch from Incident.AlarmLevel";
@@ -27,8 +27,8 @@ export class IncidentRuleSetAlarmAtDispatchFromAlarmLevel implements IncidentRul
     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 (_.isArray(item.Unit as CADUnitType[])) {
+      (item.Unit as CADUnitType[]).forEach((unit) => {
         if (_.isString(unit.AlarmAtDispatch) && unit.AlarmAtDispatch !== "") {
           return;
         }
@@ -41,7 +41,7 @@ export class IncidentRuleSetAlarmAtDispatchFromAlarmLevel implements IncidentRul
 
     // Process if unit is from  Incident
     if (_.isArray(item.units)) {
-      item.units.forEach((unit: CADUnit) => {
+      item.units.forEach((unit: CADUnitType) => {
         if (_.isString(unit.AlarmAtDispatch) && unit.AlarmAtDispatch !== "") {
           return;
         }

package/src/rules/set-fire-map-from-map-pages-southern-marin.ts

@@ -3,7 +3,7 @@ import moment from "moment-timezone";
 
 import { CADIncident } from "tabletcommand-backend-models";
 import { IncidentRule, IncidentRuleChange } from ".";
-import { CADComment } from "../types";
+import { CADCommentType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleSetFireMapFromMapPagesSouthernMarin implements IncidentRule {
   name = "Set Fire Map From Map Pages Southern Marin";
@@ -30,7 +30,7 @@ export class IncidentRuleSetFireMapFromMapPagesSouthernMarin implements Incident
       item.FireMap = fireMap;
     }
 
-    const extraComment: Partial<CADComment> = {
+    const extraComment: Partial<CADCommentType> = {
       Comment: `MapGrid: ${_.trim(previousMapPage)}`,
       CommentDateTime: moment(atDate).format("YYYY-MM-DDTHH:mm:ssZZ"),
       CommentSource: "TC",
@@ -39,7 +39,7 @@ export class IncidentRuleSetFireMapFromMapPagesSouthernMarin implements Incident
     if (!_.isArray(item.Comment)) {
       item.Comment = [];
     }
-    item.Comment?.push(extraComment as CADComment); // Silence typescript/mongo mismatch
+    item.Comment?.push(extraComment as CADCommentType); // Silence typescript/mongo mismatch
 
     this.changes.push({
       name: this.name,

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

@@ -1,8 +1,8 @@
 import _ from "lodash";
 
 import { CADIncident } from "tabletcommand-backend-models";
-import { CADUnit } from "../types";
 import { IncidentRule, IncidentRuleChange } from ".";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleSetFormatUnitsPulsePoint implements IncidentRule {
   name = "Format Units PulsePoint";
@@ -16,11 +16,11 @@ export class IncidentRuleSetFormatUnitsPulsePoint implements IncidentRule {
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   apply(item: Partial<CADIncident>, _atDate: Date): Partial<CADIncident> {
-    const tempArray: Partial<CADUnit>[] = [];
+    const tempArray: Partial<CADUnitType>[] = [];
     if (_.isPlainObject(item.Unit)) {
-      _.each(item.Unit as Array<Partial<CADUnit>>, (value) => {
+      _.each(item.Unit as Array<Partial<CADUnitType>>, (value) => {
         if (_.isPlainObject(value)) {
-          const tempObject: Partial<CADUnit> = _.cloneDeep(value);
+          const tempObject: Partial<CADUnitType> = _.cloneDeep(value);
           if (_.isString(value.UnitDispatchDateTime)) {
             tempObject.TimeDispatched = value.UnitDispatchDateTime;
             delete tempObject.UnitDispatchDateTime;

package/src/store.ts

@@ -1,8 +1,8 @@
 import debug_module from "debug";
 import _ from "lodash";
-import mongoose, {
+import {
   FilterQuery,
-  MongooseFilterQuery,
+  SortOrder
 } from "mongoose";
 import * as Sentry from "@sentry/node";
 
@@ -61,9 +61,9 @@ export default function storeModule({ models }: {
   }
 
   async function previousIncident(incident: Partial<CADIncident>, department: Partial<Department>): Promise<Partial<CADIncident>> {
-    const query: MongooseFilterQuery<CADIncident> = {
+    const query: FilterQuery<CADIncident> = {
       IncidentNumber: incident.IncidentNumber,
-      departmentId: (department._id as mongoose.Types.ObjectId).toString(),
+      departmentId: department._id?.toString(),
     };
 
     // Remove lean, if found document
@@ -100,7 +100,7 @@ export default function storeModule({ models }: {
       }
     };
     // By default, sort items old to new
-    let sortBy = {
+    let sortBy: Record<string, SortOrder> = {
       createdAt: 1,
       // Adding _id to get a guaranteed order if createdAt are equal.
       // Sorting by _id only would not be enough because although they are roughly consecutive,
@@ -132,7 +132,7 @@ export default function storeModule({ models }: {
 
   async function previousIncidentsV1(incident: Partial<CADIncident>, department: Partial<Department>) {
     const incidentValid = _.isObject(incident) && _.isString(incident.IncidentNumber);
-    const departmentValid: boolean = _.isObject(department) && (department._id as mongoose.Types.ObjectId) !== null;
+    const departmentValid: boolean = _.isObject(department) && !!department._id;
     const valid: boolean = incidentValid && departmentValid;
     let incidents: Partial<CADIncident>[] = [];
     if (!valid) {
@@ -140,9 +140,9 @@ export default function storeModule({ models }: {
       return incidents;
     }
 
-    const query: MongooseFilterQuery<CADIncident> = {
+    const query: FilterQuery<CADIncident> = {
       IncidentNumber: incident.IncidentNumber,
-      departmentId: (department._id as mongoose.Types.ObjectId).toString(),
+      departmentId: department._id?.toString(),
     };
 
     const dbIncidents = await models.CADIncident.find(query).lean();
@@ -161,8 +161,8 @@ export default function storeModule({ models }: {
   async function saveIncidentV1(item: Partial<CADIncident>) {
     debug(`Saving CADIncident:${JSON.stringify(item)}.`);
     const toSave = new models.CADIncident(item);
-    const query: MongooseFilterQuery<CADIncident> = {
-      _id: (toSave._id as mongoose.Types.ObjectId),
+    const query: FilterQuery<CADIncident> = {
+      _id: (toSave._id),
     };
     const replaceOpts = { upsert: true };
     const res = await models.CADIncident.replaceOne(query, toSave).setOptions(replaceOpts) as unknown;
@@ -171,6 +171,10 @@ export default function storeModule({ models }: {
     return toSave;
   }
 
+  async function convertItemWithPersonnelToModel(mergedItemWithPersonnel: Partial<CADIncident>) {
+    return new models.CADIncident(mergedItemWithPersonnel);
+  }
+
   return {
     retrievePersonnel,
     previousIncident,
@@ -180,6 +184,8 @@ export default function storeModule({ models }: {
 
     previousIncidentsV1,
     saveIncidentV1,
+
+    convertItemWithPersonnelToModel,
   };
 }
 

package/src/test/domain.ts

@@ -3,8 +3,8 @@ import "mocha";
 import _ from "lodash";
 
 import domain from "../domain";
-import { CADComment, CADUnit } from "../types";
 import { CADIncident } from "tabletcommand-backend-models";
+import { CADCommentType, CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 it("domain.mergePersonnel resolves to correct unit personnel counts", function() {
   // Need to run verify/personnel-import.js on server-status locally
@@ -46,7 +46,7 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
         }
       ]
     }
-  ] as CADUnit[];
+  ] as CADUnitType[];
 
   const personnelPartial = [
     //
@@ -59,14 +59,14 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
       radioNames: ["Z1"],
       radios: [
         {
-         radioName: "Z1",
-         active: true,
-         source: ""
-        }, 
+          radioName: "Z1",
+          active: true,
+          source: ""
+        },
         {
-         radioName: "BBBB123",
-         active: false,
-         source: ""
+          radioName: "BBBB123",
+          active: false,
+          source: ""
         }
       ],
       shiftStartTime: 1559446299,
@@ -96,7 +96,7 @@ it("domain.mergePersonnel resolves to correct unit personnel counts", function()
           radioName: "Z0",
           active: true,
           source: ""
-        }, 
+        },
         {
           radioName: "Z1",
           active: true,
@@ -190,7 +190,7 @@ describe("mergeIncidents", function() {
     const unit1 = {
       UnitDispatchNumber: "1",
       UnitID: "E1"
-    } as CADUnit;
+    } as CADUnitType;
     const c1 = {
       Comment: "MapGrid: Grid 4158/P.33",
       CommentDateTime: "2018-07-20T06:33:28+0000",
@@ -211,13 +211,13 @@ describe("mergeIncidents", function() {
     const unit2 = {
       UnitDispatchNumber: "2",
       UnitID: "E2"
-    } as CADUnit;
+    } as CADUnitType;
 
     const unit3 = {
       UnitDispatchNumber: "1",
       UnitID: "E1",
       Time: "2014-07-26T07:19:00-0700"
-    } as unknown as CADUnit;
+    } as unknown as CADUnitType;
     const c2 = {
       Comment: "MapGrid: Grid 4158/P.33",
       CommentDateTime: "2018-07-20T06:33:30+0000",
@@ -297,7 +297,7 @@ describe("mergeIncidents", function() {
       Time: "2014-07-26T07:19:00-0700",
       uuid: "cb91ff3c-5804-4593-961a-7868b96f0ba9"
     };
-    const units = [unit1, unit2, unit3] as CADUnit[];
+    const units = [unit1, unit2, unit3] as CADUnitType[];
 
     const mergedItems = domain.mergeUnitsV3(units);
     let unit1isComplete = false;
@@ -346,7 +346,7 @@ describe("mergeIncidents", function() {
         "TimeCleared": null,
         "TimeArrived": "2023-05-01T17:18:56-07:00"
       }
-    ] as unknown as CADUnit[];
+    ] as unknown as CADUnitType[];
 
     const mergedItems = domain.mergeUnitsV3(units);
     assert.equal(mergedItems.length, units.length, "Same number of units");
@@ -377,7 +377,7 @@ describe("mergeIncidents", function() {
         CommentDateTime: "2018-07-20T06:33:34+0000",
         CommentSource: "TC"
       }
-    ] as CADComment[];
+    ] as CADCommentType[];
 
     const mergedItems = domain.mergeCommentsV3(comments);
     let c1isComplete = false;
@@ -429,7 +429,7 @@ describe("mergeIncidents", function() {
       c2,
       c3,
       c3
-    ] as CADComment[];
+    ] as CADCommentType[];
 
     const mergedItems = domain.mergeCommentsV3(comments);
     assert.equal(mergedItems.length, 2, "Comment count should be the same");

package/src/test/index.ts

@@ -4,7 +4,6 @@ import _ from "lodash";
 import * as modelsModule from "tabletcommand-backend-models";
 
 import {
-  CADUnit,
   HandleProcessIncidentRequestResult,
 } from "../types";
 
@@ -13,6 +12,7 @@ import {
   indexFile,
 } from "../index";
 import mockModule from "./mock";
+import { CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 let mock: ReturnType<typeof mockModule>;
 let incidentProcessor: IncidentProcessorModule;
@@ -27,7 +27,6 @@ describe("index", function() {
       mongoose,
       models
     } = await modelsModule.connect(process.env.NODE_MONGO_URL || "");
-    mongoose.set("useFindAndModify", false);
 
     mock = mockModule({
       mongoose,
@@ -144,7 +143,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentAlameda._id as string;
+      const departmentId = mock.departmentAlameda._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -158,7 +157,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentAlameda._id as string;
+      const departmentId = mock.departmentAlameda._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -191,7 +190,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentCalfireCZU._id as string;
+      const departmentId = mock.departmentCalfireCZU._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -205,7 +204,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentCalfireCZU._id as string;
+      const departmentId = mock.departmentCalfireCZU._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -238,7 +237,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentCalfireLNU._id as string;
+      const departmentId = mock.departmentCalfireLNU._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -252,7 +251,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentCalfireLNU._id as string;
+      const departmentId = mock.departmentCalfireLNU._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -284,7 +283,7 @@ describe("index", function() {
 
     it("process stream through legacy", async function() {
       const department = mock.departmentClarkCounty;
-      const departmentId = department._id as string;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -299,7 +298,54 @@ describe("index", function() {
 
     it("process stream through correction", async function() {
       const department = mock.departmentClarkCounty;
-      const departmentId = department._id as string;
+      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;
+      }
+
+      const sut = await incidentProcessor.handleProcessIncidentRequestCorrection(streamItem.incidentNumber, department, atDate);
+      validateRulesResult(sut);
+    });
+  });
+
+  context("CONFIRE Regional Emergency Communications - San Bernardino County CA", function() {
+    const atDate = new Date();
+    const sampleIncidentNumber = "Confire-SB-0001";
+
+    function validateRulesResult(sut: HandleProcessIncidentRequestResult) {
+      if ("error" in sut) {
+        assert.fail(sut.error.toString());
+      } else {
+        const {
+          incident
+        } = sut;
+
+        assert.strictEqual(incident?.AgencyIncidentCallTypeDescription, "SHORTNESS OF BREATH (C3)");
+      }
+    }
+
+    it("process stream through legacy", async function() {
+      const department = mock.departmentConfire;
+      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;
+      }
+
+      const sut = await incidentProcessor.handleProcessIncidentRequestLegacy(streamItem, department, atDate);
+      validateRulesResult(sut);
+    });
+
+    it("process stream through correction", async function() {
+      const department = mock.departmentConfire;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -326,11 +372,11 @@ describe("index", function() {
         } = sut;
 
         assert.equal(incident?.AgencyIncidentCallTypeDescription, "Structure Fire - 2A", "Should match call type description");
-        const unitT13 = _.first((incident?.units ?? []).filter((u: CADUnit) => u.UnitID === "T13"));
+        const unitT13 = _.first((incident?.units ?? []).filter((u: CADUnitType) => u.UnitID === "T13"));
         assert.isObject(unitT13);
         assert.equal(unitT13?.AlarmAtDispatch, incident?.AlarmLevel);
 
-        const unitBC2 = _.first((incident?.units ?? []).filter((u: CADUnit) => u.UnitID === "BC2"));
+        const unitBC2 = _.first((incident?.units ?? []).filter((u: CADUnitType) => u.UnitID === "BC2"));
         assert.isObject(unitBC2);
         assert.equal(unitBC2?.AlarmAtDispatch, "1");
       }
@@ -338,7 +384,7 @@ describe("index", function() {
 
     it("process stream through legacy", async function() {
       const department = mock.departmentJacksonCountyTest;
-      const departmentId = department._id as string;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -353,7 +399,54 @@ describe("index", function() {
 
     it("process stream through correction", async function() {
       const department = mock.departmentJacksonCountyTest;
-      const departmentId = department._id as string;
+      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;
+      }
+
+      const sut = await incidentProcessor.handleProcessIncidentRequestCorrection(streamItem.incidentNumber, department, atDate);
+      validateRulesResult(sut);
+    });
+  });
+
+  context("Sacramento Regional Fire Communications Center", function() {
+    const atDate = new Date();
+    const sampleIncidentNumber = "Sacramento-SB-0001";
+
+    function validateRulesResult(sut: HandleProcessIncidentRequestResult) {
+      if ("error" in sut) {
+        assert.fail(sut.error.toString());
+      } else {
+        const {
+          incident
+        } = sut;
+
+        assert.strictEqual(incident?.AgencyIncidentCallTypeDescription, "C2 - PUBLIC ASSISTANCE");
+      }
+    }
+
+    it("process stream through legacy", async function() {
+      const department = mock.departmentSacramento;
+      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;
+      }
+
+      const sut = await incidentProcessor.handleProcessIncidentRequestLegacy(streamItem, department, atDate);
+      validateRulesResult(sut);
+    });
+
+    it("process stream through correction", async function() {
+      const department = mock.departmentSacramento;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -397,7 +490,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentSanMateoCounty._id as string;
+      const departmentId = mock.departmentSanMateoCounty._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -411,7 +504,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentSanMateoCounty._id as string;
+      const departmentId = mock.departmentSanMateoCounty._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -443,7 +536,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentSantaCruzRegional._id as string;
+      const departmentId = mock.departmentSantaCruzRegional._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -457,7 +550,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentSantaCruzRegional._id as string;
+      const departmentId = mock.departmentSantaCruzRegional._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -497,21 +590,19 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentSouthernMarin._id as string;
+      const departmentId = mock.departmentSouthernMarin._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
-
       if (!streamItem) {
         assert.fail("Expecting a stream item");
         return;
       }
-
       const sut = await incidentProcessor.handleProcessIncidentRequestLegacy(streamItem, mock.departmentSouthernMarin, atDate);
       validateRulesResult(sut);
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentSouthernMarin._id as string;
+      const departmentId = mock.departmentSouthernMarin._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -544,7 +635,7 @@ describe("index", function() {
     }
 
     it("process stream through legacy", async function() {
-      const departmentId = mock.departmentVerdugo._id as string;
+      const departmentId = mock.departmentVerdugo._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -558,7 +649,7 @@ describe("index", function() {
     });
 
     it("process stream through correction", async function() {
-      const departmentId = mock.departmentVerdugo._id as string;
+      const departmentId = mock.departmentVerdugo._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -590,7 +681,7 @@ describe("index", function() {
 
     it("process stream through legacy", async function() {
       const department = mock.departmentYolo;
-      const departmentId = department._id as string;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);
 
@@ -605,7 +696,7 @@ describe("index", function() {
 
     it("process stream through correction", async function() {
       const department = mock.departmentYolo;
-      const departmentId = department._id as string;
+      const departmentId = department._id.toString();
       const existingStreamItems = await mock.getIncidentStreamItems(departmentId, sampleIncidentNumber);
       const streamItem = _.first(existingStreamItems);