tabletcommand-backend-models 5.17.27 → 5.17.30

package/build/test/mock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock.js","sourceRoot":"","sources":["../../src/test/mock.ts"],"names":[],"mappings":";;AAIA,qCAA+C;AAC/C,IAAA,4BAAmB,GAAE,CAAC;AAEtB,SAAwB,UAAU,CAAC,WAElC;IAEC,KAAK,UAAU,OAAO;QACpB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,WAAW,GAAG;QAClB,MAAM,EAAE,SAAS;QACjB,iBAAiB,EAAE;YACjB;gBACE,UAAU,EAAE,0BAA0B;gBACtC,YAAY,EAAE,0BAA0B;gBACxC,YAAY,EAAE,WAAW;gBACzB,SAAS,EAAE,IAAI;gBACf,aAAa,EAAE,0BAA0B;gBACzC,UAAU,EAAE,IAAI;gBAChB,KAAK,EAAE;oBACL,EAAE;oBACF;wBACE,QAAQ,EAAE,YAAY;wBACtB,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,0BAA0B;qBACnC;iBACF;aACF;SACF;QACD,cAAc,EAAE;YACd,iBAAiB;SAClB;QACD,OAAO,EAAE,kCAAkC;QAC3C,SAAS,EAAE;YACT;gBACE,QAAQ,EAAE,gBAAgB;gBAC1B,UAAU,EAAE,QAAQ;gBACpB,KAAK,EAAE,iBAAiB;gBACxB,QAAQ,EAAE,gBAAgB;aAC3B;SACF;QACD,KAAK,EAAE,oBAAoB;QAC3B,SAAS,EAAE,IAAI;QACf,KAAK,EAAE,8BAA8B;QACrC,KAAK,EAAE;YACL;gBACE,QAAQ,EAAE,cAAc;gBACxB,UAAU,EAAE,OAAO;gBACnB,KAAK,EAAE,kBAAkB;gBACzB,QAAQ,EAAE,oBAAoB;aAC/B;SACF;KACF,CAAC;IAEF,OAAO;QACL,OAAO;QAEP,WAAW;KACZ,CAAC;AACJ,CAAC;AA1DD,6BA0DC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAk5BE"}

package/build.sh

@@ -22,4 +22,7 @@ NODE_VERSION="v16.13.2"
 nvm use $NODE_VERSION || nvm install $NODE_VERSION
 
 npm install;
+echo "--- test"
 npm test;
+echo "--- type coverage"
+npx type-coverage;

package/definitions/models/arcgis-group.d.ts

@@ -43,52 +43,6 @@ export declare function ArcGISGroupModule(mongoose: MongooseModule): Promise<imp
         };
     }>[];
     externalOrgIds: string[];
-    resolvedDepartments: import("../helpers").MongooseInterface<{
-        department: {
-            type: StringConstructor;
-            default: string;
-        };
-        departmentId: {
-            type: StringConstructor;
-            default: string;
-        };
-        authUsername: {
-            type: StringConstructor;
-            default: string;
-        };
-        authError: {
-            type: StringConstructor;
-            default: string;
-        };
-        tokenUsername: {
-            type: StringConstructor;
-            default: null;
-        };
-        tokenError: {
-            type: StringConstructor;
-            default: null;
-        };
-        users: {
-            type: (import("mongoose").Schema<any> & {
-                _interface: import("../helpers").MongooseInterface<{
-                    username: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    email: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                    userId: {
-                        type: StringConstructor;
-                        default: string;
-                    };
-                }>;
-                _methods: unknown;
-            })[];
-            default: never[];
-        };
-    }>[];
     linkedDepartments: import("../helpers").MongooseInterface<{
         department: {
             type: StringConstructor;

package/definitions/models/arcgis-group.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arcgis-group.d.ts","sourceRoot":"","sources":["../../src/models/arcgis-group.ts"],"names":[],"mappings":";AACA,OAAO,EAIL,8BAA8B,EAC9B,+BAA+B,EAC/B,cAAc,EACd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwI/D;AAED,MAAM,WAAW,WAAY,SAAQ,8BAA8B,CAAC,OAAO,iBAAiB,CAAC;CAAI;AACjG,MAAM,WAAW,gBAAiB,SAAQ,+BAA+B,CAAC,WAAW,CAAC;CAAI;;AAC1F,wBAAuG"}
+{"version":3,"file":"arcgis-group.d.ts","sourceRoot":"","sources":["../../src/models/arcgis-group.ts"],"names":[],"mappings":";AACA,OAAO,EAIL,8BAA8B,EAC9B,+BAA+B,EAC/B,cAAc,EACd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,wBAAsB,iBAAiB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmI/D;AAED,MAAM,WAAW,WAAY,SAAQ,8BAA8B,CAAC,OAAO,iBAAiB,CAAC;CAAI;AACjG,MAAM,WAAW,gBAAiB,SAAQ,+BAA+B,CAAC,WAAW,CAAC;CAAI;;AAC1F,wBAAuG"}

package/definitions/models/department.d.ts

@@ -114,6 +114,7 @@ export declare function DepartmentModule(mongoose: MongooseModule): Promise<impo
     accountType: string;
     timeZone: string;
     remoteLoggingEnabled: boolean;
+    logOffEnabled: boolean;
     licensing: any;
     webDisclaimer: import("../helpers").MongooseInterface<{
         message: {

package/definitions/models/department.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"department.d.ts","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":";AAGA,OAAO,EAGL,WAAW,EAGX,cAAc,EAEd,8BAA8B,EAC9B,+BAA+B,EAC/B,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAGpB,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyZ9D;AAED,MAAM,WAAW,UAAW,SAAQ,8BAA8B,CAAC,OAAO,gBAAgB,CAAC;CAAI;AAC/F,MAAM,WAAW,eAAgB,SAAQ,+BAA+B,CAAC,UAAU,CAAC;CAAI;;AACxF,wBAAoG"}
+{"version":3,"file":"department.d.ts","sourceRoot":"","sources":["../../src/models/department.ts"],"names":[],"mappings":";AAGA,OAAO,EAGL,WAAW,EAGX,cAAc,EAEd,8BAA8B,EAC9B,+BAA+B,EAC/B,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAGpB,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6Z9D;AAED,MAAM,WAAW,UAAW,SAAQ,8BAA8B,CAAC,OAAO,gBAAgB,CAAC;CAAI;AAC/F,MAAM,WAAW,eAAgB,SAAQ,+BAA+B,CAAC,UAAU,CAAC;CAAI;;AACxF,wBAAoG"}

package/definitions/models/esri.d.ts

@@ -171,9 +171,9 @@ export declare function EsriSchema(mongoose: MongooseModule): import("mongoose")
             };
             default: null;
         };
-        arcGISGroupId: {
-            type: StringConstructor;
-            default: null;
+        arcGISGroupIds: {
+            type: StringConstructor[];
+            default: never[];
         };
         arcGISAuth: {
             type: import("mongoose").Schema<any> & {
@@ -543,7 +543,7 @@ export declare function EsriModule(mongoose: MongooseModule): Promise<import("mo
             default: null;
         };
     }>;
-    arcGISGroupId: string;
+    arcGISGroupIds: string[];
     arcGISAuth: import("../helpers").MongooseInterface<{
         username: {
             type: StringConstructor;

package/definitions/models/location.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../../src/models/location.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,8BAA8B,EAC9B,+BAA+B,EAE/B,cAAc,EACd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAKpB,wBAAsB,cAAc,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6J5D;AAED,MAAM,WAAW,QAAS,SAAQ,8BAA8B,CAAC,OAAO,cAAc,CAAC;CAAI;AAC3F,MAAM,WAAW,aAAc,SAAQ,+BAA+B,CAAC,QAAQ,CAAC;CAAI;;AACpF,wBAA8F"}
+{"version":3,"file":"location.d.ts","sourceRoot":"","sources":["../../src/models/location.ts"],"names":[],"mappings":";AACA,OAAO,EAKL,8BAA8B,EAC9B,+BAA+B,EAE/B,cAAc,EACd,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAKpB,wBAAsB,cAAc,CAAC,QAAQ,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmK5D;AAED,MAAM,WAAW,QAAS,SAAQ,8BAA8B,CAAC,OAAO,cAAc,CAAC;CAAI;AAC3F,MAAM,WAAW,aAAc,SAAQ,+BAA+B,CAAC,QAAQ,CAAC;CAAI;;AACpF,wBAA8F"}

package/definitions/test/arcgis-group.d.ts

@@ -0,0 +1,2 @@
+import "mocha";
+//# sourceMappingURL=arcgis-group.d.ts.map

package/definitions/test/arcgis-group.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arcgis-group.d.ts","sourceRoot":"","sources":["../../src/test/arcgis-group.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,CAAC"}

package/definitions/test/config.d.ts

@@ -0,0 +1,3 @@
+export declare const url: string;
+export declare function checkIfTestDatabase(): void;
+//# sourceMappingURL=config.d.ts.map

package/definitions/test/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/test/config.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,QAAoE,CAAC;AAErF,wBAAgB,mBAAmB,SAKlC"}

package/definitions/test/mock.d.ts

@@ -0,0 +1,39 @@
+export default function MockModule(dependecies: {
+    models: unknown;
+}): {
+    cleanup: () => Promise<string>;
+    arcGISGroup: {
+        access: string;
+        linkedDepartments: {
+            department: string;
+            departmentId: string;
+            authUsername: string;
+            authError: null;
+            tokenUsername: string;
+            tokenError: null;
+            users: {
+                username: string;
+                email: string;
+                userId: string;
+            }[];
+        }[];
+        externalOrgIds: string[];
+        groupId: string;
+        outsiders: {
+            fullName: string;
+            memberType: string;
+            orgId: string;
+            username: string;
+        }[];
+        owner: string;
+        protected: boolean;
+        title: string;
+        users: {
+            fullName: string;
+            memberType: string;
+            orgId: string;
+            username: string;
+        }[];
+    };
+};
+//# sourceMappingURL=mock.d.ts.map

package/definitions/test/mock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../../src/test/mock.ts"],"names":[],"mappings":"AAOA,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,WAAW,EAAE;IAC9C,MAAM,EAAE,OAAO,CAAC;CACjB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwDA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabletcommand-backend-models",
-  "version": "5.17.27",
+  "version": "5.17.30",
   "description": "Tablet Command Backend Models",
   "scripts": {
     "test": "gulp",
@@ -27,21 +27,30 @@
   "devDependencies": {
     "@types/bluebird": "^3.5.36",
     "@types/chai": "^4.3.0",
-    "@types/lodash": "^4.14.178",
+    "@types/lodash": "^4.14.179",
     "@types/mocha": "^9.1.0",
     "@types/mongodb": "^3.6.20",
     "@types/mongoose": "~5.10.5",
     "@types/uuid": "~8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.12.1",
-    "@typescript-eslint/parser": "^5.12.1",
+    "@typescript-eslint/eslint-plugin": "~5.14.0",
+    "@typescript-eslint/parser": "~5.14.0",
     "chai": "^4.3.6",
     "del": "^6.0.0",
-    "eslint": "^8.9.0",
+    "eslint": "^8.10.0",
     "gulp": "^4.0.2",
     "gulp-mocha": "^8.0.0",
     "gulp-shell": "^0.8.0",
     "mocha": "^9.2.1",
-    "typescript": "^4.5.5",
-    "yargs-parser": ">=21.0.0"
+    "ts-node": "^10.7.0",
+    "type-coverage": "^2.21.0",
+    "typescript": "^4.6.2",
+    "yargs-parser": ">=21.0.1"
+  },
+  "typeCoverage": {
+    "atLeast": 99.80,
+    "ignoreFiles": [
+      "definitions/**/*.ts",
+      "src/test/**/*.ts"
+    ]
   }
-}
+}

package/src/models/arcgis-group.ts

@@ -124,11 +124,6 @@ export async function ArcGISGroupModule(mongoose: MongooseModule) {
       default: [],
     },
 
-    // departments that are linked to this group via group.user = dept.auth
-    resolvedDepartments: {
-      type: [ArcGISDepartment],
-      default: [],
-    },
     // departments that are linked via arcGISGroupId (linked by a super admin)
     linkedDepartments: {
       type: [ArcGISDepartment],

package/src/models/department.ts

@@ -396,6 +396,10 @@ export async function DepartmentModule(mongoose: MongooseModule) {
       type: Boolean,
       default: false,
     },
+    logOffEnabled: {
+      type: Boolean,
+      default: false,
+    },
     licensing: {
       type: Object,
       default: LicensingDefault,

package/src/models/esri.ts

@@ -86,9 +86,9 @@ export function EsriSchema(mongoose: MongooseModule) {
     },
 
     // Link to ArcGISGroup
-    arcGISGroupId: {
-      type: String,
-      default: null,
+    arcGISGroupIds: {
+      type: [String],
+      default: [],
     },
     // ArcGIS user used for fallback when a new user has no ArcGIS account yet
     arcGISAuth: {

package/src/models/location.ts

@@ -144,23 +144,29 @@ export async function LocationModule(mongoose: MongooseModule) {
     versionKey: false,
   });
 
-  modelSchema.virtual("id").get(function(this: MongooseDocument) {
+  modelSchema.virtual("id").get(function (this: MongooseDocument) {
     return this._id.toHexString();
   });
 
-  modelSchema.virtual("location").get(function(this: { locationGeoJSON: { coordinates: number[] }} | null | undefined) {
+  modelSchema.virtual("location").get(function (this: { locationGeoJSON: { coordinates: number[] } } | null | undefined) {
     const location = {
       latitude: 0,
       longitude: 0
     };
-    if (this && this.locationGeoJSON && this.locationGeoJSON.coordinates && this.locationGeoJSON.coordinates.length === 2) {
+    if (this && this.locationGeoJSON &&
+      this.locationGeoJSON.coordinates &&
+      this.locationGeoJSON.coordinates[0] &&
+      Number.isFinite(this.locationGeoJSON.coordinates[0]) &&
+      this.locationGeoJSON.coordinates[1] &&
+      Number.isFinite(this.locationGeoJSON.coordinates[1])
+    ) {
       location.longitude = this.locationGeoJSON.coordinates[0];
       location.latitude = this.locationGeoJSON.coordinates[1];
     }
     return location;
   });
 
-   // Create GeoJSON index
+  // Create GeoJSON index
   modelSchema.index({
     locationGeoJSON: "2dsphere",
     shared: 1,

package/src/test/arcgis-group.ts

@@ -0,0 +1,107 @@
+
+import { assert } from "chai";
+import "mocha";
+import * as _ from "lodash";
+
+import { url as mongoURL } from "./config";
+
+import { connect } from "..";
+import MockModule from "./mock";
+
+describe("ArcGISGroup", function () {
+  let models, 
+    mongoose: typeof import("mongoose"), 
+    mock;
+
+  beforeEach(async function () {
+    const result = await connect(mongoURL);
+    console.log(result);
+    // models = result.models;
+    // mongoose = result.mongoose;
+
+    // mock = MockModule({
+    //   models,
+    // });
+    // await mock.cleanup();
+
+    // console.log("x", result);
+    console.log(mongoURL);
+  });
+
+  afterEach(async function() {
+    // await mongoose.disconnect();
+  });
+
+  it("is saved", async function () {
+    assert.isTrue(true);
+  });
+});
+
+
+/*
+
+const m = require("..");
+
+describe("ArcGISGroup", function() {
+  let models, mongoose, mock;
+
+  beforeEach(async function() {
+    const c = await m.connect(config.url);
+    models = c.models;
+    mongoose = c.mongoose;
+    mock = require("./mock")({
+      models,
+      mongoose,
+    });
+    await mock.cleanup();
+  });
+
+  afterEach(function() {
+    mongoose.disconnect();
+  });
+
+  it("is saved", async function() {
+    const testItem = mock.arcGISGroup;
+    assert.isObject(testItem);
+    const item = new models.ArcGISGroup(testItem);
+    const sut = await item.save();
+
+    assert.isNotNull(sut._id);
+    assert.isNotNull(sut.modified);
+
+    assert.equal(sut.groupId, testItem.groupId);
+    assert.equal(sut.title, testItem.title);
+    assert.deepEqual(sut.externalOrgIds, testItem.externalOrgIds);
+    assert.equal(sut.access, testItem.access);
+    assert.equal(sut.owner, testItem.owner);
+    assert.equal(sut.protected, testItem.protected);
+
+    assert.equal(sut.linkedDepartments.length, 1);
+    const dept = _.first(sut.linkedDepartments);
+    assert.equal(dept.department, "Demo RTS Fire Department");
+    assert.equal(dept.departmentId, "558365a198b2fa4278000053");
+    assert.equal(dept.authUsername, "tabletcmd");
+    assert.equal(dept.tokenUsername, "tc_ContraCostaCountyFire");
+
+    assert.equal(dept.users.length, 1);
+    const deptUser = _.first(dept.users);
+    assert.equal(deptUser.username, "tc_someone");
+    assert.equal(deptUser.email, "hello@tc.com");
+    assert.equal(deptUser.userId, "558365a198a2aa42780000aa");
+
+    assert.equal(sut.outsiders.length, 1);
+    const outsider = _.first(sut.outsiders);
+    assert.equal(outsider.username, "Michael_Kallum");
+    assert.equal(outsider.fullName, "Michael Kallum");
+    assert.equal(outsider.memberType, "member");
+    assert.equal(outsider.orgId, "MyTOuXKXZoizaaa");
+
+    assert.equal(sut.users.length, 1);
+    const user = _.first(sut.users);
+    assert.equal(user.username, "jane_tabletcommand");
+    assert.equal(user.fullName, "Jane Serrano");
+    assert.equal(user.memberType, "admin");
+    assert.equal(user.orgId, "zGXMcUaDlMGoAAAg");
+  });
+});
+*/

package/src/test/config.ts

@@ -0,0 +1,10 @@
+"use strict";
+
+export const url = process.env.NODE_MONGO_URL || "mongodb://127.0.0.1/incident-test";
+
+export function checkIfTestDatabase() {
+  if (!/massive-test/i.exec(url)) {
+    console.log(`Not a test database: ${url}? Expecting database: massive-test.`);
+    process.exit(1);
+  }
+}