FIxed Housing Finance Transaction Search (#92)

* FIxed Housing Finance Transaction Search * Add more logging for errors Co-authored-by: Sandip <Sandip@DESKTOP-8GSTDPG> Co-authored-by: golosowa.anna <[email protected]>
LBHackney-IT · Dec 1, 2021 · 962514c · 962514c
1 parent 418c0d0
commit 962514c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/HousingSearchApi.Tests/HousingSearchApi.Tests.csproj b/HousingSearchApi.Tests/HousingSearchApi.Tests.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="Docker.DotNet" Version="3.125.4" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Hackney.Core.ElasticSearch" Version="1.45.0" />
-    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.17.0" />
+    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.18.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />

diff --git a/HousingSearchApi/HousingSearchApi.csproj b/HousingSearchApi/HousingSearchApi.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="Hackney.Core.Logging" Version="1.30.0" />
     <PackageReference Include="Hackney.Core.Middleware" Version="1.30.0" />
     <PackageReference Include="Hackney.Core.Validation" Version="1.30.0" />
-    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.17.0" />
+    <PackageReference Include="Hackney.Shared.HousingSearch" Version="0.18.0" />
     <PackageReference Include="Microsoft.AspNetCore.HealthChecks" Version="1.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />

diff --git a/HousingSearchApi/V1/Gateways/SearchGateway.cs b/HousingSearchApi/V1/Gateways/SearchGateway.cs
@@ -112,10 +112,11 @@ public async Task<GetTransactionListResponse> GetListOfTransactions(GetTransacti
 
             var searchResponse = await _elasticSearchWrapper.Search<QueryableTransaction, GetTransactionListRequest>(searchRequest).ConfigureAwait(false);
 
-            if (!searchResponse.IsValid)
-            {
-                throw new Exception($"Cannot load transactions list. Error: {searchResponse.ServerError}");
-            }
+            if (searchResponse == null) throw new Exception("Cannot get response from ElasticSearch instance");
+
+            if (!searchResponse.IsValid) throw new Exception($"Cannot load transactions list. Error: {searchResponse.ServerError}");
+
+            if (searchResponse.Documents == null) throw new Exception($"ElasticSearch instance returns no documents. Error: {searchResponse.ServerError}");
 
             var transactions = searchResponse.Documents.Select(queryableTransaction => queryableTransaction.ToTransaction());
 

diff --git a/HousingSearchApi/V1/Infrastructure/ElasticElasticSearchWrapper.cs b/HousingSearchApi/V1/Infrastructure/ElasticElasticSearchWrapper.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Elasticsearch.Net;
 using HousingSearchApi.V1.Interfaces;
 using HousingSearchApi.V1.Interfaces.Factories;
 
@@ -55,6 +56,11 @@ public async Task<ISearchResponse<T>> Search<T, TRequest>(TRequest request) wher
 
                 return result;
             }
+            catch (ElasticsearchClientException e)
+            {
+                _logger.LogError(e, "ElasticSearch Search threw an ElasticSearchClientException. DebugInfo: " + e.DebugInformation);
+                throw;
+            }
             catch (Exception e)
             {
                 _logger.LogError(e, "ElasticSearch Search threw an exception");

diff --git a/HousingSearchApi/V1/Infrastructure/Factories/TransactionsQueryGenerator.cs b/HousingSearchApi/V1/Infrastructure/Factories/TransactionsQueryGenerator.cs
@@ -31,19 +31,15 @@ public QueryContainer Create<TRequest>(TRequest request, QueryContainerDescripto
                         "sender.fullName",
                         "transactionType",
                         "paymentReference",
-                        "bankAccountNumber",
-                        "transactionDate",
-                        "transactionAmount"
+                        "bankAccountNumber"
                     })
                 .WithExactQuery(transactionSearchRequest.SearchText,
                     new List<string>
                     {
                         "sender.fullName",
                         "transactionType",
                         "paymentReference",
-                        "bankAccountNumber",
-                        "transactionDate",
-                        "transactionAmount"
+                        "bankAccountNumber"
                     })
                 .Build(q);
         }