AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed state and ErrorResponse(Exception e) from BaseController. Added logging to catch part in Document and Envelope Controller.

Browse Source
This commit is contained in:
Developer 02
2024-05-16 09:23:33 +02:00
parent 68714c2937
commit ba723bdddb
6 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
EnvelopeGenerator.Web/Controllers/BaseController.cs
View File

@@ -6,27 +6,14 @@ namespace EnvelopeGenerator.Web.Controllers
{
public class BaseController : Controller
{
internal DatabaseService database;
internal State state;
protected readonly DatabaseService database;
internal ILogger _logger;
protected readonly ILogger _logger;
public BaseController(DatabaseService database, ILogger logger)
{
this.database = database;
this.state = database.State;
_logger = logger;
}
internal ObjectResult ErrorResponse(Exception e)
{
// Log the detailed error message.
_logger.LogError(e, "An unexpected error occurred.");
return Problem(
statusCode: 500,
detail: e.Message,
type: "ServerError");
}
}
}

6
EnvelopeGenerator.Web/Controllers/DocumentController.cs
View File

@@ -41,7 +41,8 @@ namespace EnvelopeGenerator.Web.Controllers
}
catch(Exception ex)
{
return ErrorResponse(ex);
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
@@ -66,7 +67,8 @@ namespace EnvelopeGenerator.Web.Controllers
}
catch(Exception ex)
{
return ErrorResponse(ex);
_logger.LogError(ex, "{Message}", ex.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}

6
EnvelopeGenerator.Web/Controllers/EnvelopeController.cs
View File

@@ -43,7 +43,8 @@ namespace EnvelopeGenerator.Web.Controllers
}
catch (Exception e)
{
return ErrorResponse(e);
_logger.LogError(e, "{Message}", e.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
@@ -88,7 +89,8 @@ namespace EnvelopeGenerator.Web.Controllers
}
catch (Exception e)
{
return ErrorResponse(e);
_logger.LogError(e, "{Message}", e.Message);
return StatusCode(StatusCodes.Status500InternalServerError);
}
}
}

26
EnvelopeGenerator.Web/Controllers/HomeController.cs
View File

@@ -227,23 +227,14 @@ namespace EnvelopeGenerator.Web.Controllers
return Ok(new { EnvelopeUuid = envelopeUuid, ReceiverSignature = receiverSignature });
}
[NonAction]
public IActionResult GetLanguage() => Ok(UserLanguage);
[HttpPost("lang/{language}")]
public IActionResult SetLanguage([FromRoute] string language)
{
try
{
if (Languages is null)
{
_logger.LogWarning("There is no language assigned under languages key in appesettings.json");
return StatusCode(statusCode: StatusCodes.Status500InternalServerError);
}
else if (!language.Contains(language))
return BadRequest();
language = _urlEncoder.Encode(language);
if (!_cultures.Languages.Contains(language))
return BadRequest();
UserLanguage = language;
@@ -257,16 +248,7 @@ namespace EnvelopeGenerator.Web.Controllers
}
[HttpGet("lang")]
public IActionResult GetLanguages()
{
if(Languages is null)
{
_logger.LogWarning("There is no language assigned under languages key in appesettings.json");
return StatusCode(statusCode: StatusCodes.Status500InternalServerError);
}
else
return Ok(Languages);
}
public IActionResult GetLanguages() => Ok(_cultures.Languages);
private string UserLanguage
{
@@ -297,8 +279,6 @@ namespace EnvelopeGenerator.Web.Controllers
}
}
private string[]? Languages => _configuration.GetSection("Languages").Get<string[]>();
public IActionResult Error404() => this.ViewError404();
}
}