diff --git a/src/DigitalData.UserManager.API/Controllers/UserController.cs b/src/DigitalData.UserManager.API/Controllers/UserController.cs index dd7be83..bb88f81 100644 --- a/src/DigitalData.UserManager.API/Controllers/UserController.cs +++ b/src/DigitalData.UserManager.API/Controllers/UserController.cs @@ -18,84 +18,52 @@ public class UserController : BaseAuthController GetByModuleId([FromRoute] int moduleId, [FromQuery]bool assigned = true) + public async Task GetByModuleId([FromRoute] int moduleId, [FromQuery] bool assigned = true) { - try - { - return await (assigned ? _service.ReadByModuleIdAsync(moduleId) : _service.ReadUnassignedByModuleIdAsync(moduleId)) - .ThenAsync(Ok, IActionResult(m, n) => - { - _logger.LogNotice(n); - return StatusCode(StatusCodes.Status500InternalServerError); - }); - } - catch(Exception ex) - { - _logger.LogError(ex, "{Message}", ex.Message); - return StatusCode(StatusCodes.Status500InternalServerError); - } + return await (assigned ? _service.ReadByModuleIdAsync(moduleId) : _service.ReadUnassignedByModuleIdAsync(moduleId)) + .ThenAsync(Ok, IActionResult (m, n) => + { + _logger.LogNotice(n); + return StatusCode(StatusCodes.Status500InternalServerError); + }); } [HttpGet("ByGroupId/{groupId}")] public async Task GetByGroupId([FromRoute] int groupId, [FromQuery] bool assigned = true) { - try - { - return await (assigned ? _service.ReadByGroupIdAsync(groupId) : _service.ReadUnassignedByGroupIdAsync(groupId)) - .ThenAsync(Ok, IActionResult (m, n) => - { - _logger.LogNotice(n); - return StatusCode(StatusCodes.Status500InternalServerError); - }); - } - catch(Exception ex) - { - _logger.LogError(ex, "{Message}", ex.Message); - return StatusCode(StatusCodes.Status500InternalServerError); - } + return await (assigned ? _service.ReadByGroupIdAsync(groupId) : _service.ReadUnassignedByGroupIdAsync(groupId)) + .ThenAsync(Ok, IActionResult (m, n) => + { + _logger.LogNotice(n); + return StatusCode(StatusCodes.Status500InternalServerError); + }); } [HttpPost("ByDir")] public async Task CreateByDir(UserPrincipalDto upDto) { - try - { - return await _service.CreateAsync(upDto).ThenAsync( - Success: id => - { - var createdResource = new { Id = id }; - var actionName = nameof(GetById); - var routeValues = new { id = createdResource.Id }; - return CreatedAtAction(actionName, routeValues, createdResource); - }, - Fail: IActionResult (m, n) => - { - _logger.LogNotice(n); - return BadRequest(); - }); - } - catch(Exception ex) - { - _logger.LogError(ex, "{Message}", ex.Message); - return StatusCode(StatusCodes.Status500InternalServerError); - } + return await _service.CreateAsync(upDto).ThenAsync( + Success: id => + { + var createdResource = new { Id = id }; + var actionName = nameof(GetById); + var routeValues = new { id = createdResource.Id }; + return CreatedAtAction(actionName, routeValues, createdResource); + }, + Fail: IActionResult (m, n) => + { + _logger.LogNotice(n); + return BadRequest(); + }); } [HttpGet("ByUsername/{username}")] public virtual async Task GetByUsername([FromRoute] string username) { - try + return await _service.ReadByUsernameAsync(username).ThenAsync(Ok, IActionResult (m, n) => { - return await _service.ReadByUsernameAsync(username).ThenAsync(Ok, IActionResult (m, n) => - { - _logger.LogNotice(n); - return NotFound(); - }); - } - catch(Exception ex) - { - _logger.LogError(ex, "{Message}", ex.Message); - return StatusCode(StatusCodes.Status500InternalServerError); - } + _logger.LogNotice(n); + return NotFound(); + }); } } \ No newline at end of file