Merge branch 'develop' into feature/DEVSU-2932-add-create_project-permission

Author: bnguyen-bcgsc

app/middleware/acl.js

@@ -121,13 +121,16 @@ module.exports = async (req, res, next) => {
   try {
     // Update last time the user logged in, limit to once a day
     const currentDate = new Date().toDateString();
-    let userMetadata = await db.models.userMetadata.findOrCreate({where: {userId: req.user.id}});
+    let userMetadata = await db.models.userMetadata.findOrCreate({
+      where: {userId: req.user.id},
+      defaults: {updatedBy: req.user.id},
+    });
     userMetadata = userMetadata[0];
     const userLastLogin = userMetadata.lastLoginAt
       ? new Date(userMetadata.lastLoginAt).toDateString()
       : '';
     if (userLastLogin !== currentDate) {
-      await userMetadata.update({lastLoginAt: new Date()});
+      await userMetadata.update({lastLoginAt: new Date()}, {userId: req.user.id});
     }
 
     try {

app/routes/user/settings.js

@@ -21,11 +21,14 @@ router.route('/')
   })
   .put(async (req, res) => {
     try {
-      await db.models.userMetadata.update({settings: req.body}, {
+      await db.models.userMetadata.update({
+        settings: req.body,
+        updatedBy: req.user.id,
+      }, {
         where: {
           user_id: req.user.id,
         },
-        fields: ['settings'],
+        fields: ['settings', 'updatedBy'],
         hooks: false,
         limit: 1,
       });

app/routes/user/user.js

@@ -260,9 +260,15 @@ router.route('/')
       // Create transaction
       transaction = await db.transaction();
       // Create user
-      const createdUser = await db.models.user.create(req.body, {transaction});
+      const createdUser = await db.models.user.create({
+        ...req.body,
+        updatedBy: req.user.id,
+      }, {transaction});
       // Create user metadata
-      await db.models.userMetadata.create({userId: createdUser.id}, {transaction});
+      await db.models.userMetadata.create({
+        userId: createdUser.id,
+        updatedBy: req.user.id,
+      }, {transaction});
       // Commit changes
       await transaction.commit();
       // Return new user

test/routes/user/settings.test.js

@@ -68,6 +68,7 @@ describe('/user/settings', () => {
         where: {userId: testUser.id},
       });
       expect(results.length).toBe(1);
+      expect(results[0].updatedBy).toBe(testUser.id);
     });
   });
 });

test/routes/user/user.test.js

@@ -46,13 +46,17 @@ beforeAll(async () => {
 // Tests for user related endpoints
 describe('/user', () => {
   let testUser;
+  let managerUser;
   let adminGroup;
 
   beforeAll(async () => {
     // get test user
     testUser = await db.models.user.findOne({
       where: {username},
     });
+    managerUser = await db.models.user.findOne({
+      where: {username: managerUsername},
+    });
     adminGroup = await db.models.userGroup.findOne({
       where: {name: 'admin'},
     });
@@ -162,6 +166,16 @@ describe('/user', () => {
         })
         .expect(HTTP_STATUS.CREATED);
 
+      const createdUser = await db.models.user.findOne({
+        where: {ident: res.body.ident},
+      });
+      const createdMetadata = await db.models.userMetadata.findOne({
+        where: {userId: createdUser.id},
+      });
+
+      expect(createdUser.updatedBy).toBe(testUser.id);
+      expect(createdMetadata.updatedBy).toBe(testUser.id);
+
       // Remove test user from db
       await db.models.user.destroy({where: {ident: res.body.ident}, force: true});
     });
@@ -180,6 +194,16 @@ describe('/user', () => {
         })
         .expect(HTTP_STATUS.CREATED);
 
+      const createdUser = await db.models.user.findOne({
+        where: {ident: res.body.ident},
+      });
+      const createdMetadata = await db.models.userMetadata.findOne({
+        where: {userId: createdUser.id},
+      });
+
+      expect(createdUser.updatedBy).toBe(managerUser.id);
+      expect(createdMetadata.updatedBy).toBe(managerUser.id);
+
       // Remove test user from db
       await db.models.user.destroy({where: {ident: res.body.ident}, force: true});
     });