remove NoResults status code

Dfe.Data.SearchPrototype/SearchForEstablishments/ResultsToResponseMapper.cs

@@ -24,11 +24,8 @@ public SearchByKeywordResponse MapFrom(EstablishmentResults input)
     {
         if(input == null)
         {
-            return new(null) { Status = SearchResponseStatus.NoResults };
+            return new() { Status = SearchResponseStatus.SearchServiceError };
         }
-        return new(input.Establishments)
-        {
-            Status = SearchResponseStatus.Success
-        };
+        else return new(input.Establishments) { Status = SearchResponseStatus.Success };
     }
 }

Dfe.Data.SearchPrototype/SearchForEstablishments/SearchByKeywordResponse.cs

@@ -12,17 +12,25 @@ public sealed class SearchByKeywordResponse
     /// <summary>
     /// The readonly collection of T:Dfe.Data.SearchPrototype.Search.Establishment search results.
     /// </summary>
-    public IReadOnlyCollection<Establishment>? EstablishmentResults { get;}
+    public IReadOnlyCollection<Establishment> EstablishmentResults { get;}
     public SearchResponseStatus Status { get; set; }
 
+    /// <summary>
+    /// Default constructor
+    /// </summary>
+    public SearchByKeywordResponse()
+    {
+        EstablishmentResults = new List<Establishment>();
+    }
+
     /// <summary>
     /// The following argument is passed via the constructor and is not changeable
     /// once an instance is created, this ensures we preserve immutability.
     /// </summary>
     /// <param name="establishments">
     /// The readonly collection of T:Dfe.Data.SearchPrototype.Search.Establishment search results.
     /// </param>
-    public SearchByKeywordResponse(IReadOnlyCollection<Establishment>? establishments)
+    public SearchByKeywordResponse(IReadOnlyCollection<Establishment> establishments)
     {
         EstablishmentResults = establishments;
     }

Dfe.Data.SearchPrototype/SearchForEstablishments/SearchByKeywordUseCase.cs

@@ -54,14 +54,13 @@ public async Task<SearchByKeywordResponse> HandleRequest(SearchByKeywordRequest
                 Status = SearchResponseStatus.InvalidRequest
             };
         };
-        //ArgumentNullException.ThrowIfNull(request, nameof(SearchByKeywordRequest));
-        //ArgumentNullException.ThrowIfNull(request.Context, nameof(SearchContext));
+
         try
         {
             EstablishmentResults establishmentResults = await _searchServiceAdapter.SearchAsync(request.Context);
             return _resultsToResponseMapper.MapFrom(establishmentResults);
         }
-        catch (Exception ex)
+        catch (Exception) // something catastrophic went wrong in the infrastructure
         {
             return new SearchByKeywordResponse(null)
             {

Dfe.Data.SearchPrototype/SearchForEstablishments/SearchResponseStatus.cs

@@ -3,7 +3,6 @@
 public enum SearchResponseStatus
 {
     Success,
-    NoResults,
     InvalidRequest,
     SearchServiceError,
     DataFormatError

Dfe.Data.SearchPrototype/Tests/SearchForEstablishments/ResultsToResponseMapperTests.cs

@@ -28,7 +28,7 @@ public void MapFrom_ValidInput_ReturnsCorrectResponse()
     }
 
     [Fact]
-    public void MapFrom_NullInput_ThrowsException()
+    public void MapFrom_NullInput_ReturnsErrorResponse()
     {
         // arrange.
         IMapper<EstablishmentResults, SearchByKeywordResponse> mapper = new ResultsToResponseMapper();
@@ -37,6 +37,6 @@ public void MapFrom_NullInput_ThrowsException()
         SearchByKeywordResponse response = mapper.MapFrom(null!);
 
         // assert
-        response.Status.Should().Be(SearchResponseStatus.NoResults);
+        response.Status.Should().Be(SearchResponseStatus.SearchServiceError);
     }
 }