tabletcommand-incident 0.4.16 → 0.5.0

package/src/domain.ts

@@ -8,22 +8,16 @@ import {
   PersonnelImport,
 } from "tabletcommand-backend-models";
 
-import mongoose from "mongoose";
-
 const debug = debug_module("tabletcommand-incident:domain");
 
 import { promisify } from "util";
 
 const sleep = promisify(setTimeout);
 
-import {
-  CADComment,
-  CADPerson,
-  CADRadioChannel,
-  CADUnit,
-} from "./types";
+import { CADPersonSchemaType, RadioChannelSchemaType } from "tabletcommand-backend-models/definitions/types/shared-incident";
+import { CADCommentType, CADUnitType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
-function uniquePersonnel(personnel: Partial<CADPerson>[], person: Partial<CADPerson>) {
+function uniquePersonnel(personnel: Partial<CADPersonSchemaType>[], person: Partial<CADPersonSchemaType>) {
   if (!_.isArray(personnel)) {
     return personnel;
   }
@@ -39,11 +33,11 @@ function uniquePersonnel(personnel: Partial<CADPerson>[], person: Partial<CADPer
     }
     return shouldAddItem;
   });
-  return filtered as CADPerson[]; // Temporarily from Partial<>[]
+  return filtered as CADPersonSchemaType[]; // Temporarily from Partial<>[]
 }
 
-function mergePersonnel(units: CADUnit[], personnel: Partial<PersonnelImport>[], time: number): CADUnit[] {
-  let mappedUnits: CADUnit[] = [];
+function mergePersonnel(units: CADUnitType[], personnel: Partial<PersonnelImport>[], time: number): CADUnitType[] {
+  let mappedUnits: CADUnitType[] = [];
   if (_.isArray(units)) {
     mappedUnits = _.map(units, function(item) {
       if (!_.isArray(item.Personnel)) {
@@ -54,7 +48,7 @@ function mergePersonnel(units: CADUnit[], personnel: Partial<PersonnelImport>[],
     });
   }
 
-  const unitMap: Record<string, CADUnit[]> = {};
+  const unitMap: Record<string, CADUnitType[]> = {};
   const unitIDs: string[] = [];
   const unitUniqueMap = _.keyBy(mappedUnits, (unit) => {
     return unit.UnitID + unit.UnitDispatchNumber;
@@ -114,7 +108,7 @@ function mergePersonnel(units: CADUnit[], personnel: Partial<PersonnelImport>[],
     });
   });
   const unitArrayValues = _.values(unitMap);
-  const revisedUnits: CADUnit[] = ([] as CADUnit[]).concat(...unitArrayValues);
+  const revisedUnits: CADUnitType[] = ([] as CADUnitType[]).concat(...unitArrayValues);
   return revisedUnits;
 }
 
@@ -123,7 +117,7 @@ function ignoreCheck(incident: Partial<CADIncident>) {
   return result;
 }
 
-function radioNames(units: Partial<CADUnit>[]): string[] {
+function radioNames(units: Partial<CADUnitType>[]): string[] {
   const radioNames: string[] = [];
   if (!_.isArray(units)) {
     return radioNames;
@@ -186,15 +180,15 @@ function mergeIncidentsV3(nextUpdates: Partial<CADIncident>[], previous: Partial
         }
 
         if (key === "units") {
-          const subItems = _.flatten([accItems as CADUnit[], valueItems as CADUnit[]]);
+          const subItems = _.flatten([accItems as CADUnitType[], valueItems as CADUnitType[]]);
           acc[key] = mergeUnitsV3(subItems);
         } else if (key === "Comment") {
-          const unionCommentItems = _.union(accItems as CADComment[], valueItems as CADComment[]);
+          const unionCommentItems = _.union(accItems as CADCommentType[], valueItems as CADCommentType[]);
           acc[key] = mergeCommentsV3(unionCommentItems);
         } else if (key === "PriorIncident") { // Handled already
         } else if (key === "radioChannels") {
           // overwrite radioChannels with latest update always
-          acc[key] = valueItems as CADRadioChannel[];
+          acc[key] = valueItems as RadioChannelSchemaType[];
         } else {
           // Handles other array types, like notifications
           const unionItems = _.union(accItems as Record<string, unknown>[], valueItems as Record<string, unknown>[]);
@@ -223,7 +217,7 @@ function mergeIncidentsV3(nextUpdates: Partial<CADIncident>[], previous: Partial
   return itemCopy;
 }
 
-function mergeUnitsV3(items: CADUnit[]): CADUnit[] {
+function mergeUnitsV3(items: CADUnitType[]): CADUnitType[] {
   if (!_.isArray(items) || _.size(items) === 0) {
     return [];
   }
@@ -233,7 +227,7 @@ function mergeUnitsV3(items: CADUnit[]): CADUnit[] {
       (_.isString(item.UnitID) || _.isNumber(item.UnitID));
   });
 
-  const mapAcc: Record<string, CADUnit> = {};
+  const mapAcc: Record<string, CADUnitType> = {};
   const itemsMap = _.reduce(filteredItems, function(memo, item) {
     const key = `${item.UnitID}-${item.UnitDispatchNumber}`;
     if (!_.has(memo, key)) {
@@ -252,7 +246,7 @@ function mergeUnitsV3(items: CADUnit[]): CADUnit[] {
   return _.values(itemsMap);
 }
 
-function mergeCommentsV3(items: CADComment[]) {
+function mergeCommentsV3(items: CADCommentType[]) {
   // Keys defined in models
   const allowedCommentKeys = [
     "Comment",
@@ -261,7 +255,7 @@ function mergeCommentsV3(items: CADComment[]) {
     "CommentSource",
   ];
   debug(`mergeComments: ${JSON.stringify(items)}`);
-  function ourComment(c: Partial<CADComment>) {
+  function ourComment(c: Partial<CADCommentType>) {
     return _.isString(c.CommentSource) && _.trim(c.CommentSource) === "TC";
   }
 
@@ -324,8 +318,9 @@ function enforceMandatoryFields(incidentIn: Partial<CADIncident>): Partial<CADIn
   } else if (_.isString(incident.expiration_date) && moment(incident.expiration_date, true).isValid()) {
     resolvedExpirationDate = moment(incident.expiration_date, true).toDate();
   }
-  incident.expiration_date = _.isDate(resolvedExpirationDate) ? resolvedExpirationDate.toISOString() : "";
-
+  if (_.isDate(resolvedExpirationDate)) {
+    incident.expiration_date = resolvedExpirationDate;
+  }
   // Set default simulation/notify/rts fields
   if (!_.isBoolean(incident.simulation)) {
     incident.simulation = false;
@@ -364,19 +359,16 @@ function updateWithUUIDAndDepartment(itemIn: Partial<CADIncident>, department: P
   }
 
   if (!_.isString(item.departmentId) || item.departmentId === "") {
-    item.departmentId = (department._id as mongoose.Types.ObjectId).toString();
+    item.departmentId = department._id?.toString();
     item.sharedSource = {
       name: department.department ?? "",
       isExternal: false,
       reasons: [],
-      // Currently unused, present to silence Typescript
-      startAt: "",
-      expireAt: "",
     };
   }
 
   // Always update modified_date
-  item.modified = atDate.toISOString();
+  item.modified = atDate;
   item.modified_date = moment(atDate).utc().format("YYYY-MM-DDTHH:mm:ss.SSS");
   item.modified_unix_date = atDate.valueOf() / 1000.0;
 
@@ -394,12 +386,12 @@ function mergeIncidentsV1(current: Partial<CADIncident>, previous: Partial<CADIn
   const item: Partial<CADIncident> = _.reduce(items, function(acc, other) {
     // Rename "Unit" key to "units"
     if (_.has(acc, "Unit") && _.isArray(acc.Unit)) {
-      acc.units = _.clone(acc.Unit) as CADUnit[];
+      acc.units = _.clone(acc.Unit) as CADUnitType[];
       delete acc.Unit;
     }
 
     if (_.has(other, "Unit") && _.isArray(other.Unit)) {
-      other.units = _.clone(other.Unit) as CADUnit[];
+      other.units = _.clone(other.Unit) as CADUnitType[];
       delete other.Unit;
     }
 
@@ -430,15 +422,15 @@ function mergeIncidentsV1(current: Partial<CADIncident>, previous: Partial<CADIn
           }
 
           if (key === "units") {
-            const subItems = _.flatten([accItems as CADUnit[], valueItems as CADUnit[]]);
+            const subItems = _.flatten([accItems as CADUnitType[], valueItems as CADUnitType[]]);
             acc[key] = mergeUnitsV1(subItems);
           } else if (key === "Comment") {
-            const unionCommentItems = _.union(accItems as CADComment[], valueItems as CADComment[]);
+            const unionCommentItems = _.union(accItems as CADCommentType[], valueItems as CADCommentType[]);
             acc[key] = mergeCommentsV1(unionCommentItems);
           } else if (key === "PriorIncident") { // Handled already
           } else if (key === "radioChannels") {
             // overwrite radioChannels with latest update always
-            acc[key] = valueItems as CADRadioChannel[];
+            acc[key] = valueItems as RadioChannelSchemaType[];
           } else if (key === "simulationSequences") {
             // overwrite simulationSequences with latest update always
             acc[key] = valueItems as number[];
@@ -467,7 +459,7 @@ function mergeIncidentsV1(current: Partial<CADIncident>, previous: Partial<CADIn
   return itemCopy;
 }
 
-function mergeUnitsV1(items: CADUnit[]): CADUnit[] {
+function mergeUnitsV1(items: CADUnitType[]): CADUnitType[] {
   if (!_.isArray(items) || _.size(items) === 0) {
     return [];
   }
@@ -490,12 +482,12 @@ function mergeUnitsV1(items: CADUnit[]): CADUnit[] {
     }
 
     return memo;
-  }, {} as Record<string, CADUnit>);
+  }, {} as Record<string, CADUnitType>);
 
   return _.values(itemsMap);
 }
 
-function mergeCommentsV1(items: CADComment[]) {
+function mergeCommentsV1(items: CADCommentType[]) {
   // Keys defined in models
   const allowedCommentKeys = [
     "Comment",
@@ -504,7 +496,7 @@ function mergeCommentsV1(items: CADComment[]) {
     "CommentSource",
   ];
   debug(`mergeComments: ${JSON.stringify(items)}`);
-  function ourComment(c: Partial<CADComment>) {
+  function ourComment(c: Partial<CADCommentType>) {
     return _.isString(c.CommentSource) && _.trim(c.CommentSource) === "TC";
   }
 

package/src/incidentProcessor.ts

@@ -1,6 +1,5 @@
 import debug_module from "debug";
 import _ from "lodash";
-import mongoose from "mongoose";
 
 import * as Sentry from "@sentry/node";
 
@@ -52,7 +51,7 @@ export default function incidentProcessorLib({
   }
 
   async function handleProcessIncidentRequestLegacy(streamItem: CADIncidentStream, department: Partial<Department>, atDate: Date): Promise<HandleProcessIncidentRequestResult> {
-    const departmentId: string = (department._id as mongoose.Types.ObjectId).toString();
+    const departmentId: string = department._id?.toString() ?? "";
     const incident = _.cloneDeep(streamItem.payload) as Partial<CADIncident>;
     const incidentTypes = department.incidentTypes || [];
 
@@ -111,7 +110,7 @@ export default function incidentProcessorLib({
   }
 
   async function handleProcessIncidentRequestCorrection(incidentNumber: string, department: Partial<Department>, atDate: Date): Promise<HandleProcessIncidentRequestResult> {
-    const departmentId: string = (department._id as mongoose.Types.ObjectId).toString();
+    const departmentId: string = department._id?.toString() ?? "";
     // Attempt to fix race condition where
     const randomSeconds = Math.random() * 10 * 1000; // Between ~0 and ~9 seconds
     const streamDate = new Date(atDate.valueOf() + randomSeconds);
@@ -132,13 +131,13 @@ export default function incidentProcessorLib({
   }
 
   async function processIncidentRequestsV3(streamItems: CADIncidentStream[], department: Partial<Department>, atDate: Date, attemptsLeft = 7): Promise<{ error: Error } | { incident: CADIncident | null }> {
-    const departmentId: string = (department._id as mongoose.Types.ObjectId).toString();
+    const departmentId: string = department._id?.toString() ?? "";
     const incidentTypes = department.incidentTypes || [];
 
     let result: { error: Error } | { incident: CADIncident | null } = { incident: null };
 
     const streamItemsText = streamItems.map((x: CADIncidentStream) => {
-      return `${(x._id as mongoose.Types.ObjectId).toString()}: ${x.incidentNumber}`;
+      return `${(x._id).toString()}: ${x.incidentNumber}`;
     }).join(", ");
 
     if (attemptsLeft === 0) {
@@ -185,13 +184,13 @@ export default function incidentProcessorLib({
 
     // Append Personnel
     const mergedItemWithPersonnel = await applyPersonnel(departmentId, mergedItemWithDept, atDate);
-
+    const mergedItemWithPersonnelModel = await store.convertItemWithPersonnelToModel(mergedItemWithPersonnel);
     await artificialDelay?.afterApplyPersonnel?.();
 
     try {
       // as CADIncident to silence Partial<> messing with .validate()
       debug("CADIncident.validate()");
-      await (mergedItemWithPersonnel as CADIncident).validate();
+      await mergedItemWithPersonnelModel.validate();
     } catch (error: unknown) {
       return {
         error: error as Error,
@@ -201,14 +200,14 @@ export default function incidentProcessorLib({
     try {
       debug("CADIncident.save()");
       // as CADIncident to silence Partial<> messing with .save()
-      await (mergedItemWithPersonnel as CADIncident).save();
+      await mergedItemWithPersonnelModel.save();
       result = {
-        incident: mergedItemWithPersonnel as CADIncident,
+        incident: mergedItemWithPersonnelModel,
       };
     } catch (error: unknown) {
       // Sleep between 50 and 800 ms, Necessary mostly for running parallel tests
       const randomSleepMS = Math.random() * (800 - 50) + 50;
-      console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${mergedItemWithPersonnel.departmentId} ${mergedItemWithPersonnel.IncidentNumber} v${mergedItemWithPersonnel.__v}`);
+      console.log(`retry after w/${randomSleepMS}ms... ${department.department} ${mergedItemWithPersonnelModel.departmentId} ${mergedItemWithPersonnelModel.IncidentNumber} v${mergedItemWithPersonnelModel.__v}`);
       await domain.sleep(randomSleepMS);
 
       // Most of the times, this happens when trying to insert a document with the same unique key

package/src/ruleProcessorLegacy.js

@@ -45,7 +45,7 @@ function ruleProcessor(incident, department) {
     return;
   }
 
-  const departmentId = department._id;
+  const departmentId = department._id.toString();
 
   const rule = {};
   // Cleanup Null values

package/src/rules/clean-up-comments.ts

@@ -3,11 +3,11 @@ 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 interface CleanUpFilter {
   name: string;
-  clean(items: Partial<CADComment>[]): Partial<CADComment>[];
+  clean(items: Partial<CADCommentType>[]): Partial<CADCommentType>[];
 }
 
 export class IncidentRuleCleanUpComments implements IncidentRule {
@@ -17,7 +17,7 @@ export class IncidentRuleCleanUpComments implements IncidentRule {
   changes: IncidentRuleChange[] = [];
   filter: CleanUpFilter = {
     name: "No Filter",
-    clean(items: Partial<CADComment>[]) {
+    clean(items: Partial<CADCommentType>[]) {
       return items;
     }
   };
@@ -32,7 +32,7 @@ export class IncidentRuleCleanUpComments implements IncidentRule {
       return item;
     }
 
-    const cleanComments = this.filter.clean(item.Comment as Partial<CADComment>[]);
+    const cleanComments = this.filter.clean(item.Comment as Partial<CADCommentType>[]);
     const ruleMatched = item.Comment?.length > cleanComments.length;
     if (ruleMatched) {
       item.Comment = cleanComments as never; // Mongoose/Typescript mismatch
@@ -56,7 +56,7 @@ export class IncidentRuleCleanUpComments implements IncidentRule {
 
 export const cleanUpFilterMissingDates: CleanUpFilter = {
   name: "Clean Up Missing Dates",
-  clean: function(items: Partial<CADComment>[]): Partial<CADComment>[] {
+  clean: function(items: Partial<CADCommentType>[]): Partial<CADCommentType>[] {
     if (!_.isArray(items)) {
       return items;
     }
@@ -64,7 +64,7 @@ export const cleanUpFilterMissingDates: CleanUpFilter = {
     const atDate = new Date("2000-01-02T03:04:05.678Z");
     const fallbackDate = moment(atDate).tz("America/Los_Angeles").format("YYYY-MM-DDTHH:mm:ssZZ");
 
-    const clean: Partial<CADComment>[] = [];
+    const clean: Partial<CADCommentType>[] = [];
     _.forEach(items, (c) => {
       if (!_.isObject(c)) {
         return;
@@ -82,7 +82,7 @@ export const cleanUpFilterMissingDates: CleanUpFilter = {
 
 export const cleanUpTorrance: CleanUpFilter = {
   name: "Clean Up Torrance",
-  clean: function(items: Partial<CADComment>[]): Partial<CADComment>[] {
+  clean: function(items: Partial<CADCommentType>[]): Partial<CADCommentType>[] {
     return items.filter((c) => {
       if (_.isObject(c) && _.isString(c.Comment) && c.Comment.match(/^\s*State.Response:/)) {
         return false;
@@ -94,12 +94,12 @@ export const cleanUpTorrance: CleanUpFilter = {
 
 export const cleanUpWhitby: CleanUpFilter = {
   name: "Clean Up Whitby",
-  clean: function(items: Partial<CADComment>[]): Partial<CADComment>[] {
+  clean: function(items: Partial<CADCommentType>[]): Partial<CADCommentType>[] {
     if (!_.isArray(items)) {
       return items;
     }
 
-    const clean: Partial<CADComment>[] = [];
+    const clean: Partial<CADCommentType>[] = [];
     _.forEach(items, (c) => {
       if (!_.isObject(c)) {
         return;

package/src/rules/close-incident-after-hours.ts

@@ -26,7 +26,7 @@ export class IncidentRuleCloseIncidentAfterHours implements IncidentRule {
     this.changed = true;
 
     const closeDate = moment(atDate).utc().add(this.hoursDelay, "hours");
-    item.expiration_date = closeDate.toDate() as unknown as string;
+    item.expiration_date = closeDate.toDate();
 
     this.changes.push({
       name: this.name,

package/src/rules/close-incident-matching-incident-number.ts

@@ -17,11 +17,11 @@ export class IncidentRuleCloseMatchingIncidentNumber implements IncidentRule {
   changed = false;
   changes: IncidentRuleChange[] = [];
 
-  ignoreMatching: (RegExp|string)[] = [];
+  ignoreMatching: (RegExp | string)[] = [];
   skipMatching: AllowMatching[] = [];
   secondsDelay = 0;
 
-  constructor(ignoreMatching: (RegExp|string)[], skipMatching: AllowMatching[], seconds: number) {
+  constructor(ignoreMatching: (RegExp | string)[], skipMatching: AllowMatching[], seconds: number) {
     this.ignoreMatching = ignoreMatching;
     this.skipMatching = skipMatching;
     this.secondsDelay = seconds;
@@ -60,7 +60,7 @@ export class IncidentRuleCloseMatchingIncidentNumber implements IncidentRule {
         item.ClosedDateTime = closeDate.format("YYYY-MM-DDTHH:mm:ssZZ");
         item.closed_unix_date = closeDate.valueOf() / 1000.0;
       }
-      item.expiration_date = closeDate.toDate() as unknown as string;
+      item.expiration_date = closeDate.toDate();
     }
     this.changed = ruleMatched;
     this.matched = ruleMatched;

package/src/rules/close-incident-of-certain-type.ts

@@ -34,7 +34,7 @@ export class IncidentRuleCloseIncidentOfCertainType implements IncidentRule {
     this.changed = true;
 
     const closeDate = moment(atDate).utc().add(this.secondsDelay, "seconds");
-    item.expiration_date = closeDate.toDate() as unknown as string;
+    item.expiration_date = closeDate.toDate();
 
     if (this.secondsDelay <= 0) {
       item.closed_unix_date = atDate.valueOf() / 1000.0;

package/src/rules/copy-incident-number.ts

@@ -2,8 +2,8 @@ import _ from "lodash";
 import moment from "moment-timezone";
 
 import { CADIncident } from "tabletcommand-backend-models";
-import { CADComment } from "../types";
 import { IncidentRule, IncidentRuleChange } from ".";
+import { CADCommentType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleCopyIncidentNumber implements IncidentRule {
   name = "Copy Incident Number";
@@ -22,7 +22,7 @@ export class IncidentRuleCopyIncidentNumber implements IncidentRule {
 
     this.matched = true;
     this.changed = true;
-    const extraComment: Partial<CADComment> = {
+    const extraComment: Partial<CADCommentType> = {
       Comment: `TC Incident Number: ${_.trim(item.IncidentNumber)}`,
       CommentDateTime: moment(atDate).format("YYYY-MM-DDTHH:mm:ssZZ"),
       CommentSource: "TC",

package/src/rules/copy-location-comment.ts

@@ -2,8 +2,8 @@ import _ from "lodash";
 import moment from "moment-timezone";
 
 import { CADIncident } from "tabletcommand-backend-models";
-import { CADComment } from "../types";
 import { IncidentRule, IncidentRuleChange } from ".";
+import { CADCommentType } from "tabletcommand-backend-models/definitions/types/cad-incident";
 
 export class IncidentRuleCopyLocationComment implements IncidentRule {
   name = "Copy Location Comment";
@@ -22,7 +22,7 @@ export class IncidentRuleCopyLocationComment implements IncidentRule {
 
     this.matched = true;
     this.changed = true;
-    const extraComment: Partial<CADComment> = {
+    const extraComment: Partial<CADCommentType> = {
       Comment: `Location Comment: ${_.trim(item.LocationComment)}`,
       CommentDateTime: moment(atDate).format("YYYY-MM-DDTHH:mm:ssZZ"),
       CommentSource: "TC",
@@ -31,7 +31,7 @@ export class IncidentRuleCopyLocationComment implements IncidentRule {
     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/index.ts

@@ -1,4 +1,3 @@
-import mongoose from "mongoose";
 import { CADIncident, Department } from "tabletcommand-backend-models";
 
 export interface IncidentRuleChange {
@@ -59,7 +58,7 @@ import {
 
 export function rulesForDepartment(department: Partial<Department>): IncidentRule[] {
   const items: IncidentRule[] = [];
-  const departmentId: string = (department._id as mongoose.Types.ObjectId).toString() ?? "";
+  const departmentId: string = department._id?.toString() ?? "";
 
   // City of Ontario, production testing, testing
   if (departmentId === "61573ce72b3395e12228833e" || departmentId === "6573a7ec11c628d37734e39f" || departmentId === "646e81a459fcdd03372b5a2e") {

package/src/rules/map-unit-dates-verdugo.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 IncidentRuleMapUnitDatesVerdugo implements IncidentRule {
   name = "Map Unit Dates Verdugo";
@@ -20,8 +20,8 @@ export class IncidentRuleMapUnitDatesVerdugo implements IncidentRule {
       return item;
     }
 
-    const tempUnits: CADUnit[] = [];
-    _.each(item.Unit as CADUnit[], function(value: CADUnit) {
+    const tempUnits: CADUnitType[] = [];
+    _.each(item.Unit as CADUnitType[], function(value) {
       if (!_.isObject(value)) {
         return;
       }

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,