Merge pull request #418 from DFE-Digital/feature/trust-v4-endpoint

bugfix - PhaseOfEducationCode int not string Added trust type
DFE-Digital · Nov 22, 2023 · ee54291 · ee54291
2 parents 3f9d005 + e8a497a
commit ee54291
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 7 deletions.
diff --git a/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj b/Dfe.Academies.Api.Infrastructure/Dfe.Academies.Infrastructure.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.5" />
+    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.24" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.24">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Dfe.Academies.Application/Builders/EstablishmentDtoBuilder.cs b/Dfe.Academies.Application/Builders/EstablishmentDtoBuilder.cs
@@ -80,7 +80,7 @@ public EstablishmentDtoBuilder WithPhaseOfEducation(Domain.Establishment.Establi
             _dto.PhaseOfEducation = new NameAndCodeDto
             {
                 Name = establishment?.PhaseOfEducation,
-                Code = establishment?.PhaseOfEducationCode
+                Code = establishment?.PhaseOfEducationCode.ToString()
             };
 
             return this;

diff --git a/Dfe.Academies.Application/Dfe.Academies.Application.csproj b/Dfe.Academies.Application/Dfe.Academies.Application.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.5" />
+    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.7" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
   </ItemGroup>

diff --git a/Dfe.Academies.Application/Queries/Trust/TrustQueries.cs b/Dfe.Academies.Application/Queries/Trust/TrustQueries.cs
@@ -50,6 +50,7 @@ private static TrustDto MapToTrustDto(Domain.Trust.Trust trust)
                 CompaniesHouseNumber = trust.CompaniesHouseNumber,
                 ReferenceNumber = trust.GroupID,
                 Ukprn = trust.UKPRN,
+                Type = new Contracts.V4.Establishments.NameAndCodeDto() { Code = trust.TrustType.Code, Name = trust.TrustType.Name },
                 Address = new AddressDto()
                 {
                     Street = trust.AddressLine1,

diff --git a/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj b/Dfe.Academies.Domain/Dfe.Academies.Domain.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.5" />
+    <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.7" />
   </ItemGroup>
 
 </Project>
diff --git a/Dfe.Academies.Domain/Establishment/Establishment.cs b/Dfe.Academies.Domain/Establishment/Establishment.cs
@@ -95,7 +95,7 @@ public class Establishment
         public string? GORregionCode { get; set; }
         public string? ReligiousCharacterCode { get; set; }
         public string? ParliamentaryConstituencyCode { get; set; }
-        public string? PhaseOfEducationCode { get; set; }
+        public int? PhaseOfEducationCode { get; set; }
         public int? SenUnitCapacity { get; set; }
         public int? SenUnitOnRoll { get; set; }
 

diff --git a/TramsDataApi.Test/TramsDataApi.Test.csproj b/TramsDataApi.Test/TramsDataApi.Test.csproj
@@ -16,7 +16,7 @@
         <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.0" />
         <PackageReference Include="AutoFixture.Idioms" Version="4.18.0" />
         <PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
-        <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.5" />
+        <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.7" />
         <PackageReference Include="FluentAssertions" Version="6.11.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.19" />
         <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />

diff --git a/TramsDataApi/TramsDataApi.csproj b/TramsDataApi/TramsDataApi.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CsvHelper" Version="30.0.1" />
-        <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.5" />
+        <PackageReference Include="Dfe.Academies.Contracts" Version="1.0.7" />
         <PackageReference Include="Dfe.Academisation.CorrelationIdMiddleware" Version="2.0.2" />
         <PackageReference Include="FluentValidation" Version="11.6.0" />
         <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />