tabletcommand-backend-models 5.17.40 → 5.18.1

package/src/models/agency.ts

@@ -9,7 +9,7 @@ import {
   ReplaceModelReturnType,
 } from "../helpers";
 
-export async function AgencyModule(mongoose: MongooseModule) {
+export function AgencySchema(mongoose: MongooseModule) {
   const { Schema, Types } = mongoose;
 
   const CrossStaffedUnit = createSchema(Schema, {
@@ -79,12 +79,12 @@ export async function AgencyModule(mongoose: MongooseModule) {
       default: false,
     },
     departmentId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Department",
       required: true
     },
     administrators: {
-      type: [mongoose.Schema.Types.ObjectId],
+      type: [Types.ObjectId],
       ref: "User",
       default: []
     },
@@ -109,6 +109,11 @@ export async function AgencyModule(mongoose: MongooseModule) {
   });
   modelSchema.set("autoIndex", false);
 
+  return modelSchema;
+}
+
+export async function AgencyModule(mongoose: MongooseModule) {
+  const modelSchema = AgencySchema(mongoose);
   return createModel(mongoose, "Agency", modelSchema);
 }
 

package/src/models/battalion.ts

@@ -15,7 +15,7 @@ import {
   retrieveCurrentUnixTime
 } from "../helpers";
 
-export async function BattalionModule(mongoose: MongooseModule) {
+export function BattalionSchema(mongoose: MongooseModule) {
   const { Schema, Types } = mongoose;
   const toJSONOpts = {
     virtuals: true,
@@ -81,7 +81,7 @@ export async function BattalionModule(mongoose: MongooseModule) {
       type: String,
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
@@ -131,7 +131,7 @@ export async function BattalionModule(mongoose: MongooseModule) {
       index: true,
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
@@ -175,7 +175,11 @@ export async function BattalionModule(mongoose: MongooseModule) {
       }
     });
   }
+  return modelSchema;
+}
 
+export async function BattalionModule(mongoose: MongooseModule) {
+  const modelSchema = BattalionSchema(mongoose);
   return createModel(mongoose, "Battalion", modelSchema);
 }
 

package/src/models/checklist.ts

@@ -16,7 +16,7 @@ import {
 
 import { ChecklistItemSchema } from "./checklist-item";
 
-export async function ChecklistModule(mongoose: MongooseModule) {
+export function ChecklistSchema(mongoose: MongooseModule) {
   const { Schema, Types } = mongoose;
 
   const ChecklistItem = ChecklistItemSchema(mongoose);
@@ -67,7 +67,7 @@ export async function ChecklistModule(mongoose: MongooseModule) {
       required: true
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
@@ -92,6 +92,11 @@ export async function ChecklistModule(mongoose: MongooseModule) {
     return this._id.toString();
   });
 
+  return modelSchema;
+}
+
+export async function ChecklistModule(mongoose: MongooseModule) {
+  const modelSchema = ChecklistSchema(mongoose);
   return createModel(mongoose, "Checklist", modelSchema);
 }
 

package/src/models/personnel-import.ts

@@ -9,7 +9,7 @@ import {
   ReplaceModelReturnType,
 } from "../helpers";
 
-export async function PersonnelImportModule(mongoose: MongooseModule) {
+export function PersonnelImportSchema(mongoose: MongooseModule) {
   const { Schema, Types } = mongoose;
 
   const modelSchema = createSchema(Schema, {
@@ -84,7 +84,7 @@ export async function PersonnelImportModule(mongoose: MongooseModule) {
       default: ""
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
@@ -97,6 +97,11 @@ export async function PersonnelImportModule(mongoose: MongooseModule) {
   });
   modelSchema.set("autoIndex", false);
 
+  return modelSchema;
+}
+
+export async function PersonnelImportModule(mongoose: MongooseModule) {
+  const modelSchema = PersonnelImportSchema(mongoose);
   return createModel(mongoose, "PersonnelImport", modelSchema);
 }
 

package/src/models/template.ts

@@ -14,7 +14,7 @@ import {
   retrieveCurrentUnixTime
 } from "../helpers";
 
-export async function TemplateModule(mongoose: MongooseModule) {
+export function TemplateSchema(mongoose: MongooseModule) {
   const { Schema, Types } = mongoose;
 
   const ChecklistOption = createSchema(Schema, {
@@ -101,7 +101,7 @@ export async function TemplateModule(mongoose: MongooseModule) {
       default: []
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
@@ -136,6 +136,11 @@ export async function TemplateModule(mongoose: MongooseModule) {
     });
   }
   // modelSchema.plugin(mongooseLeanVirtuals);
+  return modelSchema;
+}
+
+export async function TemplateModule(mongoose: MongooseModule) {
+  const modelSchema = TemplateSchema(mongoose);
   return createModel(mongoose, "Template", modelSchema);
 }
 

package/src/models/user.ts

@@ -15,8 +15,8 @@ import EsriAuthSchema from "./schema/esri-auth";
 import EsriErrorSchema from "./schema/esri-error";
 import PubNubTokenSchema from "./schema/pubnub-token";
 
-export async function UserModule(mongoose: MongooseModule) {
-  const { Schema } = mongoose;
+export function UserSchema(mongoose: MongooseModule) {
+  const { Schema, Types } = mongoose;
   const EsriAuth = EsriAuthSchema(mongoose);
   const EsriError = EsriErrorSchema(mongoose);
   const PubNubToken = PubNubTokenSchema(mongoose);
@@ -68,12 +68,12 @@ export async function UserModule(mongoose: MongooseModule) {
       type: Date,
     },
     agencyId: {
-      type: mongoose.Schema.Types.ObjectId,
+      type: Types.ObjectId,
       ref: "Agency",
       default: null,
     },
     managedAgencies: {
-      type: [mongoose.Schema.Types.ObjectId],
+      type: [Types.ObjectId],
       ref: "Agency",
       default: []
     },
@@ -255,6 +255,11 @@ export async function UserModule(mongoose: MongooseModule) {
     return this._id.toHexString();
   });
 
+  return modelSchema;
+}
+
+export async function UserModule(mongoose: MongooseModule) {
+  const modelSchema = UserSchema(mongoose);
   return createModel(mongoose, "User", modelSchema);
 }