tabletcommand-backend-models 7.4.27 → 7.4.29

package/src/index.ts

@@ -1,6 +1,7 @@
 import { assign } from "lodash";
 import { ConnectOptions } from "mongoose";
 import { MongooseModule } from "./helpers";
+
 export {
   AccountCallerType,
   AccountIndustry,
@@ -15,6 +16,7 @@ export {
 
 async function wireModels(mongoose: MongooseModule) {
   type ModelType<TModule extends Record<"default", (m: MongooseModule) => unknown>> = ReturnType<TModule["default"]>;
+
   async function getModel<TModule extends Record<"default", (m: MongooseModule) => unknown>>(m: Promise<TModule>): Promise<ModelType<TModule>> {
     const module = await m;
     return module.default(mongoose) as Promise<ModelType<TModule>>;
@@ -69,6 +71,7 @@ async function wireModels(mongoose: MongooseModule) {
     RemoteLog: await getModel(import("./models/remote-log")),
     RemoteLogStream: await getModel(import("./models/remote-log-stream")),
     Session: await getModel(import("./models/session")),
+    SAML: await getModel(import("./models/saml")),
     SMSLog: await getModel(import("./models/sms-log")),
     SMTPUnhandled: await getModel(import("./models/smtp-unhandled")),
     Template: await getModel(import("./models/template")),
@@ -127,6 +130,7 @@ export { ReleaseNote, ReleaseNoteModel } from "./models/release-note";
 export { RemoteLog, RemoteLogModel } from "./models/remote-log";
 export { RemoteLogStream, RemoteLogStreamModel } from "./models/remote-log-stream";
 export { Session, SessionModel } from "./models/session";
+export { SAML, SAMLModel } from "./models/saml";
 export { SMSLog, SMSLogModel } from "./models/sms-log";
 export { SMTPUnhandled, SMTPUnhandledModel } from "./models/smtp-unhandled";
 export { Template, TemplateModel } from "./models/template";
@@ -156,7 +160,11 @@ export async function connect(url: string, overwriteOpts?: ConnectOptions, enabl
   const opts: ConnectOptions = assign({}, defaultOpts, overwriteOpts);
   const connection = await mongoose.connect(url, opts);
 
-  return { mongoose, connection, models };
+  return {
+    connection,
+    models,
+    mongoose,
+  };
 }
 
 type UnboxPromise<T extends Promise<unknown>> = T extends Promise<infer U> ? U : never;

package/src/models/agency.ts

@@ -9,7 +9,7 @@ import {
 } from "../helpers";
 
 import AgencyCronConfigModule from "./schema/agency-cron-config";
-import AgencySAMLModule from "./schema/agency-saml";
+import { SAMLSchema as SAMLModule } from "./saml";
 import { CrossStaffedUnitType, AgencyType } from "../types/agency";
 
 export interface Agency extends AgencyType, Record<string, unknown> { }
@@ -17,7 +17,7 @@ export interface Agency extends AgencyType, Record<string, unknown> { }
 export function AgencySchema(mongoose: MongooseModule) {
   const { Schema } = mongoose;
   const AgencyCronConfig = AgencyCronConfigModule(mongoose);
-  const AgencySAML = AgencySAMLModule(mongoose);
+  const SAML = SAMLModule(mongoose);
 
   const CrossStaffedUnit = new Schema<CrossStaffedUnitType>({
     radioName: {
@@ -125,7 +125,7 @@ export function AgencySchema(mongoose: MongooseModule) {
       default: null,
     },
     saml: {
-      type: [AgencySAML],
+      type: [SAML],
       default: [],
       select: false, // Not a secret but not needed in all the queries
     },

package/src/models/cad-incident.ts

@@ -20,13 +20,6 @@ export default async function CADIncidentModule(mongoose: MongooseModule) {
     name: "closed_unix_date_1_departmentId_1_modified_unix_date_1",
   });
 
-  modelSchema.index({
-    closed_unix_date: 1,
-    modified_unix_date: 1
-  }, {
-    name: "closed_unix_date_modified_unix_date",
-  });
-
   modelSchema.index({
     departmentId: 1,
     ClosedDateTime: -1
@@ -74,35 +67,6 @@ export default async function CADIncidentModule(mongoose: MongooseModule) {
     name: "departmentId_1_start_unix_date_1",
   });
 
-  modelSchema.index({
-    expiration_date: 1,
-    ClosedDateTime: 1
-  }, {
-    name: "expiration_date_1_ClosedDateTime_1",
-    partialFilterExpression: {
-      expiration_date: {
-        $gt: ""
-      },
-      ClosedDateTime: {
-        $eq: ""
-      }
-    },
-  });
-
-  modelSchema.index({
-    expiration_date: 1,
-    ClosedDateTime: 1,
-    departmentId: 1
-  }, {
-    name: "expiration_date_1_ClosedDateTime_1_departmentId_1",
-    partialFilterExpression: {
-      expiration_date: {
-        $gt: ""
-      },
-      ClosedDateTime: ""
-    }
-  });
-
   modelSchema.index({
     "sharedTo.departmentId": 1,
     "sharedTo.expireAt": 1
@@ -217,6 +181,36 @@ export default async function CADIncidentModule(mongoose: MongooseModule) {
     name: "IncidentNumber_1_sharedTo.userId_1",
   });
 
+  //
+  modelSchema.index({
+    ClosedDateTime: 1,
+    expiration_date: 1,
+  }, {
+    name: "ClosedDateTime_1_expiration_date_1",
+    partialFilterExpression: {
+      ClosedDateTime: {
+        $eq: ""
+      },
+      expiration_date: {
+        $gt: ""
+      }
+    }
+  });
+
+  modelSchema.index({
+    ClosedDateTime: 1,
+    expiration_date: 1,
+    departmentId: 1
+  }, {
+    name: "ClosedDateTime_1_expiration_date_1_departmentId_1",
+    partialFilterExpression: {
+      expiration_date: {
+        $gt: ""
+      },
+      ClosedDateTime: ""
+    }
+  });
+
   return mongoose.model<CADIncident>("CADIncident", modelSchema, "massive_incident_cad", { overwriteModels: true });
 }
 

package/src/models/cad-status.ts

@@ -59,7 +59,7 @@ export default async function CADStatusModule(mongoose: MongooseModule) {
       type: String,
       default: "",
     },
-    status: {
+    destinationStatus: {
       type: String,
       default: "",
     },

package/src/models/cad-vehicle-status.ts

@@ -127,6 +127,34 @@ export default async function CADVehicleStatusModule(mongoose: MongooseModule) {
       type: Destination,
       default: null,
     },
+    extra: {
+      type: new Schema({
+        doorCode: {
+          type: String,
+          default: "",
+        },
+        destinationStatus: {
+          type: String,
+          default: "",
+        },
+        destinationNote: {
+          type: String,
+          default: "",
+        },
+        latitude: {
+          type: Number,
+          default: 0,
+        },
+        longitude: {
+          type: Number,
+          default: 0,
+        },
+      }, {
+        _id: false,
+        id: false,
+      }),
+      default: null,
+    },
     // Used by frontend
     assignableByUser: {
       type: Boolean,

package/src/models/global-settings.ts

@@ -49,10 +49,6 @@ export default async function GlobalSettingsModule(mongoose: MongooseModule) {
       type: String,
       default: "global",
       immutable: true,
-      index: {
-        unique: true,
-        name: "name_1_unique",
-      }
     },
     arcgisApiKey: {
       type: ArcGISKey,

package/src/models/incident-event.ts

@@ -197,11 +197,12 @@ export default async function IncidentEventModule(mongoose: MongooseModule) {
     name: "sharedTo.userId_1_IncidentNumber_1_modified_unix_date_1",
   });
 
+  // This index will be converted to unique using `prepareUnique: true` later
   modelSchema.index({
-    uuid: 1,
+    uuid: -1,
   }, {
-    name: "uuid_1_unique",
-    unique: true,
+    name: "uuid_tmp",
+    // unique: true,
   });
 
   modelSchema.index({

package/src/models/incident-filter.ts

@@ -46,7 +46,6 @@ export default async function CADIncidentFilterModule(mongoose: MongooseModule)
     departmentId: {
       type: String,
       required: true,
-      index: true,
     },
 
     name: {

package/src/models/managed-incident.ts

@@ -599,6 +599,17 @@ export default async function ManagedIncidentModule(mongoose: MongooseModule) {
     name: "departmentId_1_api_incident_number_1",
   });
 
+  // To be used with prepareUnique: true
+  modelSchema.index({
+    departmentId: 1,
+    api_incident_number: 1
+  }, {
+    name: "departmentId_1_api_incident_number_1_rts_true",
+    partialFilterExpression: {
+      rts: true
+    },
+  });
+
   modelSchema.index({
     departmentId: 1,
     end_unix_time: 1,

package/src/models/{schema/agency-saml.ts → saml.ts}

@@ -1,12 +1,20 @@
+import { Model } from "mongoose";
 import {
   MongooseModule,
-} from "../../helpers";
-import { AgencySAMLSchemaType } from "../../types/agency";
+} from "../helpers";
+import { SAMLType } from "../types/saml";
 
-export default function AgencySAMLSchema(mongoose: MongooseModule) {
+export interface SAML extends SAMLType { }
+
+export function SAMLSchema(mongoose: MongooseModule) {
   const { Schema } = mongoose;
 
-  const AgencySAML = new Schema<AgencySAMLSchemaType>({
+  const SAML = new Schema<SAMLType>({
+    _id: {
+      type: Schema.Types.ObjectId,
+      auto: true,
+    },
+
     selector: {
       type: String,
       required: true,
@@ -45,5 +53,21 @@ export default function AgencySAMLSchema(mongoose: MongooseModule) {
     }
   });
 
-  return AgencySAML;
+  return SAML;
+}
+
+export default async function SAMLModule(mongoose: MongooseModule) {
+  const modelSchema = SAMLSchema(mongoose);
+
+  // Unique selector
+  modelSchema.index({
+    selector: 1,
+  }, {
+    name: "selector_unique",
+    unique: true,
+  });
+
+  return mongoose.model<SAML>("SAML", modelSchema, "massive_saml", { overwriteModels: true });
 }
+
+export interface SAMLModel extends Model<SAML> { }

package/src/test/0index.ts

@@ -65,6 +65,7 @@ describe(" Models", function() {
     assert.isFunction(models.RemoteLog, "Missing RemoteLog");
     assert.isFunction(models.RemoteLogStream, "Missing RemoteLogStream");
     assert.isFunction(models.Session, "Missing Session");
+    assert.isFunction(models.SAML, "Missing SAML");
     assert.isFunction(models.SMSLog, "Missing SMSLog");
     assert.isFunction(models.SMTPUnhandled, "Missing SMTPUnhandled");
     assert.isFunction(models.Template, "Missing Template");

package/src/test/agency.ts

@@ -16,6 +16,7 @@ describe("Agency", function() {
       mongoose
     });
     testItem = mock.agency;
+    await mock.beforeEach();
   });
   afterEach(async function() {
     await mongoose.disconnect();

package/src/test/cad-status.ts

@@ -53,7 +53,7 @@ describe("CADStatus", function() {
       assert.equal(testItem.options[0]?.cadValues[0]?.longitude, sut.options[0]?.cadValues[0]?.longitude);
       assert.equal(testItem.options[0]?.cadValues[0]?.time, sut.options[0]?.cadValues[0]?.time);
       assert.equal(testItem.options[0]?.cadValues[0]?.doorCode, sut.options[0]?.cadValues[0]?.doorCode);
-      assert.equal(testItem.options[0]?.cadValues[0]?.status, sut.options[0]?.cadValues[0]?.status);
+      assert.equal(testItem.options[0]?.cadValues[0]?.destinationStatus, sut.options[0]?.cadValues[0]?.destinationStatus);
       assert.equal(testItem.options[0]?.cadValues[0]?.destinationNote, sut.options[0]?.cadValues[0]?.destinationNote);
     } else {
       assert.equal(testItem.options?.length, 1);

package/src/test/cad-vehicle-status.ts

@@ -39,5 +39,15 @@ describe("CADVehicleStatus", function() {
     assert.equal(testItem.capability, sut.capability);
     assert.equal(testItem.owner, sut.owner);
     assert.equal(testItem.ownerId, sut.ownerId);
+    if (testItem.extra) {
+      assert.equal(testItem.extra.doorCode, sut.extra.doorCode);
+      assert.equal(testItem.extra.destinationStatus, sut.extra.destinationStatus);
+      assert.equal(testItem.extra.destinationNote, sut.extra.destinationNote);
+      assert.equal(testItem.extra.latitude, sut.extra.latitude);
+      assert.equal(testItem.extra.longitude, sut.extra.longitude);
+    } else {
+      assert.isNotOk(testItem.extra);
+      assert.isNotOk(sut.extra);
+    }
   });
 });

package/src/test/mock.ts

@@ -11,10 +11,11 @@ import {
 import { Agency } from "../models/agency";
 import { CADIncident } from "../models/cad-incident";
 import { Department } from "../models/department";
+import { GlobalSettingsType } from "../types/global-settings";
 import { IncidentFilter } from "models/incident-filter";
 import { Location } from "../models/location";
 import { ManagedIncident } from "../models/managed-incident";
-import { GlobalSettingsType } from "../types/global-settings";
+import { SAML } from "../models/saml";
 
 export default function mockModule(dependencies: { mongoose: Mongoose; }) {
   function shouldRun() {
@@ -598,7 +599,7 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
             longitude: -122.4194,
             time: 300,
             doorCode: "1234",
-            status: "Open",
+            destinationStatus: "Open",
             destinationNote: "Main entrance, ER available",
           }
         ],
@@ -656,7 +657,14 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     incidentNumber: "INC19991",
     capability: "",
     owner: "user",
-    ownerId: "M1"
+    ownerId: "M1",
+    extra: {
+      doorCode: "5678",
+      destinationStatus: "Available",
+      destinationNote: "Side entrance, trauma center ready",
+      latitude: 34.0522,
+      longitude: -118.2437,
+    }
   };
 
   const cadVehicleStatusHistory = {
@@ -1244,6 +1252,17 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     ended: "2019-04-01T04:41:39.233Z"
   };
 
+  const saml: Partial<SAML> = {
+    selector: "test-sso-selector",
+    idp: "&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;&lt;EntityDescriptor&gt;&lt;/EntityDescriptor&gt;",
+    sp: "&lt;EntityDescriptor&gt;&lt;SPSSODescriptor WantAssertionsSigned=&quot;true&quot; protocolSupportEnumeration=&quot;urn:oasis:names:tc:SAML:2.0:protocol&quot;&gt;&lt;/SPSSODescriptor&gt;&lt;/EntityDescriptor&gt;",
+    env: "production",
+    name: "Some SSO",
+    jumpPoint: "google",
+    createdAt: new Date("2025-11-10T20:01:01.111+0000"),
+    updatedAt: new Date("2025-11-20T20:02:02.222+0000")
+  };
+
   const template = {
     position: 1,
     active: true,
@@ -1489,6 +1508,7 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     rateLimit,
     releaseNote,
     session,
+    saml,
     template,
     user,
     userDevice,

package/src/test/saml.ts

@@ -0,0 +1,38 @@
+import { assert } from "chai";
+import "mocha";
+import * as m from "../index";
+import * as config from "./config";
+import mockModule from "./mock";
+
+describe("SAML", function() {
+  let models: m.BackendModels, mongoose: m.MongooseModule;
+  let testItem: Partial<m.SAML>;
+  beforeEach(async function() {
+    const c = await m.connect(config.url);
+    models = c.models;
+    mongoose = c.mongoose;
+
+    const mock = mockModule({
+      mongoose
+    });
+    testItem = mock.saml;
+    await mock.beforeEach();
+  });
+  afterEach(async function() {
+    await mongoose.disconnect();
+  });
+
+  it("is saved", async function() {
+    const item = new models.SAML(testItem);
+    const sut = await item.save();
+
+    assert.isNotNull(testItem._id);
+    assert.equal(testItem.selector, sut.selector);
+    assert.equal(testItem.idp, sut.idp);
+    assert.equal(testItem.sp, sut.sp);
+    assert.equal(testItem.name, sut.name);
+    assert.equal(testItem.env, sut.env);
+    assert.equal(testItem.createdAt?.toISOString(), sut.createdAt?.toISOString());
+    // assert.equal(testItem.updatedAt?.toISOString(), sut.updatedAt?.toISOString()); // This seems to be set to createdAt (?)
+  });
+});

package/src/types/agency.ts

@@ -3,6 +3,7 @@ import {
   AccountIndustry,
 } from "../constants";
 import { EncryptedDataType } from "./common";
+import { SAMLType } from "./saml";
 
 export interface CronConfigSourceType extends Record<string, unknown> {
   protocol: string,
@@ -77,15 +78,6 @@ export interface CrossStaffedUnitType {
   alwaysCrossStaff: boolean,
 }
 
-export interface AgencySAMLSchemaType extends Record<string, unknown> {
-  selector: string,
-  idp: string,
-  sp: string,
-  env: string,
-  name: string,
-  jumpPoint: string,
-}
-
 export interface AgencyType {
   _id: Types.ObjectId,
   active: boolean,
@@ -105,6 +97,6 @@ export interface AgencyType {
   personnelApiKey: string,
   personnelIntegration: boolean,
   personnelMonitorHours: number,
-  saml: AgencySAMLSchemaType[],
+  saml: SAMLType[],
   uuid: string,
 }

package/src/types/cad.ts

@@ -30,6 +30,14 @@ export interface DestinationType {
   name: string,
 }
 
+export interface ExtraType {
+  doorCode: string,
+  destinationStatus: string,
+  destinationNote: string,
+  latitude: number,
+  longitude: number,
+}
+
 export interface CADVehicleStatusType {
   assignableByUser: boolean,
   backupDate: Date,
@@ -37,6 +45,7 @@ export interface CADVehicleStatusType {
   changedAt: Date,
   departmentId: string,
   destination: DestinationType,
+  extra: ExtraType,
   incidentNumber: string,
   locationCurrent: string,
   locationDestination: string,
@@ -75,13 +84,13 @@ export interface CADVehicleStatusHistoryType {
 export interface StatusOptionValueType extends Record<string, unknown> {
   doorCode: string,
   destinationNote: string,
+  destinationStatus: string,
   favorite: boolean,
   isDefault: boolean,
   latitude: number,
   longitude: number,
   name: string,
   position: number,
-  status: string,
   time: number,
   type: string,
   value: string,

package/src/types/saml.ts

@@ -0,0 +1,13 @@
+import { Types } from "mongoose";
+
+export interface SAMLType {
+  _id: Types.ObjectId,
+  createdAt: Date,
+  updatedAt: Date,
+  selector: string,
+  idp: string,
+  sp: string,
+  env: string,
+  name: string,
+  jumpPoint: string,
+}

package/build/models/schema/agency-saml.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"agency-saml.js","sourceRoot":"","sources":["../../../src/models/schema/agency-saml.ts"],"names":[],"mappings":";;AAKA,mCA2CC;AA3CD,SAAwB,gBAAgB,CAAC,QAAwB;IAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE5B,MAAM,UAAU,GAAG,IAAI,MAAM,CAAuB;QAClD,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,6EAA6E;SAC9E;QACD,GAAG,EAAE;YACH,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;QACD,EAAE,EAAE;YACF,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;QACD,GAAG,EAAE;YACH,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;QACD,mFAAmF;QACnF,wBAAwB;QACxB,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,EAAE;SACZ;KACF,EAAE;QACD,GAAG,EAAE,KAAK;QACV,EAAE,EAAE,KAAK;QACT,UAAU,EAAE,IAAI;QAChB,SAAS,EAAE,KAAK;QAChB,MAAM,EAAE;YACN,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,KAAK;SAClB;KACF,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/definitions/models/schema/agency-saml.d.ts

@@ -1,12 +0,0 @@
-import { MongooseModule } from "../../helpers";
-import { AgencySAMLSchemaType } from "../../types/agency";
-export default function AgencySAMLSchema(mongoose: MongooseModule): import("mongoose").Schema<AgencySAMLSchemaType, import("mongoose").Model<AgencySAMLSchemaType, any, any, any, import("mongoose").Document<unknown, any, AgencySAMLSchemaType, any, {}> & AgencySAMLSchemaType & {
-    _id: import("mongoose").Types.ObjectId;
-} & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, AgencySAMLSchemaType, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<AgencySAMLSchemaType>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<AgencySAMLSchemaType> & {
-    _id: import("mongoose").Types.ObjectId;
-} & {
-    __v: number;
-}>;
-//# sourceMappingURL=agency-saml.d.ts.map

package/definitions/models/schema/agency-saml.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"agency-saml.d.ts","sourceRoot":"","sources":["../../../src/models/schema/agency-saml.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,QAAQ,EAAE,cAAc;;;;;;;;GA2ChE"}