refactor: ...

3 files changed, 28 insertions, 28 deletions

diff --git a/BackEnd/Timeline/Controllers/TimelineController.cs b/BackEnd/Timeline/Controllers/TimelineController.cs
index 0ffadc50..27b4b7a7 100644
--- a/BackEnd/Timeline/Controllers/TimelineController.cs
+++ b/BackEnd/Timeline/Controllers/TimelineController.cs
@@ -57,7 +57,7 @@ namespace Timeline.Controllers
         [HttpGet("timelines")]

         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status400BadRequest)]

-        public async Task<ActionResult<List<TimelineInfo>>> TimelineList([FromQuery][Username] string? relate, [FromQuery][RegularExpression("(own)|(join)")] string? relateType, [FromQuery] string? visibility)

+        public async Task<ActionResult<List<HttpTimeline>>> TimelineList([FromQuery][Username] string? relate, [FromQuery][RegularExpression("(own)|(join)")] string? relateType, [FromQuery] string? visibility)

         {

             List<TimelineVisibility>? visibilityFilter = null;

             if (visibility != null)

@@ -109,7 +109,7 @@ namespace Timeline.Controllers
             }

 

             var timelines = await _service.GetTimelines(relationship, visibilityFilter);

-            var result = _mapper.Map<List<TimelineInfo>>(timelines);

+            var result = _mapper.Map<List<HttpTimeline>>(timelines);

             return result;

         }

 

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

         [ProducesResponseType(StatusCodes.Status304NotModified)]

         [ProducesResponseType(StatusCodes.Status404NotFound)]

-        public async Task<ActionResult<TimelineInfo>> TimelineGet([FromRoute][GeneralTimelineName] string name, [FromQuery] string? checkUniqueId, [FromQuery(Name = "ifModifiedSince")] DateTime? queryIfModifiedSince, [FromHeader(Name = "If-Modified-Since")] DateTime? headerIfModifiedSince)

+        public async Task<ActionResult<HttpTimeline>> TimelineGet([FromRoute][GeneralTimelineName] string name, [FromQuery] string? checkUniqueId, [FromQuery(Name = "ifModifiedSince")] DateTime? queryIfModifiedSince, [FromHeader(Name = "If-Modified-Since")] DateTime? headerIfModifiedSince)

         {

             DateTime? ifModifiedSince = null;

             if (queryIfModifiedSince.HasValue)

@@ -166,7 +166,7 @@ namespace Timeline.Controllers
             else

             {

                 var timeline = await _service.GetTimeline(name);

-                var result = _mapper.Map<TimelineInfo>(timeline);

+                var result = _mapper.Map<HttpTimeline>(timeline);

                 return result;

             }

         }

@@ -182,16 +182,16 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

         [ProducesResponseType(StatusCodes.Status404NotFound)]

-        public async Task<ActionResult<List<TimelinePostInfo>>> PostListGet([FromRoute][GeneralTimelineName] string name, [FromQuery] DateTime? modifiedSince, [FromQuery] bool? includeDeleted)

+        public async Task<ActionResult<List<HttpTimelinePost>>> PostListGet([FromRoute][GeneralTimelineName] string name, [FromQuery] DateTime? modifiedSince, [FromQuery] bool? includeDeleted)

         {

             if (!UserHasAllTimelineManagementPermission && !await _service.HasReadPermission(name, this.GetOptionalUserId()))

             {

                 return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());

             }

 

-            List<TimelinePost> posts = await _postService.GetPosts(name, modifiedSince, includeDeleted ?? false);

+            List<TimelinePostInfo> posts = await _postService.GetPosts(name, modifiedSince, includeDeleted ?? false);

 

-            var result = _mapper.Map<List<TimelinePostInfo>>(posts);

+            var result = _mapper.Map<List<HttpTimelinePost>>(posts);

             return result;

         }

 

@@ -247,7 +247,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

-        public async Task<ActionResult<TimelinePostInfo>> PostPost([FromRoute][GeneralTimelineName] string name, [FromBody] TimelinePostCreateRequest body)

+        public async Task<ActionResult<HttpTimelinePost>> PostPost([FromRoute][GeneralTimelineName] string name, [FromBody] HttpTimelinePostCreateRequest body)

         {

             var id = this.GetUserId();

             if (!UserHasAllTimelineManagementPermission && !await _service.IsMemberOf(name, id))

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

             var content = body.Content;

 

-            TimelinePost post;

+            TimelinePostInfo post;

 

             if (content.Type == TimelinePostContentTypes.Text)

             {

@@ -299,7 +299,7 @@ namespace Timeline.Controllers
                 return BadRequest(ErrorResponse.Common.CustomMessage_InvalidModel(Resources.Messages.TimelineController_ContentUnknownType));

             }

 

-            var result = _mapper.Map<TimelinePostInfo>(post);

+            var result = _mapper.Map<HttpTimelinePost>(post);

             return result;

         }

 

@@ -344,7 +344,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

-        public async Task<ActionResult<TimelineInfo>> TimelinePatch([FromRoute][GeneralTimelineName] string name, [FromBody] TimelinePatchRequest body)

+        public async Task<ActionResult<HttpTimeline>> TimelinePatch([FromRoute][GeneralTimelineName] string name, [FromBody] HttpTimelinePatchRequest body)

         {

             if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermission(name, this.GetUserId())))

             {

@@ -352,7 +352,7 @@ namespace Timeline.Controllers
             }

             await _service.ChangeProperty(name, _mapper.Map<TimelineChangePropertyRequest>(body));

             var timeline = await _service.GetTimeline(name);

-            var result = _mapper.Map<TimelineInfo>(timeline);

+            var result = _mapper.Map<HttpTimeline>(timeline);

             return result;

         }

 

@@ -423,14 +423,14 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

-        public async Task<ActionResult<TimelineInfo>> TimelineCreate([FromBody] TimelineCreateRequest body)

+        public async Task<ActionResult<HttpTimeline>> TimelineCreate([FromBody] TimelineCreateRequest body)

         {

             var userId = this.GetUserId();

 

             try

             {

                 var timeline = await _service.CreateTimeline(body.Name, userId);

-                var result = _mapper.Map<TimelineInfo>(timeline);

+                var result = _mapper.Map<HttpTimeline>(timeline);

                 return result;

             }

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

@@ -474,7 +474,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

-        public async Task<ActionResult<TimelineInfo>> TimelineOpChangeName([FromBody] TimelineChangeNameRequest body)

+        public async Task<ActionResult<HttpTimeline>> TimelineOpChangeName([FromBody] HttpTimelineChangeNameRequest body)

         {

             if (!UserHasAllTimelineManagementPermission && !(await _service.HasManagePermission(body.OldName, this.GetUserId())))

             {

@@ -484,7 +484,7 @@ namespace Timeline.Controllers
             try

             {

                 var timeline = await _service.ChangeTimelineName(body.OldName, body.NewName);

-                return Ok(_mapper.Map<TimelineInfo>(timeline));

+                return Ok(_mapper.Map<HttpTimeline>(timeline));

             }

             catch (EntityAlreadyExistException)

             {

diff --git a/BackEnd/Timeline/Controllers/TokenController.cs b/BackEnd/Timeline/Controllers/TokenController.cs
index 41ec21e6..c801b8cc 100644
--- a/BackEnd/Timeline/Controllers/TokenController.cs
+++ b/BackEnd/Timeline/Controllers/TokenController.cs
@@ -47,7 +47,7 @@ namespace Timeline.Controllers
         [AllowAnonymous]

         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status400BadRequest)]

-        public async Task<ActionResult<CreateTokenResponse>> Create([FromBody] CreateTokenRequest request)

+        public async Task<ActionResult<HttpCreateTokenResponse>> Create([FromBody] HttpCreateTokenRequest request)

         {

             void LogFailure(string reason, Exception? e = null)

             {

@@ -71,10 +71,10 @@ namespace Timeline.Controllers
                     ("Username", request.Username),

                     ("Expire At", expireTime?.ToString(CultureInfo.CurrentCulture.DateTimeFormat) ?? "default")

                 ));

-                return Ok(new CreateTokenResponse

+                return Ok(new HttpCreateTokenResponse

                 {

                     Token = result.Token,

-                    User = _mapper.Map<UserInfo>(result.User)

+                    User = _mapper.Map<HttpUser>(result.User)

                 });

             }

             catch (UserNotExistException e)

@@ -97,7 +97,7 @@ namespace Timeline.Controllers
         [AllowAnonymous]

         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status400BadRequest)]

-        public async Task<ActionResult<VerifyTokenResponse>> Verify([FromBody] VerifyTokenRequest request)

+        public async Task<ActionResult<HttpVerifyTokenResponse>> Verify([FromBody] HttpVerifyTokenRequest request)

         {

             void LogFailure(string reason, Exception? e = null, params (string, object?)[] otherProperties)

             {

@@ -113,9 +113,9 @@ namespace Timeline.Controllers
                 var result = await _userTokenManager.VerifyToken(request.Token);

                 _logger.LogInformation(Log.Format(LogVerifySuccess,

                     ("Username", result.Username), ("Token", request.Token)));

-                return Ok(new VerifyTokenResponse

+                return Ok(new HttpVerifyTokenResponse

                 {

-                    User = _mapper.Map<UserInfo>(result)

+                    User = _mapper.Map<HttpUser>(result)

                 });

             }

             catch (UserTokenTimeExpireException e)

diff --git a/BackEnd/Timeline/Controllers/UserController.cs b/BackEnd/Timeline/Controllers/UserController.cs
index 626a116f..3727da36 100644
--- a/BackEnd/Timeline/Controllers/UserController.cs
+++ b/BackEnd/Timeline/Controllers/UserController.cs
@@ -42,7 +42,7 @@ namespace Timeline.Controllers
             _mapper = mapper;

         }

 

-        private UserInfo ConvertToUserInfo(User user) => _mapper.Map<UserInfo>(user);

+        private HttpUser ConvertToUserInfo(UserInfo user) => _mapper.Map<HttpUser>(user);

 

         private bool UserHasUserManagementPermission => this.UserHasPermission(UserPermission.UserManagement);

 

@@ -52,7 +52,7 @@ namespace Timeline.Controllers
         /// <returns>All user list.</returns>

         [HttpGet("users")]

         [ProducesResponseType(StatusCodes.Status200OK)]

-        public async Task<ActionResult<UserInfo[]>> List()

+        public async Task<ActionResult<HttpUser[]>> List()

         {

             var users = await _userService.GetUsers();

             var result = users.Select(u => ConvertToUserInfo(u)).ToArray();

@@ -67,7 +67,7 @@ namespace Timeline.Controllers
         [HttpGet("users/{username}")]

         [ProducesResponseType(StatusCodes.Status200OK)]

         [ProducesResponseType(StatusCodes.Status404NotFound)]

-        public async Task<ActionResult<UserInfo>> Get([FromRoute][Username] string username)

+        public async Task<ActionResult<HttpUser>> Get([FromRoute][Username] string username)

         {

             try

             {

@@ -94,7 +94,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

         [ProducesResponseType(StatusCodes.Status404NotFound)]

-        public async Task<ActionResult<UserInfo>> Patch([FromBody] UserPatchRequest body, [FromRoute][Username] string username)

+        public async Task<ActionResult<HttpUser>> Patch([FromBody] HttpUserPatchRequest body, [FromRoute][Username] string username)

         {

             if (UserHasUserManagementPermission)

             {

@@ -168,7 +168,7 @@ namespace Timeline.Controllers
         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

         [ProducesResponseType(StatusCodes.Status403Forbidden)]

-        public async Task<ActionResult<UserInfo>> CreateUser([FromBody] CreateUserRequest body)

+        public async Task<ActionResult<HttpUser>> CreateUser([FromBody] HttpCreateUserRequest body)

         {

             try

             {

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

         [ProducesResponseType(StatusCodes.Status400BadRequest)]

         [ProducesResponseType(StatusCodes.Status401Unauthorized)]

-        public async Task<ActionResult> ChangePassword([FromBody] ChangePasswordRequest request)

+        public async Task<ActionResult> ChangePassword([FromBody] HttpChangePasswordRequest request)

         {

             try

             {