tabletcommand-backend-models 7.0.14 → 7.0.15

package/src/models/location.ts

@@ -1,14 +1,17 @@
 import * as uuid from "uuid";
+import { isArray, isString } from "lodash";
+
 import {
   currentDate,
   MongooseDocument,
   MongooseModule,
 } from "../helpers";
-import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import ColorModule from "./schema/color";
 import GeoJSONPointModule from "./schema/geojson-point";
 import { Model } from "mongoose";
 import { LocationType } from "../types/location";
+import { LocationVisibility } from "../constants";
 
 export interface Location extends LocationType, Record<string, unknown> { }
 
@@ -172,6 +175,12 @@ export default async function LocationModule(mongoose: MongooseModule) {
       type: Date,
       default: currentDate,
     },
+
+    // combines .sendToCAD, .active, .shared as LocationVisibility[]
+    visibility: {
+      type: [String],
+      default: [],
+    },
   }, {
   });
 
@@ -215,4 +224,34 @@ export default async function LocationModule(mongoose: MongooseModule) {
   return mongoose.model<Location>("Location", modelSchema, "massive_location", { overwriteModels: true });
 }
 
-export interface LocationModel extends Model<Location> { }
+export interface LocationModel extends Model<Location> { }
+
+export function decodeLocationVisibility(str: unknown): LocationVisibility[] {
+  const out: LocationVisibility[] = [];
+  if (!isArray(str)) {
+    return out;
+  }
+
+  str.forEach((elem: unknown) => {
+    if (!isString(elem)) {
+      return;
+    }
+
+    switch (elem.toLowerCase()) {
+      case LocationVisibility.Hidden.toLowerCase():
+        out.push(LocationVisibility.Hidden);
+        break;
+      case LocationVisibility.Visible.toLowerCase():
+        out.push(LocationVisibility.Visible);
+        break;
+      case LocationVisibility.CAD.toLowerCase():
+        out.push(LocationVisibility.CAD);
+        break;
+      case LocationVisibility.Shared.toLowerCase():
+        out.push(LocationVisibility.Shared);
+        break;
+    }
+  });
+
+  return out;
+}

package/src/models/managed-incident.ts

@@ -1,4 +1,4 @@
-import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import * as uuid from "uuid";
 import {
   currentDate,

package/src/models/monitor.ts

@@ -4,7 +4,7 @@ import {
   MongooseModule,
   retrieveCurrentUnixTime,
 } from "../helpers";
-import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { MonitorType } from "../types/monitor";
 
 export interface Monitor extends MonitorType { }

package/src/models/schema/cad-incident.ts

@@ -1,12 +1,10 @@
-//x-disabled <reference types="../../mongoose-lean-virtuals" />
-
 import {
   currentDate,
   MongooseModule,
 } from "../../helpers";
 
 import * as uuid from "uuid";
-import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { IncidentEventSchema } from "../incident-event";
 import {
   CADPersonSchema,

package/src/models/smtp-unhandled.ts

@@ -3,7 +3,7 @@ import {
   MongooseDocument,
   MongooseModule,
 } from "../helpers";
-import * as mongooseLeanVirtuals from "mongoose-lean-virtuals";
+import mongooseLeanVirtuals from "mongoose-lean-virtuals";
 import { SMTPUnhandledType } from "../types/smtp-unhandled";
 
 export interface SMTPUnhandled extends SMTPUnhandledType { }

package/src/mongoose-lean-virtuals.d.ts

@@ -1,4 +1,6 @@
 declare module "mongoose-lean-virtuals" {
-  const mongooseLeanVirtuals: (schema: import("mongoose").Schema) => import("mongoose").Schema;
-  export = mongooseLeanVirtuals;
+  import { Schema } from "mongoose";
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const mongooseLeanVirtuals: <T>(schema: Schema<T>, opts?: any) => void;
+  export default mongooseLeanVirtuals;
 }

package/src/test/location.ts

@@ -3,6 +3,8 @@ import "mocha";
 import * as m from "../index";
 import * as config from "./config";
 import mockModule from "./mock";
+import { decodeLocationVisibility } from "../models/location";
+import { LocationVisibility } from "../constants";
 
 describe("Location", function() {
   let models: m.BackendModels, mongoose: m.MongooseModule;
@@ -24,7 +26,6 @@ describe("Location", function() {
   it("is saved", async function() {
     const item = new models.Location(testItem);
     const sut = await item.save();
-    await models.Location.findOne({ _id: testItem._id });
     assert.isNotNull(testItem._id);
     assert.equal(testItem.departmentId, sut.departmentId);
     assert.equal(testItem.userId, sut.userId);
@@ -76,4 +77,17 @@ describe("Location", function() {
 
     await models.Location.collection.dropIndexes();
   });
+
+  it("decodes .visibility", async function() {
+    const item = new models.Location(testItem);
+    const sut = await item.save();
+
+    const sutVis = decodeLocationVisibility(sut.visibility);
+
+    assert.equal(sutVis.length, 4);
+    assert.notEqual(sutVis.indexOf(LocationVisibility.Hidden), -1);
+    assert.notEqual(sutVis.indexOf(LocationVisibility.Visible), -1);
+    assert.notEqual(sutVis.indexOf(LocationVisibility.CAD), -1);
+    assert.notEqual(sutVis.indexOf(LocationVisibility.Shared), -1);
+  });
 });

package/src/test/mock.ts

@@ -956,7 +956,16 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
       text: "#00AA00",
       background: "#FFAAFF"
     },
-    modified: new Date()
+    modified: new Date(),
+    visibility: [
+      "hidden",
+      "visible",
+      "cad",
+      "shared",
+      // Does not exist
+      "none",
+      "",
+    ]
   };
 
   const managedIncident = {

package/src/tsconfig.json

@@ -13,19 +13,12 @@
     "noUncheckedIndexedAccess": true,
     "noUnusedLocals": true,
     "outDir": "../build",
-    "paths": {
-      "*": [
-        "../node_modules/@types/*",
-        "*"
-      ]
-    },
     "resolveJsonModule": true,
     "sourceMap": true,
     "strict": true,
     "target": "es2017",
-    "types": [
-      "node",
-      "mocha"
-    ]
-  }
-}
+    "types": ["node", "mocha"]
+  },
+  "include": ["**/*.ts", "mongoose-lean-virtuals.d.ts"],
+  "exclude": ["node_modules"],
+}

package/src/types/location.ts

@@ -5,37 +5,35 @@ import { ColorSchemaType } from "./color";
 export interface LocationType {
   _id: Types.ObjectId,
   id?: string,
-  departmentId: string,
-  userId: string,
-  uuid: string,
-  username: string,
-  device_type: string,
   active: boolean,
-  deleteAfterDate: Date,
-  modified: Date,
-  movedAt: Date,
-  propsChangedAt: Date,
-  version: number,
-  session: string,
+  agencyCode: string,
+  agencyName: string,
   altitude: number,
-  heading: number,
-  speed: number,
+  color: ColorSchemaType,
+  colorChangedAt: Date,
+  deleteAfterDate: Date,
+  departmentId: string,
+  device_type: string,
   esriId: number,
+  heading: number,
+  kindType: string,
+  location?: { latitude: number, longitude: number, }; // provided by virtual.location
   locationGeoJSON: GeoJSONPointType,
+  modified: Date,
+  movedAt: Date,
   opAreaCode: string
   opAreaName: string,
-  agencyCode: string,
-  agencyName: string,
-  shared: boolean,
-  state: string,
+  propsChangedAt: Date,
   sendToCAD: boolean,
-  color: ColorSchemaType,
-  colorChangedAt: Date,
+  session: string,
+  shared: boolean,
   source: string,
-  kindType: string,
+  speed: number,
+  state: string,
   typeDetails: object
-  location?: {
-    latitude: number,
-    longitude: number,
-  };
+  userId: string,
+  username: string,
+  uuid: string,
+  version: number,
+  visibility: string[],
 }