Merge pull request #278 from bcgsc/feature/DEVSU-2128-lastloginat

feature/DEVSU-2128
bcgsc · Nov 17, 2023 · 1f30bce · 1f30bce
2 parents bc1e897 + f0f5a25
commit 1f30bce
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 0 deletions.
diff --git a/app/middleware/acl.js b/app/middleware/acl.js
@@ -52,6 +52,16 @@ const SPECIAL_CASES = [
 ];
 
 module.exports = async (req, res, next) => {
+  // Update last time the user logged in, limit to once a day
+  const currentDate = new Date().toDateString();
+  const userLastLogin = req.user.lastLoginAt
+    ? new Date(req.user.lastLoginAt).toDateString()
+    : '';
+
+  if (userLastLogin !== currentDate) {
+    await req.user.update({lastLoginAt: new Date()});
+  }
+
   // Check if user is an admin
   if (isAdmin(req.user)) {
     return next();

diff --git a/app/models/user/user.js b/app/models/user/user.js
@@ -44,6 +44,12 @@ module.exports = (sequelize, Sq) => {
         schema: {type: 'string', format: 'email'},
       },
     },
+    lastLoginAt: {
+      name: 'lastLoginAt',
+      field: 'last_login_at',
+      type: Sq.DATE,
+      defaultValue: null,
+    },
   }, {
     ...DEFAULT_OPTIONS,
     indexes: [

diff --git a/migrations/20231117185810-DEVSU-2128-add-lastloginat.js b/migrations/20231117185810-DEVSU-2128-add-lastloginat.js
@@ -0,0 +1,20 @@
+const TABLE = 'users';
+
+module.exports = {
+  up: async (queryInterface, Sq) => {
+    return queryInterface.sequelize.transaction(async (transaction) => {
+      await queryInterface.addColumn(
+        TABLE,
+        'last_login_at',
+        {
+          type: Sq.DATE,
+        },
+        {transaction},
+      );
+    });
+  },
+
+  down: async () => {
+    throw new Error('Not Implemented!');
+  },
+};
diff --git a/test/routes/user/user.test.js b/test/routes/user/user.test.js
@@ -96,6 +96,23 @@ describe('/user', () => {
       checkUser(res.body);
     });
 
+    // Test that lastLoginAt is updated with a new request
+    test('/me - test if requests upload last_login_at 200 Success', async () => {
+      const res = await request
+        .get('/api/user/me')
+        .auth(username, password)
+        .type('json')
+        .expect(HTTP_STATUS.OK);
+
+      const loginDate = new Date(res.body.lastLoginAt);
+      const currentDate = new Date();
+
+      checkUser(res.body);
+      expect(
+        loginDate.toDateString() === currentDate.toDateString(),
+      ).toBe(true);
+    });
+
     // Test for GET /user/search 200 endpoint
     test('/search - 200 Success', async () => {
       // Create unique first name