.github/workflows/build-and-push-image.yml

@@ -46,12 +46,12 @@ jobs:
   deploy-image:
     name: Deploy '${{ needs.set-env.outputs.branch }}' to ${{ needs.set-env.outputs.environment }}
     needs: [ set-env ]
-    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.2.0
+    uses: DFE-Digital/deploy-azure-container-apps-action/.github/workflows/build-push-deploy.yml@v2.5.0
     with:
       docker-image-name: 'acatran-app'
       docker-build-file-name: './Dockerfile'
       environment: ${{ needs.set-env.outputs.environment }}
-      annotate-release: ${{ needs.set-env.outputs.environment == 'dev' }}
+      annotate-release: true
       docker-build-args: |
         COMMIT_SHA="${{ needs.set-env.outputs.checked-out-sha }}"
     secrets:

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

@@ -28,7 +28,7 @@ jobs:
           fi
 
       - name: Validate Terraform docs
-        uses: terraform-docs/gh-actions@v1.2.0
+        uses: terraform-docs/gh-actions@v1.3.0
         with:
           working-dir: terraform
           config-file: .terraform-docs.yml
@@ -40,19 +40,19 @@ jobs:
         run: rm ./terraform/backend.tf
 
       - name: Run a Terraform init
-        uses: docker://hashicorp/terraform:1.8.4
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform init
 
       - name: Run a Terraform validate
-        uses: docker://hashicorp/terraform:1.8.4
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform validate
 
       - name: Run a Terraform format check
-        uses: docker://hashicorp/terraform:1.8.4
+        uses: docker://hashicorp/terraform:1.9.6
         with:
           entrypoint: terraform
           args: -chdir=terraform fmt -check=true -diff=true

.github/workflows/docker-build.yml

@@ -0,0 +1,25 @@
+name: Run Docker build
+
+on:
+  pull_request:
+    paths:
+      - Dockerfile
+    types: [opened, synchronize]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build docker image
+        uses: docker/build-push-action@v6
+        with:
+          secrets: github_token=${{ secrets.GITHUB_TOKEN }}
+          cache-from: type=gha
+          cache-to: type=gha
+          push: false

.github/workflows/docker-test.yml

@@ -0,0 +1,47 @@
+name: Scan Docker image
+
+on:
+  push:
+    branches: main
+
+jobs:
+  scan:
+    runs-on: ubuntu-latest
+    outputs:
+      image: ${{ steps.build.outputs.imageid }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build docker image
+        uses: docker/build-push-action@v6
+        id: build
+        with:
+          secrets: github_token=${{ secrets.GITHUB_TOKEN }}
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha
+          push: false
+
+      - name: Export docker image as tar
+        run: docker save -o ${{ github.ref_name }}.tar ${{ steps.build.outputs.imageid }}
+
+      - name: Scan Docker image for CVEs
+        uses: aquasecurity/trivy-action@0.24.0
+        with:
+          input: ${{ github.ref_name }}.tar
+          format: 'sarif'
+          output: 'trivy-results.sarif'
+          limit-severities-for-sarif: true
+          ignore-unfixed: true
+          severity: 'CRITICAL,HIGH'
+          github-pat: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload scan results to GitHub Security
+        uses: github/codeql-action/upload-sarif@v3
+        if: always()
+        with:
+          sarif_file: 'trivy-results.sarif'

Dfe.PrepareTransfers.Data.TRAMS.Tests/Dfe.PrepareTransfers.Data.TRAMS.Tests.csproj

@@ -13,11 +13,11 @@
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
 		<PackageReference Include="Moq" Version="4.20.70" />
 		<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
-		<PackageReference Include="xunit" Version="2.7.0" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+		<PackageReference Include="xunit" Version="2.9.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

Dfe.PrepareTransfers.Data.TRAMS/Mappers/Request/InternalProjectToUpdateMapper.cs

@@ -47,13 +47,14 @@ public static TransferProjectCreate MapToCreate(Project input)
             {
                 OutgoingTrustUkprn = input.OutgoingTrustUkprn,
                 OutgoingTrustName = input.OutgoingTrustName,
-                TransferringAcademies = input.TransferringAcademies.Select(x => 
-                new Models.AcademyTransferProject.TransferringAcademy() { 
-                    IncomingTrustUkprn = x.IncomingTrustUkprn, 
-                    IncomingTrustName = x.IncomingTrustName, 
+                TransferringAcademies = input.TransferringAcademies.Select(x =>
+                new Models.AcademyTransferProject.TransferringAcademy()
+                {
+                    IncomingTrustUkprn = x.IncomingTrustUkprn,
+                    IncomingTrustName = x.IncomingTrustName,
                     OutgoingAcademyUkprn = x.OutgoingAcademyUkprn,
                     Region = x.Region,
-                    LocalAuthority = x.LocalAuthority             
+                    LocalAuthority = x.LocalAuthority
                 }).ToList(),
                 IsFormAMat = input.IsFormAMat
             };
@@ -87,11 +88,24 @@ public static AcademyTransferProjectDates Dates(Project input)
             {
                 HtbDate = input.Dates.HasHtbDate != false && input.Dates.Htb != null ? DateTime.ParseExact(input.Dates.Htb, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
                 HasHtbDate = input.Dates.HasHtbDate,
+                PreviousAdvisoryBoardDate = input.Dates.PreviousAdvisoryBoardDate != null ? DateTime.ParseExact(input.Dates.PreviousAdvisoryBoardDate, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
                 TargetDateForTransfer = input.Dates.HasTargetDateForTransfer != false && input.Dates.Target != null ? DateTime.ParseExact(input.Dates.Target, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
-                HasTargetDateForTransfer = input.Dates.HasTargetDateForTransfer
+                HasTargetDateForTransfer = input.Dates.HasTargetDateForTransfer,
+                IsCompleted = input.Dates.IsCompleted
+            };
+        }
+        public static AcademyTransferTargetProjectDates TargetDates(Project input)
+        {
+            return new AcademyTransferTargetProjectDates
+            {
+                HtbDate = input.Dates.HasHtbDate != false && input.Dates.Htb != null ? DateTime.ParseExact(input.Dates.Htb, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
+                HasHtbDate = input.Dates.HasHtbDate,
+                PreviousAdvisoryBoardDate = input.Dates.PreviousAdvisoryBoardDate != null ? DateTime.ParseExact(input.Dates.PreviousAdvisoryBoardDate, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
+                TargetDateForTransfer = input.Dates.HasTargetDateForTransfer != false && input.Dates.Target != null ? DateTime.ParseExact(input.Dates.Target, "dd/MM/yyyy", CultureInfo.InvariantCulture).ToString("u") : null,
+                HasTargetDateForTransfer = input.Dates.HasTargetDateForTransfer,
+                IsCompleted = input.Dates.IsCompleted
             };
         }
-
         public static AcademyTransferProjectLegalRequirements LegalRequirements(Project input)
         {
             return new AcademyTransferProjectLegalRequirements()

Dfe.PrepareTransfers.Data.TRAMS/Mappers/Response/AcademisationProjectMapper.cs

@@ -109,9 +109,11 @@ private static TransferDates Dates(AcademisationProject input)
             return new TransferDates
             {
                 Htb = input.Dates.HtbDate,
+                PreviousAdvisoryBoardDate = input.Dates.PreviousAdvisoryBoardDate,
                 Target = input.Dates.TargetDateForTransfer,
                 HasHtbDate = input.Dates.HasHtbDate,
-                HasTargetDateForTransfer = input.Dates.HasTargetDateForTransfer
+                HasTargetDateForTransfer = input.Dates.HasTargetDateForTransfer,
+                IsCompleted = input.Dates.IsCompleted
             };
         }
 

Dfe.PrepareTransfers.Data.TRAMS/Models/AcademyTransferProject/AcademyTransferProjectDates.cs

@@ -3,8 +3,10 @@ namespace Dfe.PrepareTransfers.Data.TRAMS.Models.AcademyTransferProject
     public class AcademyTransferProjectDates
     {
         public string HtbDate { get; set; }
+        public string PreviousAdvisoryBoardDate { get; set; }
         public bool? HasHtbDate { get; set; }
         public string TargetDateForTransfer { get; set; }
         public bool? HasTargetDateForTransfer { get; set; }
+        public bool? IsCompleted { get; set; }
     }
 }

Dfe.PrepareTransfers.Data.TRAMS/Models/AcademyTransferProject/AcademyTransferTargetProjectDates.cs

@@ -0,0 +1,17 @@
+using Dfe.PrepareTransfers.Data.Models;
+using System.Collections.Generic;
+
+namespace Dfe.PrepareTransfers.Data.TRAMS.Models.AcademyTransferProject
+{
+    public class AcademyTransferTargetProjectDates
+    {
+        public string HtbDate { get; set; }
+        public string PreviousAdvisoryBoardDate { get; set; }
+        public bool? HasHtbDate { get; set; }
+        public string TargetDateForTransfer { get; set; }
+        public bool? HasTargetDateForTransfer { get; set; }
+        public bool? IsCompleted { get; set; }
+        public string? ChangedBy { get; set; }
+        public List<ReasonChange>? ReasonsChanged { get; set; }
+    }
+}

Dfe.PrepareTransfers.Data.TRAMS/TramsProjectsRepository.cs

@@ -1,5 +1,4 @@
 using Dfe.PrepareTransfers.Data.Models;
-using Dfe.PrepareTransfers.Data.Models.Projects;
 using Dfe.PrepareTransfers.Data.TRAMS.Mappers.Request;
 using Dfe.PrepareTransfers.Data.TRAMS.Models;
 using Dfe.PrepareTransfers.Data.TRAMS.Models.AcademyTransferProject;
@@ -78,7 +77,7 @@ public async Task<RepositoryResult<Project>> GetByUrn(string urn)
             if (response.IsSuccessStatusCode)
             {
                 var apiResponse = await response.Content.ReadAsStringAsync();
-                var project = JsonConvert.DeserializeObject<AcademisationProject>(apiResponse);
+                AcademisationProject project = JsonConvert.DeserializeObject<AcademisationProject>(apiResponse);
 
                 #region API Interim
 
@@ -242,7 +241,23 @@ public async Task<bool> UpdateDates(Project project)
             // stay inline with current pattern
             throw new TramsApiException(response);
         }
+        public async Task<bool> UpdateDates(Project project, List<ReasonChange> reasonsChanged, string ChangedBy)
+        {
+            AcademyTransferTargetProjectDates dates = InternalProjectToUpdateMapper.TargetDates(project);
 
+            dates.ChangedBy = ChangedBy;
+            dates.ReasonsChanged = reasonsChanged;
+            var content = new StringContent(JsonConvert.SerializeObject(dates), Encoding.Default,
+               "application/json");
+            HttpResponseMessage response = await _academisationHttpClient.PutAsync($"transfer-project/{project.Urn}/set-transfer-dates", content);
+            if (response.IsSuccessStatusCode)
+            {
+                return true;
+            }
+
+            // stay inline with current pattern
+            throw new TramsApiException(response);
+        }
         public async Task<bool> UpdateAcademy(string projectUrn, Data.Models.Projects.TransferringAcademy transferringAcademy)
         {
             var academy = InternalProjectToUpdateMapper.TransferringAcademy(transferringAcademy);
@@ -428,5 +443,19 @@ public async Task<ApiResponse<ProjectFilterParameters>> GetFilterParameters()
 
             return new ApiResponse<ProjectFilterParameters>(response.StatusCode, filterParameters);
         }
+        public async Task<IEnumerable<OpeningDateHistoryDto>> GetOpeningDateHistory(int urn)
+        {
+            HttpResponseMessage response = await _academisationHttpClient.GetAsync($"transfer-project/{urn}/opening-date-history");
+            if (response.IsSuccessStatusCode)
+            {
+                var apiResponse = await response.Content.ReadAsStringAsync();
+                return JsonConvert.DeserializeObject<IEnumerable<OpeningDateHistoryDto>>(apiResponse);
+            }
+            if (response.StatusCode is System.Net.HttpStatusCode.NotFound)
+            {
+                return null;
+            }
+            throw new TramsApiException(response);
+        }
     }
 }

Dfe.PrepareTransfers.Data.Tests/Dfe.PrepareTransfers.Data.Tests.csproj

@@ -8,9 +8,9 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.7.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

Dfe.PrepareTransfers.Data/IProjects.cs

@@ -18,6 +18,7 @@ public interface IProjects
         public Task<bool> UpdateGeneralInfomation(Project project);
         public Task<bool> UpdateLegalRequirements(Project project);
         public Task<bool> UpdateDates(Project project);
+        public Task<bool> UpdateDates(Project project, List<ReasonChange> reasonsChanged, string ChangedBy);
         public Task<bool> UpdateAcademy(string urn, TransferringAcademy academy);
         public Task<bool> UpdateAcademyGeneralInformation(string projectUrn, TransferringAcademy transferringAcademy);
         public Task<bool> UpdateStatus(Project project);
@@ -26,5 +27,6 @@ public interface IProjects
         public Task<bool> AssignUser(Project project);
         public Task<ApiResponse<FileStreamResult>> DownloadProjectExport(GetProjectSearchModel searchModel);
         public Task<ApiResponse<ProjectFilterParameters>> GetFilterParameters();
+        public Task<IEnumerable<OpeningDateHistoryDto>> GetOpeningDateHistory(int urn);
     }
 }

Dfe.PrepareTransfers.Data/Models/OpeningDateHistoryDto.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace Dfe.PrepareTransfers.Data.Models
+{
+    public class OpeningDateHistoryDto
+    {
+        public DateTime ChangedAt { get; set; }
+        public string ChangedBy { get; set; }
+        public DateTime? OldDate { get; set; }
+        public DateTime? NewDate { get; set; }
+        public List<ReasonChange> ReasonsChanged { get; set; }
+    }
+    public class ReasonChange
+    {
+        public ReasonChange(string heading, string details)
+        {
+            Heading = heading;
+            Details = details;
+        }
+
+        public string Heading { get; set; }
+        public string Details { get; set; }
+
+    }
+}

Dfe.PrepareTransfers.Data/Models/Project.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
 using Dfe.PrepareTransfers.Data.Models.Projects;
 using Dfe.PrepareTransfers.Web.Models;
+using System.Collections.Generic;
 
 namespace Dfe.PrepareTransfers.Data.Models
 {
@@ -22,7 +22,6 @@ public Project()
         public string Reference { get; set; }
         public string OutgoingTrustUkprn { get; set; }
         public string OutgoingTrustName { get; set; }
-
         public string State { get; set; }
         public string Status { get; set; }
         public List<TransferringAcademy> TransferringAcademies { get; set; }

Dfe.PrepareTransfers.Data/Models/Projects/TransferDates.cs

@@ -4,8 +4,11 @@ public class TransferDates
     {
         public string Target { get; set; }
         public string Htb { get; set; }
+        public string PreviousAdvisoryBoardDate { get; set; }
+
 
         public bool? HasHtbDate { get; set; }
         public bool? HasTargetDateForTransfer { get; set; }
+        public bool? IsCompleted { get; set; }
     }
 }

Dfe.PrepareTransfers.Data/Models/Trust.cs

@@ -6,7 +6,7 @@ public class Trust
     {
         public string Name { get; set; }
         public string Ukprn { get; set; }
-        
+
         //public string LeadRscRegion { get; set; }
         public string CompaniesHouseNumber { get; set; }
         public string EstablishmentType { get; set; }

Dfe.PrepareTransfers.DocumentGeneration.Tests/Dfe.PrepareTransfers.DocumentGeneration.Tests.csproj

@@ -7,10 +7,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Moq" Version="4.20.70" />
-        <PackageReference Include="xunit" Version="2.7.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>