1 files changed, 19 insertions, 65 deletions
diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs
index 615eac2d..ec732caa 100644
--- a/BackEnd/Timeline/Controllers/UserController.cs
+++ b/BackEnd/Timeline/Controllers/UserController.cs
@@ -1,18 +1,13 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Timeline.Auth;
-using Timeline.Helpers;
 using Timeline.Models.Http;
 using Timeline.Models.Validation;
-using Timeline.Services;
 using Timeline.Services.Mapper;
 using Timeline.Services.User;
-using static Timeline.Resources.Controllers.UserController;
-using static Timeline.Resources.Messages;
 
 namespace Timeline.Controllers
 {
@@ -23,16 +18,14 @@ namespace Timeline.Controllers
     [ProducesErrorResponseType(typeof(CommonResponse))]
     public class UserController : Controller
     {
-        private readonly ILogger<UserController> _logger;
         private readonly IUserService _userService;
         private readonly IUserPermissionService _userPermissionService;
         private readonly IUserDeleteService _userDeleteService;
         private readonly IGenericMapper _mapper;
 
         /// <summary></summary>
-        public UserController(ILogger<UserController> logger, IUserService userService, IUserPermissionService userPermissionService, IUserDeleteService userDeleteService, IGenericMapper mapper)
+        public UserController(IUserService userService, IUserPermissionService userPermissionService, IUserDeleteService userDeleteService, IGenericMapper mapper)
         {
-            _logger = logger;
             _userService = userService;
             _userPermissionService = userPermissionService;
             _userDeleteService = userDeleteService;
@@ -65,16 +58,10 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         public async Task<ActionResult<HttpUser>> Post([FromBody] HttpUserPostRequest body)
         {
-            try
-            {
-                var user = await _userService.CreateUserAsync(
-                    new CreateUserParams(body.Username, body.Password) { Nickname = body.Nickname });
-                return await _mapper.MapAsync<HttpUser>(user, Url, User);
-            }
-            catch (EntityAlreadyExistException e) when (e.EntityName == EntityNames.User)
-            {
-                return BadRequest(ErrorResponse.UserController.UsernameConflict());
-            }
+
+            var user = await _userService.CreateUserAsync(
+                new CreateUserParams(body.Username, body.Password) { Nickname = body.Nickname });
+            return await _mapper.MapAsync<HttpUser>(user, Url, User);
         }
 
         /// <summary>
@@ -87,17 +74,9 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public async Task<ActionResult<HttpUser>> Get([FromRoute][Username] string username)
         {
-            try
-            {
-                var id = await _userService.GetUserIdByUsernameAsync(username);
-                var user = await _userService.GetUserAsync(id);
-                return await _mapper.MapAsync<HttpUser>(user, Url, User);
-            }
-            catch (UserNotExistException e)
-            {
-                _logger.LogInformation(e, Log.Format(LogGetUserNotExist, ("Username", username)));
-                return NotFound(ErrorResponse.UserCommon.NotExist());
-            }
+            var id = await _userService.GetUserIdByUsernameAsync(username);
+            var user = await _userService.GetUserAsync(id);
+            return await _mapper.MapAsync<HttpUser>(user, Url, User);
         }
 
         /// <summary>
@@ -116,35 +95,20 @@ namespace Timeline.Controllers
         {
             if (UserHasUserManagementPermission)
             {
-                try
-                {
-                    var id = await _userService.GetUserIdByUsernameAsync(username);
-                    var user = await _userService.ModifyUserAsync(id, _mapper.AutoMapperMap<ModifyUserParams>(body));
-                    return await _mapper.MapAsync<HttpUser>(user, Url, User);
-                }
-                catch (UserNotExistException e)
-                {
-                    _logger.LogInformation(e, Log.Format(LogPatchUserNotExist, ("Username", username)));
-                    return NotFound(ErrorResponse.UserCommon.NotExist());
-                }
-                catch (EntityAlreadyExistException e) when (e.EntityName == EntityNames.User)
-                {
-                    return BadRequest(ErrorResponse.UserController.UsernameConflict());
-                }
+                var id = await _userService.GetUserIdByUsernameAsync(username);
+                var user = await _userService.ModifyUserAsync(id, _mapper.AutoMapperMap<ModifyUserParams>(body));
+                return await _mapper.MapAsync<HttpUser>(user, Url, User);
             }
             else
             {
                 if (User.Identity!.Name != username)
-                    return StatusCode(StatusCodes.Status403Forbidden,
-                        ErrorResponse.Common.CustomMessage_Forbid(Common_Forbid_NotSelf));
+                    return this.ForbidWithMessage(Resource.MessageForbidNotAdministratorOrOwner);
 
                 if (body.Username != null)
-                    return StatusCode(StatusCodes.Status403Forbidden,
-                        ErrorResponse.Common.CustomMessage_Forbid(UserController_Patch_Forbid_Username));
+                    return this.ForbidWithMessage(Resource.MessageForbidNotAdministrator);
 
                 if (body.Password != null)
-                    return StatusCode(StatusCodes.Status403Forbidden,
-                        ErrorResponse.Common.CustomMessage_Forbid(UserController_Patch_Forbid_Password));
+                    return this.ForbidWithMessage(Resource.MessageForbidNotAdministrator);
 
                 var user = await _userService.ModifyUserAsync(this.GetUserId(), _mapper.AutoMapperMap<ModifyUserParams>(body));
                 return await _mapper.MapAsync<HttpUser>(user, Url, User);
@@ -173,7 +137,7 @@ namespace Timeline.Controllers
             }
             catch (InvalidOperationOnRootUserException)
             {
-                return BadRequest(ErrorResponse.UserController.Delete_RootUser());
+                return this.BadRequestWithCommonResponse(ErrorCodes.UserController.InvalidOperationOnRootUser, Resource.MessageInvalidOperationOnRootUser);
             }
         }
 
@@ -191,11 +155,9 @@ namespace Timeline.Controllers
                 await _userService.ChangePassword(this.GetUserId(), request.OldPassword, request.NewPassword);
                 return Ok();
             }
-            catch (BadPasswordException e)
+            catch (BadPasswordException)
             {
-                _logger.LogInformation(e, Log.Format(LogChangePasswordBadPassword,
-                    ("Username", User.Identity!.Name), ("Old Password", request.OldPassword)));
-                return BadRequest(ErrorResponse.UserController.ChangePassword_BadOldPassword());
+                return this.BadRequestWithCommonResponse(ErrorCodes.UserController.ChangePasswordBadOldPassword, Resource.MessageOldPasswordWrong);
             }
             // User can't be non-existent or the token is bad.
         }
@@ -214,13 +176,9 @@ namespace Timeline.Controllers
                 await _userPermissionService.AddPermissionToUserAsync(id, permission);
                 return Ok();
             }
-            catch (UserNotExistException)
-            {
-                return NotFound(ErrorResponse.UserCommon.NotExist());
-            }
             catch (InvalidOperationOnRootUserException)
             {
-                return BadRequest(ErrorResponse.UserController.ChangePermission_RootUser());
+                return this.BadRequestWithCommonResponse(ErrorCodes.UserController.InvalidOperationOnRootUser, Resource.MessageInvalidOperationOnRootUser);
             }
         }
 
@@ -238,13 +196,9 @@ namespace Timeline.Controllers
                 await _userPermissionService.RemovePermissionFromUserAsync(id, permission);
                 return Ok();
             }
-            catch (UserNotExistException)
-            {
-                return NotFound(ErrorResponse.UserCommon.NotExist());
-            }
             catch (InvalidOperationOnRootUserException)
             {
-                return BadRequest(ErrorResponse.UserController.ChangePermission_RootUser());
+                return this.BadRequestWithCommonResponse(ErrorCodes.UserController.InvalidOperationOnRootUser, Resource.MessageInvalidOperationOnRootUser);
             }
         }
     }