From 94f64bd98a267360a9e941b86c56c614605067f2 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Fri, 10 Jul 2020 20:18:08 +0800
Subject: Add http api and integrated tests.

---
 Timeline.Tests/IntegratedTests/TimelineTest.cs | 34 ++++++++++++++++++++++++++
 Timeline/Controllers/TimelineController.cs     |  8 ++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Timeline.Tests/IntegratedTests/TimelineTest.cs b/Timeline.Tests/IntegratedTests/TimelineTest.cs
index 64619864..4ba8800e 100644
--- a/Timeline.Tests/IntegratedTests/TimelineTest.cs
+++ b/Timeline.Tests/IntegratedTests/TimelineTest.cs
@@ -1255,5 +1255,39 @@ namespace Timeline.Tests.IntegratedTests
                     .And.Subject.Select(p => p.Content.Text).Should().Equal(postContentList.Skip(1));
             }
         }
+
+        [Theory]
+        [MemberData(nameof(TimelineUrlGeneratorData))]
+        public async Task PostList_IncludeDeleted(TimelineUrlGenerator urlGenerator)
+        {
+            using var client = await CreateClientAsUser();
+
+            var postContentList = new List<string> { "a", "b", "c", "d" };
+            var posts = new List<TimelinePostInfo>();
+
+            foreach (var content in postContentList)
+            {
+                var res = await client.PostAsJsonAsync(urlGenerator(1, "posts"),
+                    new TimelinePostCreateRequest { Content = new TimelinePostCreateRequestContent { Text = content, Type = TimelinePostContentTypes.Text } });
+                posts.Add(res.Should().HaveStatusCode(200)
+                    .And.HaveJsonBody<TimelinePostInfo>().Which);
+            }
+
+            foreach (var id in new long[] { posts[0].Id, posts[2].Id })
+            {
+                var res = await client.DeleteAsync(urlGenerator(1, $"posts/{id}"));
+                res.Should().BeDelete(true);
+            }
+
+            {
+                var res = await client.GetAsync(urlGenerator(1, "posts", new Dictionary<string, string> { ["includeDeleted"] = "true" }));
+                posts = res.Should().HaveStatusCode(200)
+                    .And.HaveJsonBody<List<TimelinePostInfo>>()
+                    .Which;
+                posts.Should().HaveCount(4);
+                posts.Select(p => p.Deleted).Should().Equal(true, false, true, false);
+                posts.Select(p => p.Content == null).Should().Equal(true, false, true, false);
+            }
+        }
     }
 }
diff --git a/Timeline/Controllers/TimelineController.cs b/Timeline/Controllers/TimelineController.cs
index b8cc608b..2330698f 100644
--- a/Timeline/Controllers/TimelineController.cs
+++ b/Timeline/Controllers/TimelineController.cs
@@ -102,18 +102,14 @@ namespace Timeline.Controllers
         }
 
         [HttpGet("timelines/{name}/posts")]
-        public async Task<ActionResult<List<TimelinePostInfo>>> PostListGet([FromRoute][GeneralTimelineName] string name, [FromQuery] DateTime? modifiedSince)
+        public async Task<ActionResult<List<TimelinePostInfo>>> PostListGet([FromRoute][GeneralTimelineName] string name, [FromQuery] DateTime? modifiedSince, [FromQuery] bool? includeDeleted)
         {
             if (!this.IsAdministrator() && !await _service.HasReadPermission(name, this.GetOptionalUserId()))
             {
                 return StatusCode(StatusCodes.Status403Forbidden, ErrorResponse.Common.Forbid());
             }
 
-            List<TimelinePost> posts;
-            if (modifiedSince == null)
-                posts = await _service.GetPosts(name);
-            else
-                posts = await _service.GetPosts(name, modifiedSince.Value);
+            List<TimelinePost> posts = await _service.GetPosts(name, modifiedSince, includeDeleted ?? false);
 
             var result = _mapper.Map<List<TimelinePostInfo>>(posts);
             return result;
-- 
cgit v1.2.3