Merge branch 'master' into Automatic_version_update_dependabot

Author: rshrirohit

.github/workflows/build-and-deploy-dev.yml

@@ -138,4 +138,4 @@ jobs:
           {
             Remove-Item -LiteralPath 'E:/web/${{env.SitePath}}-PREVIOUS' -Force -Recurse
           }
-          Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force
+          Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force

.github/workflows/build-and-deploy-production.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/build-and-deploy-uat.yml

@@ -22,10 +22,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/continuous-integration-workflow.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup .NET Core SDK 6.0
+      - name: Setup .NET Core SDK 8.0
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
 
       - name: Add TechnologyEnhancedLearning as nuget package source
         run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

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/202503121538_Alter_SendExpiredTBCReminders.cs

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

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/202504281045_Alter_ReorderFrameworkCompetency.cs

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

DigitalLearningSolutions.Data.Migrations/202504281115_UpdateFrameworkCompetenciesOrdering.cs

@@ -0,0 +1,21 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+    [Migration(202504281115)]
+    public class UpdateFrameworkCompetenciesOrdering : ForwardOnlyMigration
+    {
+        public override void Up()
+        {
+            Execute.Sql(@"WITH Ranked AS (
+                        SELECT ID, 
+                               ROW_NUMBER() OVER (PARTITION BY FrameworkID ORDER BY SysStartTime) AS NewOrder
+                        FROM FrameworkCompetencies
+	                    Where FrameworkCompetencyGroupID  is null
+                        )
+                        UPDATE fc
+                        SET fc.Ordering = r.NewOrder
+                        FROM FrameworkCompetencies fc
+                        JOIN Ranked r ON fc.ID = r.ID;");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202504290900_UpdateNotifications.cs

@@ -0,0 +1,14 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202504290900)]
+    public class UpdateNotifications : ForwardOnlyMigration
+    {
+        public override void Up()
+        {
+            Execute.Sql(@$"UPDATE Notifications SET NotificationName = 'Completed course follow-up feedback requests' where NotificationID = 13");
+        }
+
+    }
+}