Release 2024.29

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

@@ -33,12 +33,17 @@ jobs:
 
       - name: Add TechnologyEnhancedLearning as nuget package source
         run:  |
-              $nugetSources = dotnet nuget list source | Out-String; 
-                if(!($nugetSources -like "*TechnologyEnhancedLearning*")) 
-                { 
-                  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; 
-                }
-
+                $nugetSources = dotnet nuget list source | Out-String;
+                if($nugetSources -like "*TechnologyEnhancedLearning*")
+                {
+                  # Update the source (in case PAT has been updated)
+                  dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
+                  } 
+                  else
+                  {
+                    # Add the source
+                    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
+                    }
       - name: Dotnet publish 
         run: | 
           dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

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

@@ -34,11 +34,17 @@ jobs:
       - name: Add TechnologyEnhancedLearning as nuget package source
         run:  |
               $nugetSources = dotnet nuget list source | Out-String; 
-                if(!($nugetSources -like "*TechnologyEnhancedLearning*")) 
-                { 
-                  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; 
+              if($nugetSources -like "*TechnologyEnhancedLearning*") 
+              {
+                # Update the source (in case PAT has been updated)
+                dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
+                } 
+                else
+                {
+                  # Add the source
+                  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
                 }
-
+              
       - name: Dotnet publish 
         run: | 
           dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

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

@@ -10,10 +10,10 @@ jobs:
     name: Build and test
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup .NET Core SDK 6.0
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 6.0.x
 
@@ -27,12 +27,12 @@ jobs:
         run: dotnet test DigitalLearningSolutions.Web.Tests
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
       - name: Typescript install
-        run: yarn install --frozen-lockfile
+        run: yarn install --network-timeout 600000 --frozen-lockfile
         working-directory: ./DigitalLearningSolutions.Web
 
       - name: Typescript build

DigitalLearningSolutions.Data.Migrations/202305220753_AlterGetCompletedCoursesForCandidate.cs

@@ -0,0 +1,18 @@
+using FluentMigrator;
+
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    [Migration(202404091210)]
+    public class AlterGetCompletedCoursesForCandidate : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_4015_Update_GetCompletedCoursesForCandidate_proc_up);
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_4015_Update_GetCompletedCoursesForCandidate_proc_down);
+        }
+    }
+}
+

DigitalLearningSolutions.Data.Migrations/202401301650_AddGroupDelegatesConstraints.cs

@@ -0,0 +1,27 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202401301650)]
+    public class AddGroupDelegatesConstraints : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(
+                @"WITH duplicateRowNum AS (
+                    SELECT *, ROW_NUMBER() OVER (PARTITION BY GroupId,DelegateId ORDER BY AddedDate) rownum
+                    FROM GroupDelegates
+                    )
+                DELETE FROM duplicateRowNum WHERE rownum > 1;"
+            );
+
+            Create.UniqueConstraint("UQ_GroupDelegates_GroupID_DelegateID").OnTable("GroupDelegates")
+                .Columns("GroupID","DelegateID");
+        }
+
+        public override void Down()
+        {
+            Delete.UniqueConstraint("UQ_GroupDelegates_GroupID_DelegateID").FromTable("GroupDelegates");
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202403221110_UpdateCandidateAssessmentsNonReportable.cs

@@ -0,0 +1,24 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202403221110)]
+    public class UpdateCandidateAssessmentsNonReportable : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(
+                @$"UPDATE CandidateAssessments
+                    SET NonReportable= 1
+                    FROM CandidateAssessments AS CA
+                    INNER JOIN CandidateAssessmentSupervisors AS CAS ON CA.ID = cas.CandidateAssessmentID AND CAS.Removed IS NULL
+                    INNER JOIN SupervisorDelegates AS SD ON SD.ID = CAS.SupervisorDelegateId
+                    INNER JOIN AdminAccounts AS AA ON AA.ID = SD.SupervisorAdminID AND AA.UserID = SD.DelegateUserID
+                    WHERE NonReportable = 0"
+                );
+        }
+        public override void Down()
+        {
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202404120935_InactivateDelegateAccountsWithNoEmail.cs

@@ -0,0 +1,19 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202404120935)]
+    public class InactivateDelegateAccountsWithNoEmail : ForwardOnlyMigration
+    {
+        public override void Up()
+        {
+            Execute.Sql(
+                @$"UPDATE DelegateAccounts
+                    SET       Active = 0
+                    FROM   Users AS u INNER JOIN
+                                 DelegateAccounts ON u.ID = DelegateAccounts.UserID
+                    WHERE (NOT (u.PrimaryEmail LIKE N'%@%')) AND (DelegateAccounts.Active = 1)"
+                );
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202404231652_RemoveDuplicateDelegatesFromDelegateGroups.cs

@@ -0,0 +1,20 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202404231652)]
+    public class RemoveDuplicateDelegatesFromDelegateGroups : ForwardOnlyMigration
+    {
+        public override void Up()
+        {
+            Execute.Sql(
+                @$"WITH GroupDelegatesCTE AS (
+                        SELECT *,
+                               ROW_NUMBER() OVER (PARTITION BY GroupID, DelegateID ORDER BY GroupDelegateID) AS rn
+                        FROM GroupDelegates
+                    )
+                    DELETE FROM GroupDelegatesCTE WHERE rn > 1;"
+                );
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/202405031044_AlterGetCurrentCoursesForCandidate_V2.cs

@@ -0,0 +1,19 @@
+namespace DigitalLearningSolutions.Data.Migrations
+{
+    using FluentMigrator;
+
+    [Migration(202405231044)]
+    public class AlterGetCurrentCoursesForCandidate_V2 : Migration
+    {
+        public override void Up()
+        {
+            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_up );
+            Execute.Sql(Properties.Resources.TD_3671_Alter_CheckDelegateStatusForCustomisation_func_up );
+        }
+        public override void Down()
+        {
+            Execute.Sql(Properties.Resources.TD_3671_Alter_GetCurrentCoursesForCandidate_V2_proc_down);
+            Execute.Sql(Properties.Resources.TD_3671_Alter_CheckDelegateStatusForCustomisation_func_down);
+        }
+    }
+}

DigitalLearningSolutions.Data.Migrations/DigitalLearningSolutions.Data.Migrations.csproj

@@ -1,43 +1,43 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Resources\CookiePolicy.txt" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\CookiePolicy.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.123" />
-    <PackageReference Include="FluentMigrator" Version="3.2.9" />
-    <PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.2.9" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\CookiePolicy.txt" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\CookiePolicy.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Dapper" Version="2.1.24" />
+    <PackageReference Include="FluentMigrator" Version="3.3.2" />
+    <PackageReference Include="FluentMigrator.Extensions.SqlServer" Version="3.3.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="202104220853_FixCustomisationUpdateSPs.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>