tabletcommand-backend-models 7.4.109 → 7.4.111

package/src/models/department.ts

@@ -57,6 +57,7 @@ import {
   ManagedIncidentModeItem,
   ManagedIncidentPriority,
   ManagedIncidentPriorityItem,
+  GMRConfigType,
   Mark43ConfigType,
   Mark43ProcessCommentConfigType,
   Mark43ProcessConfigType,
@@ -88,7 +89,7 @@ import {
 export interface Department extends DepartmentType, Record<string, unknown> {
 }
 
-export const Mark43StatusConfigDefault = {
+export const Mark43StatusConfigDefault: UnitStatusCodesConfigType = {
   TimeDispatched: ["D"],
   TimeEnroute: ["EN"],
   TimeStaged: ["ST"],
@@ -98,6 +99,16 @@ export const Mark43StatusConfigDefault = {
   TimeArrived: ["ATS", "A"],
 };
 
+export const GMRStatusConfigDefault: UnitStatusCodesConfigType = {
+  TimeDispatched: ["SentToVehicle"],
+  TimeEnroute: ["EnRouteToPickup"],
+  TimeStaged: [],
+  TimeCleared: ["Finished"],
+  TimeAtHospital: [],
+  TimeTransporting: [],
+  TimeArrived: ["ArrivedToPickup"],
+};
+
 export const IntterraFieldsDefault = [
   {
     key: "IncidentNumber",
@@ -280,6 +291,16 @@ export const Mark43ConfigDefault = {
   enabled: false,
 };
 
+export const GMRConfigDefault = {
+  baseUrl: "",
+  authToken: "",
+  apiToken: "",
+  enabled: false,
+  webhookSecret: "",
+  agencyId: "",
+  radioNamePrefixesToStrip: [],
+};
+
 export const WebhookConfigDefault = {
   enabled: false,
   bulkProcessingEnabled: false,
@@ -568,7 +589,7 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
   const WebhookConfig = WebhookSchema(mongoose);
   const WSFeedConfig = WSFeedSchema(mongoose);
 
-  const Mark43StatusConfig = new Schema<UnitStatusCodesConfigType>({
+  const UnitStatusCodesConfig = new Schema<UnitStatusCodesConfigType>({
     TimeDispatched: {
       type: [String],
       default: []
@@ -693,7 +714,7 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
       default: false,
     },
     unitStatusCodes: {
-      type: Mark43StatusConfig,
+      type: UnitStatusCodesConfig,
       default: Mark43StatusConfigDefault,
     },
     process: {
@@ -704,6 +725,44 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
     id: false,
   });
 
+  const GMRConfig = new Schema<GMRConfigType>({
+    baseUrl: {
+      type: String,
+      default: "",
+    },
+    authToken: {
+      type: String,
+      default: "",
+    },
+    apiToken: {
+      type: String,
+      default: "",
+    },
+    enabled: {
+      type: Boolean,
+      default: false,
+    },
+    unitStatusCodes: {
+      type: UnitStatusCodesConfig,
+      default: GMRStatusConfigDefault,
+    },
+    webhookSecret: {
+      type: String,
+      default: "",
+    },
+    agencyId: {
+      type: String,
+      default: "",
+    },
+    radioNamePrefixesToStrip: {
+      type: [String],
+      default: [],
+    },
+  }, {
+    _id: false,
+    id: false,
+  });
+
   const IntterraFields = new Schema<IntterraFieldsType>({
     key: {
       type: String,
@@ -2226,6 +2285,13 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
         type: Number,
         default: 45000,
       },
+      area: {
+        type: GeoPolygon,
+        default: {
+          type: "Polygon",
+          coordinates: [],
+        },
+      }
     },
     shareIncident: {
       enabled: {
@@ -2348,6 +2414,10 @@ export default async function DepartmentModule(mongoose: MongooseModule) {
       type: Mark43Config,
       default: Mark43ConfigDefault
     },
+    gmr: {
+      type: GMRConfig,
+      default: GMRConfigDefault
+    },
     webhook: {
       type: WebhookConfig,
       default: WebhookConfigDefault,

package/src/models/location.ts

@@ -11,7 +11,7 @@ import ColorModule from "./schema/color";
 import { GeoPointSchema } from "./schema/geojson";
 import { Model } from "mongoose";
 import { LocationType } from "../types/location";
-import { LocationVisibility } from "../constants";
+import { AccountIndustry, LocationVisibility } from "../constants";
 
 export interface Location extends LocationType, Record<string, unknown> { }
 
@@ -208,6 +208,11 @@ export default async function LocationModule(mongoose: MongooseModule) {
       type: Date,
     },
 
+    industry: {
+      type: String,
+      default: AccountIndustry.Fire,
+    },
+
     // combines .sendToCAD, .active, .shared as LocationVisibility[]
     visibility: {
       type: [String],
@@ -359,13 +364,27 @@ export default async function LocationModule(mongoose: MongooseModule) {
     shared: 1,
     modified: 1,
     movedAt: 1,
-    // departmentId: 1,
     locationGeoJSON: "2dsphere",
   }, {
     name: "shared_1_modified_1_movedAt_1_locationGeoJSON_2dsphere",
     "2dsphereIndexVersion": 3
   });
 
+  // Duplicate of the above, but also including industry
+  // Test in production, and if it's used, drop the above, keep this
+  // All indexes are populated manually
+  modelSchema.index({
+    // This seems to need to be the first position, otherwise the query plan selects the wrong index (?)
+    shared: 1,
+    industry: 1,
+    modified: 1,
+    movedAt: 1,
+    locationGeoJSON: "2dsphere",
+  }, {
+    name: "shared_1_industry_1_modified_1_movedAt_1_locationGeoJSON_2dsphere",
+    "2dsphereIndexVersion": 3
+  });
+
   // Expire data after 45d
   modelSchema.index({
     movedAt: -1,

package/src/models/managed-incident.ts

@@ -14,6 +14,7 @@ import {
   SharedSourceSchema,
   SharedToSchema,
 } from "./schema/common-incident";
+import { GeoPointSchema } from "./schema/geojson";
 import { Model } from "mongoose";
 import {
   HistoryItemType,
@@ -34,6 +35,7 @@ export default async function ManagedIncidentModule(mongoose: MongooseModule) {
   const CADPerson = CADPersonSchema(mongoose);
   const Caller = CallerSchema(mongoose);
   const FilterLabel = IncidentFilterLabelSchema(mongoose);
+  const GeoPoint = GeoPointSchema(mongoose);
   const RadioChannel = RadioChannelSchema(mongoose);
   const RecordValue = RecordSchema(mongoose);
   const ReportNumber = ReportNumberSchema(mongoose);
@@ -470,6 +472,10 @@ export default async function ManagedIncidentModule(mongoose: MongooseModule) {
     CallerNumber: String,
     CommandChannel: String,
     CommonPlaceName: String,
+    coordinate: {
+      type: GeoPoint,
+      default: null,
+    },
     cross_streets: String,
     deviceTime: {
       type: String,

package/src/test/mock.ts

@@ -841,6 +841,10 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       opAreaCode: "DAL",
       opAreaName: "Delta Operations",
       fadeZoomLevel: 1,
+      area: {
+        type: "Polygon",
+        coordinates: [],
+      },
     },
     shareLocationPhones: false,
     shareLocationTablets: true,

package/src/types/department.ts

@@ -155,6 +155,17 @@ export interface Mark43ConfigType {
   process: Mark43ProcessConfigType
 }
 
+export interface GMRConfigType {
+  baseUrl: string,
+  authToken: string,
+  apiToken: string,
+  enabled: boolean,
+  unitStatusCodes: UnitStatusCodesConfigType,
+  webhookSecret: string,
+  agencyId: string,
+  radioNamePrefixesToStrip: string[],
+}
+
 export interface IntterraFieldsType {
   key: string,
   value: string,
@@ -537,6 +548,9 @@ export type AccountConfigurationShareAVL = {
   opAreaName: string,
   opAreaCode: string,
   fadeZoomLevel: number,
+  // When sharing location, only view what's in this area
+  // GeoPolygon should already support multiple area (rings)
+  area: GeoPolygon,
 };
 
 export type AccountConfigurationShareIncident = {
@@ -669,6 +683,7 @@ export interface DepartmentType {
   managedIncidentMode: ManagedIncidentMode,
   managedIncidentPriority: ManagedIncidentPriority,
   mark43: Mark43ConfigType,
+  gmr: GMRConfigType,
   minPasswordLength: number,
   modified_unix_date: number,
   modified: Date,

package/src/types/location.ts

@@ -1,6 +1,7 @@
 import { Types } from "mongoose";
 import { ColorSchemaType } from "./color";
 import { GeoPoint } from "./geojson";
+import { AccountIndustry } from "../constants";
 
 export interface LocationType {
   _id: Types.ObjectId,
@@ -16,6 +17,7 @@ export interface LocationType {
   device_type: string,
   esriId: number,
   heading: number,
+  industry: AccountIndustry,
   kindType: string,
   kind?: string,
   type?: string,

package/src/types/managed-incident.ts

@@ -9,6 +9,7 @@ import {
   SharedSourceSchemaType,
   SharedToSchemaType,
 } from "./common-incident";
+import { GeoPoint } from "./geojson";
 
 export interface HistoryItemType extends Record<string, unknown> {
   entity_id: string,
@@ -135,6 +136,7 @@ export interface ManagedIncidentType {
   channel: string,
   channel_owner: string,
   checklists: IncidentChecklistType[]
+  coordinate?: GeoPoint, // Set only if coordinate is valid, not 0,0 and inside bounds
   cross_streets: string,
   departmentId: string,
   deviceTime: string,

package/gulpfile.js

@@ -1,24 +0,0 @@
-const gulp = require("gulp");
-const exec = require("gulp-execa");
-const { deleteAsync } = require("del");
-
-gulp.task("clean", function cleanTask() {
-  return deleteAsync([
-    "build/**",
-    "definitions/**",
-  ], {
-    force: true
-  });
-});
-
-gulp.task("build", gulp.series("clean", exec.task("tsc -p src")));
-
-gulp.task("lint", exec.task("eslint src"));
-
-gulp.task("test", exec.task("tsx --test --test-concurrency=1 --test-reporter=spec src/test/*.ts"));
-
-gulp.task("spell", exec.task("cspell --no-progress"));
-
-gulp.task("type-coverage", exec.task("type-coverage --detail"));
-
-gulp.task("default", gulp.series("spell", "type-coverage", "lint", "build", "test"));