4 files changed, 19 insertions, 22 deletions

diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs
index fc28daa4..2feea476 100644
--- a/BackEnd/Timeline/Controllers/TimelineController.cs
+++ b/BackEnd/Timeline/Controllers/TimelineController.cs
@@ -101,7 +101,7 @@ namespace Timeline.Controllers
             {

                 try

                 {

-                    var relatedUserId = await _userService.GetUserIdByUsername(relate);

+                    var relatedUserId = await _userService.GetUserIdByUsernameAsync(relate);

 

                     var relationType = relateType is null ? TimelineUserRelationshipType.Default : Enum.Parse<TimelineUserRelationshipType>(relateType, true);

 

@@ -190,7 +190,7 @@ namespace Timeline.Controllers
 

             try

             {

-                var userId = await _userService.GetUserIdByUsername(member);

+                var userId = await _userService.GetUserIdByUsernameAsync(member);

                 var create = await _service.AddMember(timelineId, userId);

                 return Ok(CommonPutResponse.Create(create));

             }

@@ -222,7 +222,7 @@ namespace Timeline.Controllers
 

             try

             {

-                var userId = await _userService.GetUserIdByUsername(member);

+                var userId = await _userService.GetUserIdByUsernameAsync(member);

                 var delete = await _service.RemoveMember(timelineId, userId);

                 return Ok(CommonDeleteResponse.Create(delete));

             }

diff --git a/BackEnd/Timeline/Controllers/TokenController.cs b/BackEnd/Timeline/Controllers/TokenController.cs
index 1de45754..fc19c64a 100644
--- a/BackEnd/Timeline/Controllers/TokenController.cs
+++ b/BackEnd/Timeline/Controllers/TokenController.cs
@@ -23,16 +23,14 @@ namespace Timeline.Controllers
     [ProducesErrorResponseType(typeof(CommonResponse))]

     public class TokenController : Controller

     {

-        private readonly IUserCredentialService _userCredentialService;

         private readonly IUserTokenManager _userTokenManager;

         private readonly ILogger<TokenController> _logger;

         private readonly UserMapper _userMapper;

         private readonly IClock _clock;

 

         /// <summary></summary>

-        public TokenController(IUserCredentialService userCredentialService, IUserTokenManager userTokenManager, ILogger<TokenController> logger, UserMapper userMapper, IClock clock)

+        public TokenController(IUserTokenManager userTokenManager, ILogger<TokenController> logger, UserMapper userMapper, IClock clock)

         {

-            _userCredentialService = userCredentialService;

             _userTokenManager = userTokenManager;

             _logger = logger;

             _userMapper = userMapper;

diff --git a/BackEnd/Timeline/Controllers/UserAvatarController.cs b/BackEnd/Timeline/Controllers/UserAvatarController.cs
index d0998fa7..5d4c70f3 100644
--- a/BackEnd/Timeline/Controllers/UserAvatarController.cs
+++ b/BackEnd/Timeline/Controllers/UserAvatarController.cs
@@ -55,7 +55,7 @@ namespace Timeline.Controllers
             long id;

             try

             {

-                id = await _userService.GetUserIdByUsername(username);

+                id = await _userService.GetUserIdByUsernameAsync(username);

             }

             catch (UserNotExistException e)

             {

@@ -91,7 +91,7 @@ namespace Timeline.Controllers
             long id;

             try

             {

-                id = await _userService.GetUserIdByUsername(username);

+                id = await _userService.GetUserIdByUsernameAsync(username);

             }

             catch (UserNotExistException e)

             {

@@ -150,7 +150,7 @@ namespace Timeline.Controllers
             long id;

             try

             {

-                id = await _userService.GetUserIdByUsername(username);

+                id = await _userService.GetUserIdByUsernameAsync(username);

             }

             catch (UserNotExistException e)

             {

diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs
index 95f65d25..a48a1b73 100644
--- a/BackEnd/Timeline/Controllers/UserController.cs
+++ b/BackEnd/Timeline/Controllers/UserController.cs
@@ -26,18 +26,16 @@ namespace Timeline.Controllers
     {

         private readonly ILogger<UserController> _logger;

         private readonly IUserService _userService;

-        private readonly IUserCredentialService _userCredentialService;

         private readonly IUserPermissionService _userPermissionService;

         private readonly IUserDeleteService _userDeleteService;

         private readonly UserMapper _userMapper;

         private readonly IMapper _mapper;

 

         /// <summary></summary>

-        public UserController(ILogger<UserController> logger, IUserService userService, IUserCredentialService userCredentialService, IUserPermissionService userPermissionService, IUserDeleteService userDeleteService, UserMapper userMapper, IMapper mapper)

+        public UserController(ILogger<UserController> logger, IUserService userService, IUserPermissionService userPermissionService, IUserDeleteService userDeleteService, UserMapper userMapper, IMapper mapper)

         {

             _logger = logger;

             _userService = userService;

-            _userCredentialService = userCredentialService;

             _userPermissionService = userPermissionService;

             _userDeleteService = userDeleteService;

             _userMapper = userMapper;

@@ -54,7 +52,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]

         public async Task<ActionResult<List<HttpUser>>> List()

         {

-            var users = await _userService.GetUsers();

+            var users = await _userService.GetUsersAsync();

             var result = await _userMapper.MapToHttp(users, Url);

             return result;

         }

@@ -72,7 +70,8 @@ namespace Timeline.Controllers
         {

             try

             {

-                var user = await _userService.CreateUser(body.Username, body.Password);

+                var user = await _userService.CreateUserAsync(

+                    new CreateUserParams(body.Username, body.Password) { Nickname = body.Nickname });

                 return await _userMapper.MapToHttp(user, Url);

             }

             catch (EntityAlreadyExistException e) when (e.EntityName == EntityNames.User)

@@ -93,8 +92,8 @@ namespace Timeline.Controllers
         {

             try

             {

-                var id = await _userService.GetUserIdByUsername(username);

-                var user = await _userService.GetUser(id);

+                var id = await _userService.GetUserIdByUsernameAsync(username);

+                var user = await _userService.GetUserAsync(id);

                 return await _userMapper.MapToHttp(user, Url);

             }

             catch (UserNotExistException e)

@@ -122,8 +121,8 @@ namespace Timeline.Controllers
             {

                 try

                 {

-                    var id = await _userService.GetUserIdByUsername(username);

-                    var user = await _userService.ModifyUser(id, _mapper.Map<ModifyUserParams>(body));

+                    var id = await _userService.GetUserIdByUsernameAsync(username);

+                    var user = await _userService.ModifyUserAsync(id, _mapper.Map<ModifyUserParams>(body));

                     return await _userMapper.MapToHttp(user, Url);

                 }

                 catch (UserNotExistException e)

@@ -150,7 +149,7 @@ namespace Timeline.Controllers
                     return StatusCode(StatusCodes.Status403Forbidden,

                         ErrorResponse.Common.CustomMessage_Forbid(UserController_Patch_Forbid_Password));

 

-                var user = await _userService.ModifyUser(this.GetUserId(), _mapper.Map<ModifyUserParams>(body));

+                var user = await _userService.ModifyUserAsync(this.GetUserId(), _mapper.Map<ModifyUserParams>(body));

                 return await _userMapper.MapToHttp(user, Url);

             }

         }

@@ -192,7 +191,7 @@ namespace Timeline.Controllers
         {

             try

             {

-                await _userCredentialService.ChangePassword(this.GetUserId(), request.OldPassword, request.NewPassword);

+                await _userService.ChangePassword(this.GetUserId(), request.OldPassword, request.NewPassword);

                 return Ok();

             }

             catch (BadPasswordException e)

@@ -214,7 +213,7 @@ namespace Timeline.Controllers
         {

             try

             {

-                var id = await _userService.GetUserIdByUsername(username);

+                var id = await _userService.GetUserIdByUsernameAsync(username);

                 await _userPermissionService.AddPermissionToUserAsync(id, permission);

                 return Ok();

             }

@@ -238,7 +237,7 @@ namespace Timeline.Controllers
         {

             try

             {

-                var id = await _userService.GetUserIdByUsername(username);

+                var id = await _userService.GetUserIdByUsernameAsync(username);

                 await _userPermissionService.RemovePermissionFromUserAsync(id, permission);

                 return Ok();

             }