Skip to content

Commit

Permalink
Merge pull request #24 from PandaTechAM/development
Browse files Browse the repository at this point in the history
NuGet update + polish
  • Loading branch information
ruboarm committed May 17, 2024
2 parents 36eb5b8 + a9f8094 commit e43e376
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
19 changes: 12 additions & 7 deletions src/ResponseCrafter/PandaExceptionHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ public class PandaExceptionHandler : IExceptionHandler
private readonly string _visibility;
private readonly Func<string, string> _namingConventionConverter;

public PandaExceptionHandler(ILogger<PandaExceptionHandler> logger, IConfiguration configuration, Func<string, string> namingConventionConverter)
public PandaExceptionHandler(ILogger<PandaExceptionHandler> logger, IConfiguration configuration,
Func<string, string> namingConventionConverter)
{
_logger = logger;
_visibility = configuration["ResponseCrafterVisibility"]!;
_namingConventionConverter = namingConventionConverter;

if (string.IsNullOrEmpty(_visibility) || _visibility != "Private" && _visibility != "Public")
{
_visibility = "Public";
Expand Down Expand Up @@ -63,16 +64,18 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e

return true;
}

private async Task HandleBaseConverterExceptionAsync(HttpContext httpContext, BaseConverterException importException,

private async Task HandleBaseConverterExceptionAsync(HttpContext httpContext,
BaseConverterException importException,
CancellationToken cancellationToken)
{
switch (importException)
{
case InputValidationException _:
case UnsupportedCharacterException _:
var exceptionName = importException.GetType().Name;
var formattedMessage = $"{exceptionName} in Base Converter: {_namingConventionConverter(importException.Message)}";
var formattedMessage =
$"{exceptionName} in Base Converter: {_namingConventionConverter(importException.Message)}";
var mappedException = new BadRequestException(formattedMessage);
await HandleApiExceptionAsync(httpContext, mappedException, cancellationToken);
break;
Expand All @@ -88,6 +91,7 @@ private async Task HandleImportExceptionAsync(HttpContext httpContext, ImportExc
switch (importException)
{
case InvalidColumnValueException _:
case InvalidCellValueException _:
case InvalidPropertyNameException _:
case EmptyFileImportException _:
var exceptionName = importException.GetType().Name;
Expand All @@ -100,7 +104,7 @@ private async Task HandleImportExceptionAsync(HttpContext httpContext, ImportExc
break;
}
}

private async Task HandleServiceExceptionAsync(HttpContext httpContext, ServiceException serviceException,
CancellationToken cancellationToken)
{
Expand Down Expand Up @@ -177,7 +181,8 @@ private async Task HandleFilterExceptionAsync(HttpContext httpContext, FilterExc
case UnsupportedFilterException _:
case UnsupportedValueException _:
var exceptionName = filterException.GetType().Name;
var formattedMessage = $"{exceptionName} in Filters: {_namingConventionConverter(filterException.Message)}";
var formattedMessage =
$"{exceptionName} in Filters: {_namingConventionConverter(filterException.Message)}";
var mappedException = new BadRequestException(formattedMessage);
await HandleApiExceptionAsync(httpContext, mappedException, cancellationToken);
break;
Expand Down
6 changes: 3 additions & 3 deletions src/ResponseCrafter/ResponseCrafter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Copyright>MIT</Copyright>
<PackageIcon>pandatech.png</PackageIcon>
<PackageReadmeFile>Readme.md</PackageReadmeFile>
<Version>1.4.10</Version>
<Version>1.4.12</Version>
<PackageId>Pandatech.ResponseCrafter</PackageId>
<PackageTags>Pandatech, library, exception handler, exception, middleware, Api response</PackageTags>
<Title>ResponseCrafter</Title>
Expand All @@ -24,8 +24,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
<PackageReference Include="Pandatech.EFCoreQueryMagic" Version="1.0.9" />
<PackageReference Include="PandaTech.FluentImporter" Version="2.0.6" />
<PackageReference Include="Pandatech.EFCoreQueryMagic" Version="1.0.10" />
<PackageReference Include="PandaTech.FluentImporter" Version="2.0.12" />
<PackageReference Include="PandaTech.ServiceResponse" Version="1.2.12" />
</ItemGroup>

Expand Down

0 comments on commit e43e376

Please sign in to comment.