tabletcommand-backend-models 7.4.75 → 7.4.77

package/src/models/esri.ts

@@ -6,9 +6,6 @@ import {
 import EsriAuthModule from "./schema/esri-auth";
 import EsriErrorModule from "./schema/esri-error";
 import EsriMapModule from "./schema/esri-map";
-import {
-  FireMapperAuthSchema,
-} from "./schema/firemapper-auth";
 import { EsriType, MapPropertiesType } from "../types/esri";
 
 export interface Esri extends EsriType { }
@@ -18,7 +15,6 @@ export function EsriSchema(mongoose: MongooseModule) {
   const EsriAuth = EsriAuthModule(mongoose);
   const EsriError = EsriErrorModule(mongoose);
   const EsriMap = EsriMapModule(mongoose);
-  const FireMapperAuth = FireMapperAuthSchema(mongoose);
 
   const MapProperties = new Schema<MapPropertiesType>({
     // ArcGIS Item id
@@ -60,10 +56,6 @@ export function EsriSchema(mongoose: MongooseModule) {
       type: EsriError,
       default: null,
     },
-    fireMapperAuth: {
-      type: FireMapperAuth,
-      default: null,
-    },
 
     // Link to ArcGISGroup
     arcGISGroupIds: {

package/src/models/partner.ts

@@ -31,6 +31,10 @@ export default async function PartnerModule(mongoose: MongooseModule) {
       type: Boolean,
       default: false,
     },
+    speedAsBinary: {
+      type: Boolean,
+      default: false,
+    },
   }, {
     _id: false,
     id: false,

package/src/models/schema/firemapper-auth.ts

@@ -3,48 +3,9 @@ import {
 } from "../../helpers";
 import { EncryptedDataType } from "../../types/common";
 import {
-  FireMapperAuthType,
   FireMapperAuthV2Type,
 } from "../../types/firemapper-auth";
 
-export function FireMapperAuthSchema(mongoose: MongooseModule) {
-  const { Schema } = mongoose;
-
-  const EncryptedData = new Schema<EncryptedDataType>({
-    iv: {
-      type: String,
-      default: "",
-    },
-    encryptedData: {
-      type: String,
-      default: "",
-    },
-  }, {
-    _id: false,
-    id: false,
-  });
-
-  const FireMapperAuth = new Schema<FireMapperAuthType>({
-    username: {
-      type: String,
-      default: "",
-    },
-    encrypted: {
-      type: EncryptedData,
-      default: null,
-    },
-    encryptedAccessCode: {
-      type: EncryptedData,
-      default: null,
-    },
-  }, {
-    _id: false,
-    id: false,
-  });
-
-  return FireMapperAuth;
-}
-
 export function FireMapperAuthV2Schema(mongoose: MongooseModule) {
   const { Schema } = mongoose;
 

package/src/test/esri.ts

@@ -34,12 +34,6 @@ describe("Esri", function() {
     assert.equal(sut.auth.encrypted.iv, testItem.auth?.encrypted.iv);
     assert.equal(sut.auth.encrypted.encryptedData, testItem.auth?.encrypted.encryptedData);
 
-    assert.equal(sut.fireMapperAuth.username, testItem.fireMapperAuth?.username);
-    assert.equal(sut.fireMapperAuth.encrypted.iv, testItem.fireMapperAuth?.encrypted.iv);
-    assert.equal(sut.fireMapperAuth.encrypted.encryptedData, testItem.fireMapperAuth?.encrypted.encryptedData);
-    assert.equal(sut.fireMapperAuth.encryptedAccessCode.iv, testItem.fireMapperAuth?.encryptedAccessCode.iv);
-    assert.equal(sut.fireMapperAuth.encryptedAccessCode.encryptedData, testItem.fireMapperAuth?.encryptedAccessCode.encryptedData);
-
     assert.equal(sut.maps.length, 1);
     const sutm = sut.maps[0];
     let testItemM;

package/src/test/mock.ts

@@ -11,6 +11,7 @@ import {
 import { Agency } from "../models/agency";
 import { CADIncident } from "../models/cad-incident";
 import { Department } from "../models/department";
+import { Esri } from "../models/esri";
 import { GlobalSettingsType } from "../types/global-settings";
 import { IncidentFilter } from "models/incident-filter";
 import { IncidentNotified } from "../models/incident-notified";
@@ -953,10 +954,9 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     mapHidden: false
   };
 
-  const esri = {
+  const esri: Partial<Esri> = {
     _id: new mongoose.Types.ObjectId(),
     departmentId: new mongoose.Types.ObjectId("56131f724143487a10000001"),
-    modified_unix_date: 1432230780,
     auth: {
       username: "fire_maps",
       encrypted: {
@@ -964,17 +964,6 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
         encryptedData: "dee54"
       }
     },
-    fireMapperAuth: {
-      username: "fire_mapper",
-      encrypted: {
-        iv: "28f10",
-        encryptedData: "dee99"
-      },
-      encryptedAccessCode: {
-        iv: "99f1341",
-        encryptedData: "zoom123"
-      }
-    },
     maps: [
       esriMap
     ],
@@ -1323,6 +1312,7 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       enabled: true,
       departmentIds: [departmentId],
       includeVehicleStatus: false,
+      speedAsBinary: false,
     },
   };
 

package/src/types/department.ts

@@ -604,8 +604,6 @@ export interface DepartmentType {
   fdid: string,
   fireMapPDFReader: string,
   fireMapper: FireMapperConfigurationType,
-  fireMapperProLicenses: number,
-  fireMapperRefreshInterval: number,
   firstArriving: FirstArrivingConfigType,
   firstArrivingEnabled: boolean,
   forwarding: ForwardingConfigType,

package/src/types/esri.ts

@@ -1,6 +1,5 @@
 import { Types } from "mongoose";
 import { EncryptedDataType } from "./common";
-import { FireMapperAuthType } from "./firemapper-auth";
 
 export interface MapPropertiesType {
   itemId: string,
@@ -13,7 +12,6 @@ export interface EsriType {
   departmentId: Types.ObjectId
   auth: EsriAuthSchemaType,
   authError: EsriErrorSchemaType,
-  fireMapperAuth: FireMapperAuthType,
   arcGISGroupIds: string[],
   arcGISAuth: EsriAuthSchemaType,
   arcGISMigrated: boolean,

package/src/types/firemapper-auth.ts

@@ -1,11 +1,5 @@
 import { EncryptedDataType } from "./common";
 
-export interface FireMapperAuthType {
-  username: string,
-  encrypted: EncryptedDataType,
-  encryptedAccessCode: EncryptedDataType,
-}
-
 export interface FireMapperAuthV2Type {
   // in their system. Free form, same account can be used in several places
   account: string,

package/src/types/partner.ts

@@ -4,6 +4,7 @@ export interface PartnerLocationType {
   enabled: boolean,
   departmentIds: string[],
   includeVehicleStatus: boolean,
+  speedAsBinary: boolean,
 }
 
 export interface PartnerType {