tabletcommand-backend-models 7.1.1 → 7.2.0

package/src/models/session.ts

@@ -45,7 +45,6 @@ export default async function SessionModule(mongoose: MongooseModule) {
         validator: requiredButAllowEmptyString,
         message: "departmentId is required",
       },
-      index: true,
     },
     why: {
       type: String,
@@ -76,21 +75,65 @@ export default async function SessionModule(mongoose: MongooseModule) {
     },
   }, {
     autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+    }
   });
 
   modelSchema.pre("save", function(next) {
     this._id = this.get("token"); // Copy _id from token
     next();
   });
-  modelSchema.virtual("id").get(function(this: Session) {
-    return this._id.toString();
+
+  modelSchema.index({
+    departmentId: 1,
+    when: -1
+  }, {
+    name: "departmentId_1_when_-1",
+  });
+
+  // TODO: Review if this should be unique
+  modelSchema.index({
+    nick: 1,
+  }, {
+    name: "nick_1",
+    // unique: true,
   });
 
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
+  modelSchema.index({
+    token: 1,
+    active: 1
+  }, {
+    name: "token_1_active_1",
+  });
+
+  modelSchema.index({
+    token: 1,
+  }, {
+    name: "token_1_unique",
+    unique: true,
   });
 
+  modelSchema.index({
+    user: 1,
+    active: 1
+  }, {
+    name: "user_1_active_1",
+  });
+
+  modelSchema.index({
+    user: 1,
+    when: 1
+  }, {
+    name: "user_1_when_1",
+  });
+
+  modelSchema.index({
+    when: 1,
+  }, {
+    name: "when_1",
+  });
 
   return mongoose.model<Session>("Session", modelSchema, "sys_login", { overwriteModels: true });
 }

package/src/models/template.ts

@@ -78,7 +78,6 @@ export function TemplateSchema(mongoose: MongooseModule) {
     departmentId: {
       type: String,
       required: true,
-      index: true,
     },
     active: {
       type: Boolean,
@@ -103,19 +102,30 @@ export function TemplateSchema(mongoose: MongooseModule) {
     },
   }, {
     autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+      transform(doc, ret) {
+        strictSchema(doc.schema as typeof modelSchema, ret);
+      },
+    }
   });
   modelSchema.virtual("id").get(function(this: Template) {
     return this._id.toHexString();
   });
 
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
-    transform(doc, ret) {
-      strictSchema(doc.schema as typeof modelSchema, ret);
-    },
+  modelSchema.index({
+    departmentId: 1,
+  }, {
+    name: "departmentId_1",
   });
 
+  modelSchema.index({
+    uuid: 1,
+  }, {
+    name: "uuid_1_unique",
+    unique: true,
+  });
 
   function strictSchema(schema: typeof modelSchema, ret: Record<string, unknown>) {
     Object.keys(ret).forEach(function(element) {

package/src/models/user-device.ts

@@ -198,6 +198,26 @@ export default async function UserDeviceModule(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1,
+    userId: 1,
+  }, {
+    name: "departmentId_1_userId_1",
+  });
+
+  modelSchema.index({
+    "devices.token": 1,
+  }, {
+    name: "devices_token_1",
+  });
+
+  modelSchema.index({
+    userId: 1,
+  }, {
+    name: "userId_1_unique",
+    unique: true,
+  });
+
   return mongoose.model<UserDevice>("UserDevice", modelSchema, "massive_user_device", { overwriteModels: true });
 }
 

package/src/models/user-registration.ts

@@ -15,7 +15,6 @@ export default async function UserRegistrationModule(mongoose: MongooseModule) {
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     name: {
       type: String,
@@ -89,6 +88,12 @@ export default async function UserRegistrationModule(mongoose: MongooseModule) {
     autoIndex: false
   });
 
+  modelSchema.index({
+    email: 1,
+  }, {
+    name: "email_1",
+  });
+
   return mongoose.model<UserRegistration>("UserRegistration", modelSchema, "massive_user_registration", { overwriteModels: true });
 }
 

package/src/models/user.ts

@@ -36,12 +36,10 @@ export function UserSchema(mongoose: MongooseModule) {
     nick: {
       type: String,
       default: "",
-      index: true,
     },
     email: {
       type: String,
       default: "",
-      index: true,
     },
     name: {
       type: String,
@@ -55,7 +53,6 @@ export function UserSchema(mongoose: MongooseModule) {
       type: String,
       default: "",
       required: true,
-      index: true,
     },
     modified_date: {
       type: Date,
@@ -271,6 +268,10 @@ export function UserSchema(mongoose: MongooseModule) {
     },
   }, {
     autoIndex: false,
+    toJSON: {
+      virtuals: true,
+      versionKey: false,
+    }
   });
 
   // NO _id on User schema?
@@ -278,11 +279,68 @@ export function UserSchema(mongoose: MongooseModule) {
     return this._id.toHexString();
   });
 
-  modelSchema.set("toJSON", {
-    virtuals: true,
-    versionKey: false,
+  modelSchema.index({
+    departmentId: 1,
+  }, {
+    name: "departmentId_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    email: 1
+  }, {
+    name: "departmentId_1_email_1",
+  });
+
+  modelSchema.index({
+    departmentId: 1,
+    vehicle: 1
+  }, {
+    name: "departmentId_1_vehicle_1_partial",
+    partialFilterExpression: {
+      "vehicle": {
+        "$exists": true
+      }
+    }
+  });
+
+  modelSchema.index({
+    email: 1,
+  }, {
+    name: "email_1_unique",
+    unique: true,
   });
 
+  modelSchema.index({
+    nick: 1,
+  }, {
+    name: "nick_1_unique",
+    unique: true,
+  });
+
+  // A field has to be defined as text and weight  
+  modelSchema.index({
+    nick: "text",
+    email: "text",
+    name: "text",
+  }, {
+    name: "nick_text_email_text_name_text_mapId_text_arcGISAuth.username_text_vehicle.radioName_text",
+    weights: {
+      email: 10,
+      name: 1,
+      nick: 9,
+    },
+    textIndexVersion: 3,
+    language_override: "language",
+    default_language: "english",
+  });
+
+  modelSchema.index({
+    token: 1,
+    tokenExpireAt: 1
+  }, {
+    name: "token_1_tokenExpireAt_1",
+  });
 
   return modelSchema;
 }
@@ -292,4 +350,4 @@ export default async function UserModule(mongoose: MongooseModule) {
   return mongoose.model<User>("User", modelSchema, "sys_user", { overwriteModels: true });
 }
 
-export interface UserModel extends Model<User> { }
+export interface UserModel extends Model<User> { }

package/src/models/validation-report.ts

@@ -21,7 +21,6 @@ export function ValidationReportSchema(mongoose: MongooseModule) {
       type: Schema.Types.ObjectId,
       ref: "Department",
       required: true,
-      unique: true,
     },
     location: {
       type: [ValidationErrorItem],
@@ -59,6 +58,13 @@ export function ValidationReportSchema(mongoose: MongooseModule) {
     autoIndex: false,
   });
 
+  modelSchema.index({
+    departmentId: 1,
+  }, {
+    name: "departmentId_unique",
+    unique: true,
+  });
+
   return modelSchema;
 }
 

package/src/test/location.ts

@@ -18,6 +18,8 @@ describe("Location", function() {
       mongoose
     });
     testItem = mock.location;
+
+    await mock.beforeEach();
   });
   afterEach(async function() {
     await mongoose.disconnect();
@@ -74,8 +76,6 @@ describe("Location", function() {
 
     const found = await models.Location.findOne(geoQuery);
     assert.isObject(found);
-
-    await models.Location.collection.dropIndexes();
   });
 
   it("decodes .visibility", async function() {

package/src/test/mock.ts

@@ -22,8 +22,12 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     mongoose
   } = dependencies;
 
+  const ObjectId = mongoose.Types.ObjectId;
+
+  const departmentId = new ObjectId().toString();
+
   const mark43IncidentRetry = {
-    departmentId: "123",
+    departmentId,
     incidentNumber: "abc123",
     active: true,
     mark43IncidentId: 123,
@@ -935,7 +939,7 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
 
   const location = {
     _id: new mongoose.Types.ObjectId(),
-    departmentId: "d123",
+    departmentId,
     userId: "542a40db20783c000000153d",
     uuid: "92c8f732-52b7-46cc-855a-d54fddfe3172",
     username: "E23",
@@ -1341,6 +1345,7 @@ export default function mockModule(dependencies: { mongoose: Mongoose; }) {
     for (const coll of items ?? []) {
       // console.log(`Emptying ${coll.collectionName}.`);
       await coll.deleteMany({});
+      await coll.dropIndexes();
     }
   }
 

package/test.sh

@@ -17,7 +17,7 @@ if hash brew 2>/dev/null; then
     fi
 fi
 
-NODE_VERSION="v16.19.0"
+NODE_VERSION="v20.11.1"
 
 nvm use $NODE_VERSION || nvm install $NODE_VERSION