From 3f4e88757f961532b84df85e86d21995655a29d4 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 27 Nov 2020 00:07:09 +0800
Subject: refactor: ...

---
 BackEnd/Timeline/Controllers/TimelineController.cs | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'BackEnd/Timeline/Controllers/TimelineController.cs')

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)
             {
-- 
cgit v1.2.3