From 5f679f9bddc21b271c0ad7c16dcc6d058c99a2b1 Mon Sep 17 00:00:00 2001 From: plockwood Date: Wed, 10 Apr 2024 15:39:24 +0100 Subject: [PATCH 1/3] EF version update in docker file --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c84e4b90..9cea14d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN dotnet restore Dfe.Academies.Academisation.WebApi RUN dotnet build Dfe.Academies.Academisation.WebApi RUN dotnet new tool-manifest -RUN dotnet tool install dotnet-ef --version 7.0.14 +RUN dotnet tool install dotnet-ef --version 8.0.4 RUN dotnet ef migrations script --output /app/SQL/DbMigrationScript.sql --idempotent -p /build/Dfe.Academies.Academisation.Data -s /build/Dfe.Academies.Academisation.WebApi -c AcademisationContext From 6fda7b0a2e607c183b37fa94e5fa44e601e83029 Mon Sep 17 00:00:00 2001 From: plockwood Date: Wed, 10 Apr 2024 16:50:10 +0100 Subject: [PATCH 2/3] docker file fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9cea14d7..23a64b51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,11 +33,11 @@ ARG ASPNET_IMAGE_TAG FROM "mcr.microsoft.com/dotnet/aspnet:${ASPNET_IMAGE_TAG}" AS final RUN apt-get update -RUN apt-get install unixodbc curl gnupg -y +RUN apt-get install curl gnupg -y RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - RUN curl https://packages.microsoft.com/config/debian/11/prod.list | tee /etc/apt/sources.list.d/msprod.list RUN apt-get update -RUN ACCEPT_EULA=Y apt-get install msodbcsql18 mssql-tools18 -y +RUN ACCEPT_EULA=Y apt-get install msodbcsql18 mssql-tools18 unixodbc-dev -y COPY --from=build /app /app WORKDIR /app From 497f7f5e42c465f7303e21ca10aa850f73f3c704 Mon Sep 17 00:00:00 2001 From: plockwood Date: Fri, 12 Apr 2024 12:32:12 +0100 Subject: [PATCH 3/3] Bugfix to return transfer project Id in the api response to be used for advisory board decisions --- .../TransferProject/AcademyTransferProjectResponse.cs | 1 + .../TransferProject/AcademyTransferProjectResponseFactory.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/AcademyTransferProjectResponse.cs b/Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/AcademyTransferProjectResponse.cs index 7fd4d823..3332f5c6 100644 --- a/Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/AcademyTransferProjectResponse.cs +++ b/Dfe.Academies.Academisation.IService/ServiceModels/TransferProject/AcademyTransferProjectResponse.cs @@ -3,6 +3,7 @@ namespace Dfe.Academies.Academisation.IService.ServiceModels.TransferProject { public class AcademyTransferProjectResponse { + public int Id { get; set; } public string ProjectUrn { get; set; } public string ProjectReference { get; set; } diff --git a/Dfe.Academies.Academisation.Service/Mappers/TransferProject/AcademyTransferProjectResponseFactory.cs b/Dfe.Academies.Academisation.Service/Mappers/TransferProject/AcademyTransferProjectResponseFactory.cs index 43dfc20f..ed8d3763 100644 --- a/Dfe.Academies.Academisation.Service/Mappers/TransferProject/AcademyTransferProjectResponseFactory.cs +++ b/Dfe.Academies.Academisation.Service/Mappers/TransferProject/AcademyTransferProjectResponseFactory.cs @@ -83,6 +83,7 @@ public static AcademyTransferProjectResponse Create(ITransferProject model) return new AcademyTransferProjectResponse { + Id = model.Id, ProjectUrn = model.Urn.ToString(), ProjectReference = model.ProjectReference, OutgoingTrustUkprn = model.OutgoingTrustUkprn,