Skip to content

Commit

Permalink
feat: or-1972 add logging when 400 from ES
Browse files Browse the repository at this point in the history
  • Loading branch information
koenmetsu committed Nov 27, 2023
1 parent 4085f5b commit 10a24f0
Showing 1 changed file with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace AssociationRegistry.Public.Api.Verenigingen.Search;
using FluentValidation;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Nest;
using RequestModels;
using ResponseModels;
Expand Down Expand Up @@ -132,6 +133,7 @@ public async Task<IActionResult> Zoeken(
string? hoofdactiviteitenVerenigingsloket,
[FromQuery] PaginationQueryParams paginationQueryParams,
[FromServices] IValidator<PaginationQueryParams> validator,
[FromServices] ILogger logger,
CancellationToken cancellationToken)
{
await validator.ValidateAndThrowAsync(paginationQueryParams, cancellationToken);
Expand All @@ -142,19 +144,20 @@ public async Task<IActionResult> Zoeken(
var searchResponse = await Search(_elasticClient, q, sort, hoofdActiviteitenArray, paginationQueryParams, _typeMapping);

if (searchResponse.ApiCall.HttpStatusCode == 400)
return MapBadRequest(searchResponse);
return MapBadRequest(logger, searchResponse);

var response = _responseMapper.ToSearchVereningenResponse(searchResponse, paginationQueryParams, q, hoofdActiviteitenArray);

return Ok(response);
}

private IActionResult MapBadRequest(
ISearchResponse<VerenigingZoekDocument> searchResponse)
private IActionResult MapBadRequest(ILogger logger, ISearchResponse<VerenigingZoekDocument> searchResponse)
{
var match = Regex.Match(searchResponse.ServerError.Error.RootCause.First().Reason,
pattern: @"No mapping found for \[(.*).keyword\] in order to sort on");

logger.LogError(searchResponse.OriginalException, "Fout bij het aanroepen van ElasticSearch");

if (match.Success)
throw new ZoekOpdrachtBevatOnbekendeSorteerVelden(match.Groups[1].Value);

Expand Down

0 comments on commit 10a24f0

Please sign in to comment.