Dls release v1.2.1

DigitalLearningSolutions.Data.Migrations/202503111500_AddLastAccessedColumn.cs

@@ -0,0 +1,26 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202503111500)]
+    public class AddLastAccessedColumn : Migration
+    {
+        public override void Up()
+        {
+            Alter.Table("Users").AddColumn("LastAccessed").AsDateTime().Nullable();
+            Alter.Table("DelegateAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
+            Alter.Table("AdminAccounts").AddColumn("LastAccessed").AsDateTime().Nullable();
+
+            Execute.Sql("UPDATE u SET LastAccessed = (SELECT MAX(s.LoginTime) FROM DelegateAccounts da JOIN Sessions s ON da.ID = s.CandidateId WHERE da.UserID = u.ID) FROM users u;");
+            Execute.Sql("UPDATE da SET LastAccessed = (SELECT MAX(s.LoginTime) FROM Sessions s WHERE s.CandidateId = da.ID) FROM DelegateAccounts da;");
+            Execute.Sql("UPDATE da SET LastAccessed = (SELECT ca.LastAccessed FROM CandidateAssessments ca WHERE ca.ID = da.ID) FROM DelegateAccounts da where da.LastAccessed IS NULL;");
+            Execute.Sql("UPDATE AA SET LastAccessed = (SELECT MAX(AdS.LoginTime) FROM AdminSessions AdS WHERE AdS.AdminID = AA.ID) FROM AdminAccounts AA;");
+        }
+        public override void Down()
+        {
+            Delete.Column("LastAccessed").FromTable("Users");
+            Delete.Column("LastAccessed").FromTable("DelegateAccounts");
+            Delete.Column("LastAccessed").FromTable("AdminAccounts");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/2025041161520_Alter_SendExpiredTBCReminders_AppendCourseName.cs

@@ -0,0 +1,19 @@
+
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(2025041161520)]
+    public class Alter_SendExpiredTBCReminders_AppendCourseName : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_5514_Alter_SendExpiredTBCReminders_Down);
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/Properties/Resources.resx

@@ -475,4 +475,10 @@
   <data name="TD_5412_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Scripts\TD-5412-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
   </data>
+  <data name="TD_5514_Alter_SendExpiredTBCReminders_Down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Down.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
+  <data name="TD_5514_Alter_SendExpiredTBCReminders_Up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Scripts\TD-5514-Alter_SendExpiredTBCReminders_Up.sql;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-16</value>
+  </data>
 </root>

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -277,13 +277,22 @@ public class FrameworkDataService : IFrameworkDataService
             OwnerAdminID,
             (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 FROM AdminUsers WHERE (AdminID = FW.OwnerAdminID)) AS Owner,
             BrandID,
-            CategoryID,
+            FW.CategoryID,
             TopicID,
             CreatedDate,
             PublishStatusID,
             UpdatedByAdminID,
             (SELECT Forename + ' ' + Surname + (CASE WHEN Active = 1 THEN '' ELSE ' (Inactive)' END) AS Expr1 FROM AdminUsers AS AdminUsers_1 WHERE (AdminID = FW.UpdatedByAdminID)) AS UpdatedBy,
-            CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN fwc.CanModify = 1 THEN 2 WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
+            CASE
+                WHEN (aa.UserID = (SELECT UserID FROM AdminAccounts WHERE ID = @adminId)) THEN 3
+                WHEN (fwc.CanModify = 1) OR
+                    (SELECT COUNT(*) 
+				        FROM FrameworkCollaborators fc
+				        JOIN AdminAccounts aa1 ON fc.AdminID = aa1.ID
+				        WHERE fc.FrameworkID = fw.ID
+				        AND fc.CanModify = 1 AND fc.IsDeleted = 0
+				        AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = 12842)) > 0 THEN 2
+                WHEN fwc.CanModify = 0 THEN 1 ELSE 0 END AS UserRole,
             fwr.ID AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
@@ -304,9 +313,9 @@ FROM    CourseTopics
         private const string FlagFields = @"fl.ID AS FlagId, fl.FrameworkId, fl.FlagName, fl.FlagGroup, fl.FlagTagClass";
 
         private const string FrameworkTables =
-            @"Frameworks AS FW LEFT OUTER JOIN
-             FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND COALESCE(IsDeleted, 0) = 0
-            LEFT OUTER JOIN FrameworkReviews AS fwr ON fwc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL";
+            @"Frameworks AS FW INNER JOIN AdminAccounts AS aa ON aa.ID = fw.OwnerAdminID
+                LEFT OUTER JOIN FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND COALESCE(IsDeleted, 0) = 0
+                LEFT OUTER JOIN FrameworkReviews AS fwr ON fwc.ID = fwr.FrameworkCollaboratorID AND fwr.Archived IS NULL AND fwr.ReviewComplete IS NULL";
 
         private const string AssessmentQuestionFields =
             @"SELECT AQ.ID, AQ.Question, AQ.MinValue, AQ.MaxValue, AQ.AssessmentQuestionInputTypeID, AQI.InputTypeName, AQ.AddedByAdminId, CASE WHEN AQ.AddedByAdminId = @adminId THEN 1 ELSE 0 END AS UserIsOwner, AQ.CommentsPrompt, AQ.CommentsHint";
@@ -707,7 +716,7 @@ FROM            [FrameworkCompetencies]
                     new { competencyId, frameworkCompetencyGroupID }
                 );
             }
-            if(addDefaultQuestions)
+            if (addDefaultQuestions)
             {
                 AddDefaultQuestionsToCompetency(competencyId, frameworkId);
             }

DigitalLearningSolutions.Data/DataServices/LoginDataService.cs

@@ -0,0 +1,63 @@
+namespace DigitalLearningSolutions.Data.DataServices
+{
+    using Dapper;
+    using System.Data;
+
+    public interface ILoginDataService
+    {
+        void UpdateLastAccessedForUsersTable(int Id);
+
+        void UpdateLastAccessedForDelegatesAccountsTable(int Id);
+
+        void UpdateLastAccessedForAdminAccountsTable(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
+                }
+            );
+        }
+
+        public void UpdateLastAccessedForDelegatesAccountsTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE DelegateAccounts SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+
+        public void UpdateLastAccessedForAdminAccountsTable(int Id)
+        {
+            connection.Execute(
+                @"UPDATE AdminAccounts SET
+                        LastAccessed = GetUtcDate()
+                WHERE ID = @Id",
+                new
+                {
+                    Id
+                }
+            );
+        }
+    }
+}

DigitalLearningSolutions.Data/DataServices/UserDataService/AdminUserDataService.cs

@@ -105,6 +105,7 @@ FROM AdminAccounts AS aa
                 aa.IsSupervisor,
                 aa.IsTrainer,
                 aa.CategoryID,
+                aa.LastAccessed,
                 CASE
                     WHEN aa.CategoryID IS NULL THEN 'All'
                     ELSE cc.CategoryName
@@ -369,7 +370,7 @@ public IEnumerable<AdminAccount> GetAdminAccountsByUserId(int userId)
             }
 
             string BaseSelectQuery = $@"SELECT aa.ID, aa.UserID, aa.CentreID, aa.Active, aa.IsCentreAdmin, aa.IsReportsViewer, aa.IsSuperAdmin, aa.IsCentreManager, 
-		                                aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
+		                                aa.LastAccessed, aa.IsContentManager, aa.IsContentCreator, aa.IsSupervisor, aa.IsTrainer, aa.CategoryID, aa.IsFrameworkDeveloper, aa.IsFrameworkContributor,aa.ImportOnly,
 		                                aa.IsWorkforceManager, aa.IsWorkforceContributor, aa.IsLocalWorkforceManager, aa.IsNominatedSupervisor,
 		                                u.ID, u.PrimaryEmail, u.FirstName, u.LastName, u.Active, u.FailedLoginCount,
 		                                c.CentreID, c.CentreName,

DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs

@@ -87,6 +87,7 @@ FROM DelegateAccounts AS da
 				c.CentreName,
 				da.CentreID,
 				da.DateRegistered,
+                da.LastAccessed,
 				da.RegistrationConfirmationHash,
 				c.Active AS CentreActive,
 				COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,
@@ -124,6 +125,7 @@ FROM AdminAccounts aa
                 c.CentreName,
                 da.CentreID,
                 da.DateRegistered,
+                da.LastAccessed,
                 da.RegistrationConfirmationHash,
                 c.Active AS CentreActive,
                 COALESCE(ucd.Email, u.PrimaryEmail) AS EmailAddress,

DigitalLearningSolutions.Data/DataServices/UserDataService/UserDataService.cs

@@ -308,6 +308,7 @@ public partial class UserDataService : IUserDataService
                 u.ProfessionalRegistrationNumber,
                 u.ProfileImage,
                 u.Active,
+                u.LastAccessed,
                 u.ResetPasswordID,
                 u.TermsAgreed,
                 u.FailedLoginCount,
@@ -619,6 +620,7 @@ public void UpdateUserDetailsAccount(string firstName, string lastName, string p
                 ce.CentreName,
                 ce.Active AS CentreActive,
                 da.DateRegistered,
+                da.LastAccessed,
                 da.CandidateNumber,
                 da.Approved,
                 da.SelfReg,

DigitalLearningSolutions.Data/Models/SuperAdmin/SuperAdminDelegateAccount.cs

@@ -19,6 +19,7 @@ public SuperAdminDelegateAccount(DelegateEntity delegateEntity)
             LearningHubAuthId = delegateEntity.UserAccount.LearningHubAuthId;
             RegistrationConfirmationHash = delegateEntity.DelegateAccount.RegistrationConfirmationHash;
             DateRegistered = delegateEntity.DelegateAccount.DateRegistered;
+            LastAccessed = delegateEntity.DelegateAccount.LastAccessed;
             SelfReg = delegateEntity.DelegateAccount.SelfReg;
             Active = delegateEntity.DelegateAccount.Active;
             EmailVerified = delegateEntity.UserAccount.EmailVerified;

DigitalLearningSolutions.Data/Models/User/AdminAccount.cs

@@ -1,5 +1,7 @@
 namespace DigitalLearningSolutions.Data.Models.User
 {
+    using System;
+
     public class AdminAccount
     {
         public int Id { get; set; }
@@ -26,6 +28,7 @@ public class AdminAccount
         public bool IsWorkforceContributor { get; set; }
         public bool IsLocalWorkforceManager { get; set; }
         public bool IsNominatedSupervisor { get; set; }
+        public DateTime? LastAccessed { get; set; }
 
         public bool IsCmsAdministrator => ImportOnly && IsContentManager;
         public bool IsCmsManager => IsContentManager && !ImportOnly;

DigitalLearningSolutions.Data/Models/User/AdminEntity.cs

@@ -3,6 +3,7 @@
     using DigitalLearningSolutions.Data.Helpers;
     using DigitalLearningSolutions.Data.Models.Centres;
     using DigitalLearningSolutions.Data.Models.SearchSortFilterPaginate;
+    using System;
 
     public class AdminEntity : BaseSearchableItem
     {
@@ -72,6 +73,7 @@ public override string SearchableName
         public bool IsSuperAdmin => AdminAccount.IsSuperAdmin;
         public bool IsReportsViewer => AdminAccount.IsReportsViewer;
         public bool IsActive => AdminAccount.Active;
+        public DateTime? LastAccessed => AdminAccount.LastAccessed;
 
     }
 }

DigitalLearningSolutions.Data/Models/User/DelegateAccount.cs

@@ -12,6 +12,7 @@ public class DelegateAccount
         public bool CentreActive { get; set; }
         public string CandidateNumber { get; set; } = string.Empty;
         public DateTime DateRegistered { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public string? Answer1 { get; set; }
         public string? Answer2 { get; set; }
         public string? Answer3 { get; set; }

DigitalLearningSolutions.Data/Models/User/DelegateUser.cs

@@ -9,6 +9,7 @@ public class DelegateUser : User
         public int UserId { get; set; }
         public string CandidateNumber { get; set; } = string.Empty;
         public DateTime? DateRegistered { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public int JobGroupId { get; set; }
         public string? JobGroupName { get; set; }
         public string? Answer1 { get; set; }

DigitalLearningSolutions.Data/Models/User/DelegateUserCard.cs

@@ -23,6 +23,7 @@ public DelegateUserCard(DelegateEntity delegateEntity)
             Password = delegateEntity.UserAccount.PasswordHash;
             CandidateNumber = delegateEntity.DelegateAccount.CandidateNumber;
             DateRegistered = delegateEntity.DelegateAccount.DateRegistered;
+            LastAccessed = delegateEntity.DelegateAccount.LastAccessed;
             JobGroupId = delegateEntity.UserAccount.JobGroupId;
             JobGroupName = delegateEntity.UserAccount.JobGroupName;
             Answer1 = delegateEntity.DelegateAccount.Answer1;

DigitalLearningSolutions.Data/Models/User/UserAccount.cs

@@ -14,6 +14,7 @@ public class UserAccount
         public string? ProfessionalRegistrationNumber { get; set; }
         public byte[]? ProfileImage { get; set; }
         public bool Active { get; set; }
+        public DateTime? LastAccessed { get; set; }
         public int? ResetPasswordId { get; set; }
         public DateTime? TermsAgreed { get; set; }
         public int FailedLoginCount { get; set; }

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]