diff --git a/back/Controllers/Controllers/AuthController.cs b/back/Controllers/Controllers/AuthController.cs index 5184f89..15eb928 100644 --- a/back/Controllers/Controllers/AuthController.cs +++ b/back/Controllers/Controllers/AuthController.cs @@ -4,61 +4,60 @@ using Contracts.ViewModels; using Microsoft.AspNetCore.Mvc; using Services.Support.Exceptions; -namespace Controllers.Controllers +namespace Controllers.Controllers; + +[ApiController] +[Route("api/[controller]")] +public class AuthController : ControllerBase { - [ApiController] - [Route("api/[controller]")] - public class AuthController : ControllerBase + private readonly IAuthService _authService; + + public AuthController(IAuthService authService) { - private readonly IAuthService _authService; + _authService = authService; + } - public AuthController(IAuthService authService) + [HttpPost] + public async Task> Login([FromBody] UserLoginDTO loginData) + { + try { - _authService = authService; + var user = await _authService.Login(loginData); + return Ok(user); } - - [HttpPost] - public async Task> Login([FromBody] UserLoginDTO loginData) + catch (ArgumentException ex) { - try - { - var user = await _authService.Login(loginData); - return Ok(user); - } - catch (ArgumentException ex) - { - return BadRequest(ex.Message); - } - catch (UserNotFoundException ex) - { - return NotFound(ex.Message); - } - catch (Exception ex) - { - return StatusCode(500, ex.Message); - } + return BadRequest(ex.Message); } - - [HttpPost("register")] - public async Task> Register([FromBody] UserDto user) + catch (UserNotFoundException ex) { - try - { - var createdUser = await _authService.Register(user); - return CreatedAtAction(nameof(Login), new { name = createdUser.Name }, createdUser); - } - catch (ArgumentException ex) - { - return BadRequest(ex.Message); - } - catch (AlreadyExistsException ex) - { - return Conflict(ex.Message); - } - catch (Exception ex) - { - return StatusCode(500, ex.Message); - } + return NotFound(ex.Message); + } + catch (Exception ex) + { + return StatusCode(500, ex.Message); } } -} + + [HttpPost("register")] + public async Task> Register([FromBody] UserDto user) + { + try + { + var createdUser = await _authService.Register(user); + return CreatedAtAction(nameof(Login), new { name = createdUser.Name }, createdUser); + } + catch (ArgumentException ex) + { + return BadRequest(ex.Message); + } + catch (AlreadyExistsException ex) + { + return Conflict(ex.Message); + } + catch (Exception ex) + { + return StatusCode(500, ex.Message); + } + } +} \ No newline at end of file diff --git a/back/Controllers/Controllers/UserController.cs b/back/Controllers/Controllers/UserController.cs index bfca307..c93c276 100644 --- a/back/Controllers/Controllers/UserController.cs +++ b/back/Controllers/Controllers/UserController.cs @@ -3,42 +3,71 @@ using Contracts.SearchModels; using Contracts.Services; using Contracts.ViewModels; using Microsoft.AspNetCore.Mvc; +using Services.Support.Exceptions; -namespace Controllers.Controllers +namespace Controllers.Controllers; + +[ApiController] +[Route("api/[controller]")] +public class UserController : ControllerBase { - [ApiController] - [Route("api/[controller]")] - public class UserController : ControllerBase + private readonly IUserService _userService; + + public UserController(IUserService userService) { - private readonly IUserService _userService; - - public UserController(IUserService userService) - { - _userService = userService; - } - - [HttpGet] - public async Task> GetUser([FromQuery] UserSearch search) + _userService = userService; + } + [HttpGet] + public async Task> GetUser([FromQuery] UserSearch search) + { + try { var user = await _userService.GetDetails(search); - return Ok(user); } + catch (UserNotFoundException ex) + { + return NotFound(ex.Message); + } + catch (Exception ex) + { + return StatusCode(500, ex.Message); + } + } - [HttpPut] - public async Task> UpdateUser([FromBody] UserDto user) + [HttpPatch] + public async Task> UpdateUser([FromBody] UserDto user) + { + try { var updatedUser = await _userService.UpdateUserData(user); - return Ok(updatedUser); } + catch (UserNotFoundException ex) + { + return NotFound(ex.Message); + } + catch (Exception ex) + { + return StatusCode(500, ex.Message); + } + } - [HttpDelete] - public async Task> DeleteUser([FromQuery] UserSearch search) + [HttpDelete] + public async Task> DeleteUser([FromQuery] UserSearch search) + { + try { var deletedUser = await _userService.Delete(search); - return Ok(deletedUser); } + catch (UserNotFoundException ex) + { + return NotFound(ex.Message); + } + catch (Exception ex) + { + return StatusCode(500, ex.Message); + } } }