tabletcommand-backend-models 7.4.60 → 7.4.62

package/src/test/mock.ts

@@ -13,6 +13,7 @@ import { CADIncident } from "../models/cad-incident";
 import { Department } from "../models/department";
 import { GlobalSettingsType } from "../types/global-settings";
 import { IncidentFilter } from "models/incident-filter";
+import { IncidentNotified } from "../models/incident-notified";
 import { Location } from "../models/location";
 import { ManagedIncident } from "../models/managed-incident";
 import { SAML } from "../models/saml";
@@ -699,7 +700,8 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
 
   const department: Partial<Department> = {
     _id: new mongoose.Types.ObjectId(),
-    department: "Test Department",
+    accountType: "production",
+    active: true,
     addressDetails: {
       city: "San Francisco",
       address: "",
@@ -707,50 +709,86 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       zipCode: "",
       country: "",
     },
-    active: true,
-    apikey: "abcd",
-    partialApiKey: "ab",
-    personnelStaffingEnabled: true,
-    rtsEnabled: true,
-    rtsChannelPrefix: "CH_TEST",
-    pubNubV3: {
-      token: "CH_AUTH_TOKEN",
-      expireAt: new Date("2021-09-10T23:25:02.196Z"),
-      runAt: new Date("2021-09-10T08:25:02.196Z"),
-      env: "qa",
-    },
     agencyIds: [
       new mongoose.Types.ObjectId(agency._id)
     ],
-    signupKey: "A1B2",
-    incidentTypes: [{
-      name: "Type",
-      value: "type",
-      allowPartialMatch: true,
-      callTypeDescription: [],
-      callType: [],
-    }],
-    shareLocationPhones: false,
-    shareLocationTablets: true,
+    apikey: "abcd",
     cadOneWayVehiclesEnabled: false,
-    mowsEnabled: true,
-    shareAVL: {
+    callerLocation: {
       enabled: true,
-      opAreaCode: "DAL",
-      opAreaName: "Delta Operations",
-      fadeZoomLevel: 1,
+      resolvers: [
+        {
+          type: AccountCallerType.Dummy,
+          opts: {},
+        }
+      ]
+    },
+    customButtons: [
+      {
+        name: "Button Custom",
+        url: "",
+        order: 1,
+        allowExternal: false,
+        defaultExternal: false,
+        allowFloating: false,
+        color: {
+          background: "#512e5f",
+          text: "#F8F9F9"
+        }
+      }
+    ],
+    department: "Test Department",
+    externalNotificationsEnabled: true,
+    fireMapper: {
+      enabled: true,
+      auth: {
+        username: "fm-user",
+        apiKeyManagement: {
+          iv: "iv-mgm",
+          encryptedData: "encrypted-nt",
+        },
+        apiKeyReadOnly: {
+          iv: "iv-read-only",
+          encryptedData: "encrypted-read-only",
+        },
+        licenseCode: {
+          iv: "iv-license",
+          encryptedData: "encrypted-license",
+        },
+      },
+      host: "",
+      layer: [
+        {
+          pathname: "/a/b/c",
+          name: "abc",
+        },
+      ],
+      layerRefreshInterval: 10,
+      proLicenseCount: 20,
+      staticLayer: [
+        {
+          uuid: "u1",
+          layer: [
+            {
+              name: "sa",
+              pathname: "s/a/b",
+            }
+          ]
+        }
+      ],
     },
-    accountType: "production",
-    timeZone: "America/Los_Angeles",
     firstArrivingEnabled: true,
     firstArriving: {
       token: "123",
       apiUrl: "",
     },
-    simpleSenseEnabled: true,
-    simpleSense: {
-      token: "123"
-    },
+    incidentTypes: [{
+      name: "Type",
+      value: "type",
+      allowPartialMatch: true,
+      callTypeDescription: [],
+      callType: [],
+    }],
     licensing: {
       tcPro2Way: 0,
       tcPro1Way: 0,
@@ -760,16 +798,21 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       sendToCAD: 0,
       tcStreams: 0,
     },
-    webDisclaimer: {
-      message: "test",
-      enabled: true
-    },
+    mowsEnabled: true,
     notificationEmails: ["test@test.com"],
-    externalNotificationsEnabled: true,
     orientationMarkerColor: {
       text: "a",
       background: "b",
     },
+    partialApiKey: "ab",
+    personnelStaffingEnabled: true,
+    pubNubV3: {
+      token: "CH_AUTH_TOKEN",
+      expireAt: new Date("2021-09-10T23:25:02.196Z"),
+      runAt: new Date("2021-09-10T08:25:02.196Z"),
+      env: "qa",
+    },
+    reportNumberEnabled: true,
     restrictedComments: {
       enabled: false,
       callTypesAllowed: [],
@@ -777,35 +820,31 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       restrictedFields: [],
       restrictedMessage: "Restricted Message"
     },
-    customButtons: [
-      {
-        name: "Button Custom",
-        url: "",
-        order: 1,
-        allowExternal: false,
-        defaultExternal: false,
-        allowFloating: false,
-        color: {
-          background: "#512e5f",
-          text: "#F8F9F9"
-        }
-      }
-    ],
-    reportNumberEnabled: true,
+    rtsEnabled: true,
+    rtsChannelPrefix: "CH_TEST",
     samsara: {
       enabled: false,
       token: "",
     },
-    reportOdometer: "status",
-    callerLocation: {
+    shareAVL: {
       enabled: true,
-      resolvers: [
-        {
-          type: AccountCallerType.Dummy,
-          opts: {},
-        }
-      ]
-    }
+      opAreaCode: "DAL",
+      opAreaName: "Delta Operations",
+      fadeZoomLevel: 1,
+    },
+    shareLocationPhones: false,
+    shareLocationTablets: true,
+    signupKey: "A1B2",
+    simpleSenseEnabled: true,
+    simpleSense: {
+      token: "123"
+    },
+    reportOdometer: "status",
+    timeZone: "America/Los_Angeles",
+    webDisclaimer: {
+      message: "test",
+      enabled: true
+    },
   };
 
   const esriMap = {
@@ -1030,16 +1069,14 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     request_time: 1442888560
   };
 
-  const incidentNotified = {
+  const incidentNotified: Partial<IncidentNotified> = {
     _id: new mongoose.Types.ObjectId(),
     departmentId: "d123",
+    sourceDepartmentId: "d321",
     IncidentNumber: "T-1536603902",
     incidentTypes: [
       "any"
     ],
-    units: [
-      "E31"
-    ],
     unitsByDispatch: [
       {
         UnitID: "E31",

package/src/types/department.ts

@@ -1,6 +1,6 @@
 import { Types } from "mongoose";
 import { ColorSchemaType } from "./color";
-import { FireMapperAuthType } from "./firemapper-auth";
+import { FireMapperAuthV2Type } from "./firemapper-auth";
 import { PubNubTokenSchemaType } from "./pubnub-token";
 import {
   AccountCallerType,
@@ -310,12 +310,12 @@ export interface USFTConfigurationType {
 
 export interface FireMapperConfigurationType {
   enabled: boolean,
-  layerRefreshInterval: number,
-  proLicenseCount: number,
+  auth: FireMapperAuthV2Type,
   host: string,
   layer: FireMapperLayerType[],
+  layerRefreshInterval: number,
+  proLicenseCount: number,
   staticLayer: FireMapperOutlineType[],
-  auth: FireMapperAuthType,
 }
 
 export interface LicensingType {

package/src/types/firemapper-auth.ts

@@ -5,3 +5,13 @@ export interface FireMapperAuthType {
   encrypted: EncryptedDataType,
   encryptedAccessCode: EncryptedDataType,
 }
+
+export interface FireMapperAuthV2Type {
+  username: string,
+  // used by backend to create FM incidents
+  apiKeyManagement: EncryptedDataType | undefined,
+  // used by the iOS maps, and backend to check if map is active
+  apiKeyReadOnly: EncryptedDataType | undefined,
+  // used by the iOS link to
+  licenseCode: EncryptedDataType | undefined,
+}

package/src/types/incident-events.ts

@@ -43,9 +43,9 @@ export interface UnitType {
 export interface IncidentNotifiedType {
   _id: Types.ObjectId,
   departmentId: string,
+  sourceDepartmentId: string,
   IncidentNumber: string,
   incidentTypes: string[],
-  units: string[],
   unitsByDispatch: UnitType[],
   sent: SentItemType[],
   updated: Date,