Merge branch 'main' of github.com:DFE-Digital/academy-transfers-api

DFE-Digital · Mar 10, 2022 · af4fd8f · af4fd8f
2 parents c85fc7c + 453b988
commit af4fd8f
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 7 deletions.
diff --git a/Data.TRAMS.Tests/Data.TRAMS.Tests.csproj b/Data.TRAMS.Tests/Data.TRAMS.Tests.csproj
@@ -7,12 +7,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Data.TRAMS\Data.TRAMS.csproj"/>
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0"/>
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0"/>
-        <PackageReference Include="Moq" Version="4.17.2"/>
-        <PackageReference Include="xunit" Version="2.4.1"/>
+        <ProjectReference Include="..\Data.TRAMS\Data.TRAMS.csproj" />
+        <PackageReference Include="FluentAssertions" Version="6.5.1" />
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.0" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageReference Include="Moq" Version="4.17.2" />
+        <PackageReference Include="xunit" Version="2.4.1" />
     </ItemGroup>
 
 </Project>
diff --git a/Data.TRAMS.Tests/TramsEducationPerformanceRepositoryTests.cs b/Data.TRAMS.Tests/TramsEducationPerformanceRepositoryTests.cs
@@ -11,6 +11,7 @@
 using Xunit;
 using EducationPerformance = Data.Models.KeyStagePerformance.EducationPerformance;
 using KeyStage2 = Data.Models.KeyStagePerformance.KeyStage2;
+using FluentAssertions;
 
 namespace Data.TRAMS.Tests
 {
@@ -108,14 +109,26 @@ public async void GivenResultFromApi_ReturnsMappedResult()
             }
 
             [Theory]
-            [InlineData(HttpStatusCode.NotFound)]
             [InlineData(HttpStatusCode.InternalServerError)]
+            [InlineData(HttpStatusCode.Unauthorized)]
             public async void GivenApiReturnsError_ThrowsApiError(HttpStatusCode httpStatusCode)
             {
                 HttpClientTestHelpers.SetupGet<TramsEducationPerformance>(_client, null, httpStatusCode);
 
                 await Assert.ThrowsAsync<TramsApiException>(() => _subject.GetByAcademyUrn("12345"));
             }
+
+            [Fact]
+            public async void GivenApiReturnsNotFound_ShouldReturnEmptyEducationPerformance()
+            {
+                HttpClientTestHelpers.SetupGet<TramsEducationPerformance>(_client, null, HttpStatusCode.NotFound);
+                var result = await _subject.GetByAcademyUrn("12345");
+
+                var blankEducationPerformance = new EducationPerformance();
+
+                Assert.IsType<EducationPerformance>(result.Result);
+                blankEducationPerformance.Should().BeEquivalentTo(result.Result);
+            }
         }
     }
 }
diff --git a/Data.TRAMS/TramsEducationPerformanceRepository.cs b/Data.TRAMS/TramsEducationPerformanceRepository.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 using System.Threading.Tasks;
 using Data.Models.KeyStagePerformance;
 using Data.TRAMS.Models.EducationPerformance;
@@ -49,6 +50,14 @@ public async Task<RepositoryResult<EducationPerformance>> GetByAcademyUrn(string
                 return mappedResult;
             }
 
+            if (response.StatusCode == HttpStatusCode.NotFound)
+            {
+                return new RepositoryResult<EducationPerformance>()
+                {
+                    Result = new EducationPerformance()
+                };
+            }
+
             throw new TramsApiException(response);
         }
     }

diff --git a/Data/Models/KeyStagePerformance/EducationPerformance.cs b/Data/Models/KeyStagePerformance/EducationPerformance.cs
@@ -5,6 +5,13 @@ namespace Data.Models.KeyStagePerformance
 {
     public class EducationPerformance
     {
+        public EducationPerformance()
+        {
+            KeyStage2Performance = new List<KeyStage2>();
+            KeyStage4Performance = new List<KeyStage4>();
+            KeyStage5Performance = new List<KeyStage5>();
+        }
+
         //todo: remove this when view models/view component
         #region remove
         public string ProjectUrn { get;set; }