Merge pull request #3170 from TechnologyEnhancedLearning/Develop/Feature/TD-3712-UpdateLastAccessedDateForUsersDuringLogin

TD-3712 Update LastAccessed Date For Users During Login

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/LoginDataService.cs

@@ -0,0 +1,33 @@
+namespace DigitalLearningSolutions.Data.DataServices
+{
+    using Dapper;
+    using System.Data;
+
+    public interface ILoginDataService
+    {
+        void UpdateLastAccessedForUsersTable(int Id);
+    }
+
+    public class LoginDataService : ILoginDataService
+    {
+        private readonly IDbConnection connection;
+
+        public LoginDataService(IDbConnection connection)
+        {
+            this.connection = connection;
+        }
+
+        public void UpdateLastAccessedForUsersTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE Users SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+    }
+}

DigitalLearningSolutions.Web.Tests/Services/LoginServiceTests.cs

@@ -3,6 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
+    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models;
@@ -32,14 +33,15 @@ private static readonly (string?, List<(int centreId, string centreName, string
         private LoginService loginService = null!;
         private IUserService userService = null!;
         private IUserVerificationService userVerificationService = null!;
+        private ILoginDataService loginDataService = null!;
 
         [SetUp]
         public void Setup()
         {
             userVerificationService = A.Fake<IUserVerificationService>(x => x.Strict());
             userService = A.Fake<IUserService>(x => x.Strict());
 
-            loginService = new LoginService(userService, userVerificationService);
+            loginService = new LoginService(userService, userVerificationService, loginDataService);
         }
 
         [Test]

DigitalLearningSolutions.Web/Controllers/LoginController.cs

@@ -82,6 +82,13 @@ public async Task<IActionResult> Index(LoginViewModel model, string timeZone = "
 
             var loginResult = loginService.AttemptLogin(model.Username!.Trim(), model.Password!);
 
+            if (loginResult.LoginAttemptResult == LoginAttemptResult.LogIntoSingleCentre ||
+                loginResult.LoginAttemptResult == LoginAttemptResult.ChooseACentre)
+            {
+                loginService.UpdateLastAccessedForUsersTable(loginResult.UserEntity.UserAccount.Id);
+            }
+
+
             switch (loginResult.LoginAttemptResult)
             {
                 case LoginAttemptResult.InvalidCredentials:

DigitalLearningSolutions.Web/Services/LoginService.cs

@@ -5,10 +5,12 @@
     using System.Linq;
     using System.Security.Claims;
     using System.Threading.Tasks;
+    using DigitalLearningSolutions.Data.DataServices;
     using DigitalLearningSolutions.Data.Enums;
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models;
     using DigitalLearningSolutions.Data.Models.User;
+    using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Data.ViewModels;
     using DigitalLearningSolutions.Web.Helpers;
     using Microsoft.AspNetCore.Authentication;
@@ -28,6 +30,8 @@ List<int> idsOfCentresWithUnverifiedEmails
 
         bool CentreEmailIsVerified(int userId, int centreIdIfLoggingIntoSingleCentre);
 
+        void UpdateLastAccessedForUsersTable(int Id);
+
         Task<string> HandleLoginResult(
             LoginResult loginResult,
             TicketReceivedContext context,
@@ -41,11 +45,18 @@ public class LoginService : ILoginService
     {
         private readonly IUserService userService;
         private readonly IUserVerificationService userVerificationService;
+        private readonly ILoginDataService loginDataService;
 
-        public LoginService(IUserService userService, IUserVerificationService userVerificationService)
+        public LoginService(IUserService userService, IUserVerificationService userVerificationService, ILoginDataService loginDataService)
         {
             this.userService = userService;
             this.userVerificationService = userVerificationService;
+            this.loginDataService = loginDataService;
+        }
+
+        public void UpdateLastAccessedForUsersTable(int Id)
+        {
+           loginDataService.UpdateLastAccessedForUsersTable(Id);
         }
 
         public LoginResult AttemptLogin(string username, string password)

DigitalLearningSolutions.Web/Startup.cs

@@ -534,6 +534,7 @@ private static void RegisterDataServices(IServiceCollection services)
             services.AddScoped<IRequestSupportTicketDataService, RequestSupportTicketDataService>();
             services.AddScoped<ICentreApplicationsDataService, CentreApplicationsDataService>();
             services.AddScoped<ICentreSelfAssessmentsDataService, CentreSelfAssessmentsDataService>();
+            services.AddScoped<ILoginDataService, LoginDataService>();
         }
 
         private static void RegisterHelpers(IServiceCollection services)