From 4214c5dd5724bbe0bb8225534568dd4b0e904068 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 18 Jun 2020 19:41:51 +0800 Subject: feat(back): Timeline service add post modified since. --- Timeline.Tests/Services/TimelineServiceTest.cs | 34 ++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) (limited to 'Timeline.Tests/Services/TimelineServiceTest.cs') diff --git a/Timeline.Tests/Services/TimelineServiceTest.cs b/Timeline.Tests/Services/TimelineServiceTest.cs index cb2ade61..4f081b5d 100644 --- a/Timeline.Tests/Services/TimelineServiceTest.cs +++ b/Timeline.Tests/Services/TimelineServiceTest.cs @@ -63,11 +63,11 @@ namespace Timeline.Tests.Services [InlineData("tl")] public async Task Timeline_LastModified(string timelineName) { - _clock.ForwardCurrentTime(); + var initTime = _clock.ForwardCurrentTime(); void Check(Models.Timeline timeline) { - timeline.NameLastModified.Should().Be(_clock.GetCurrentTime()); + timeline.NameLastModified.Should().Be(initTime); timeline.LastModified.Should().Be(_clock.GetCurrentTime()); } @@ -90,5 +90,35 @@ namespace Timeline.Tests.Services await _timelineService.ChangeMember(timelineName, new List { "admin" }, null); await GetAndCheck(); } + + [Theory] + [InlineData("@user")] + [InlineData("tl")] + public async Task GetPosts_ModifiedSince(string timelineName) + { + _clock.ForwardCurrentTime(); + + var userId = await _userService.GetUserIdByUsername("user"); + + var _ = TimelineHelper.ExtractTimelineName(timelineName, out var isPersonal); + if (!isPersonal) + await _timelineService.CreateTimeline(timelineName, userId); + + var postContentList = new string[] { "a", "b", "c", "d" }; + + DateTime testPoint = new DateTime(); + + foreach (var (content, index) in postContentList.Select((v, i) => (v, i))) + { + var t = _clock.ForwardCurrentTime(); + if (index == 1) + testPoint = t; + await _timelineService.CreateTextPost(timelineName, userId, content, null); + } + + var posts = await _timelineService.GetPosts(timelineName, testPoint); + posts.Should().HaveCount(2) + .And.Subject.Select(p => (p.Content as TextTimelinePostContent).Text).Should().Equal(postContentList.Skip(2)); + } } } -- cgit v1.2.3 From d0132263b22b1f84fe51b87c8f271f055f176f34 Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 18 Jun 2020 22:36:00 +0800 Subject: Clean codes. --- Timeline.Tests/Services/TimelineServiceTest.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Timeline.Tests/Services/TimelineServiceTest.cs') diff --git a/Timeline.Tests/Services/TimelineServiceTest.cs b/Timeline.Tests/Services/TimelineServiceTest.cs index 4f081b5d..cde827db 100644 --- a/Timeline.Tests/Services/TimelineServiceTest.cs +++ b/Timeline.Tests/Services/TimelineServiceTest.cs @@ -1,6 +1,4 @@ -using Castle.Core.Logging; -using FluentAssertions; -using FluentAssertions.Xml; +using FluentAssertions; using Microsoft.Extensions.Logging.Abstractions; using System; using System.Collections.Generic; @@ -16,7 +14,7 @@ namespace Timeline.Tests.Services { public class TimelineServiceTest : IAsyncLifetime, IDisposable { - private TestDatabase _testDatabase = new TestDatabase(); + private readonly TestDatabase _testDatabase = new TestDatabase(); private DatabaseContext _databaseContext; -- cgit v1.2.3 From 35f4e03157fdb6643dc42db0cd764804e00944aa Mon Sep 17 00:00:00 2001 From: crupest Date: Thu, 18 Jun 2020 23:36:56 +0800 Subject: Add integrated tests. And fix a behavior. --- Timeline.Tests/IntegratedTests/TimelineTest.cs | 98 +++++++++++++++++++++----- Timeline.Tests/Services/TimelineServiceTest.cs | 4 +- Timeline/Services/TimelineService.cs | 2 +- 3 files changed, 82 insertions(+), 22 deletions(-) (limited to 'Timeline.Tests/Services/TimelineServiceTest.cs') diff --git a/Timeline.Tests/IntegratedTests/TimelineTest.cs b/Timeline.Tests/IntegratedTests/TimelineTest.cs index 6736fecd..4f21d8d1 100644 --- a/Timeline.Tests/IntegratedTests/TimelineTest.cs +++ b/Timeline.Tests/IntegratedTests/TimelineTest.cs @@ -5,9 +5,11 @@ using SixLabors.ImageSharp; using SixLabors.ImageSharp.Formats.Png; using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Net; using System.Net.Http; +using System.Text; using System.Threading.Tasks; using Timeline.Entities; using Timeline.Models; @@ -68,17 +70,43 @@ namespace Timeline.Tests.IntegratedTests } } - private static string GeneratePersonalTimelineUrl(int id, string subpath = null) + private static string CalculateUrlTail(string subpath, ICollection> query) { - return $"timelines/@{(id == 0 ? "admin" : ("user" + id))}/{(subpath ?? "")}"; + StringBuilder result = new StringBuilder(); + if (subpath != null) + { + if (!subpath.StartsWith("/", StringComparison.OrdinalIgnoreCase)) + result.Append("/"); + result.Append(subpath); + } + + if (query != null && query.Count != 0) + { + result.Append("?"); + foreach (var (key, value, index) in query.Select((pair, index) => (pair.Key, pair.Value, index))) + { + result.Append(WebUtility.UrlEncode(key)); + result.Append("="); + result.Append(WebUtility.UrlEncode(value)); + if (index != query.Count - 1) + result.Append("&"); + } + } + + return result.ToString(); } - private static string GenerateOrdinaryTimelineUrl(int id, string subpath = null) + private static string GeneratePersonalTimelineUrl(int id, string subpath = null, ICollection> query = null) { - return $"timelines/t{id}/{(subpath ?? "")}"; + return $"timelines/@{(id == 0 ? "admin" : ("user" + id))}{CalculateUrlTail(subpath, query)}"; } - public delegate string TimelineUrlGenerator(int userId, string subpath = null); + private static string GenerateOrdinaryTimelineUrl(int id, string subpath = null, ICollection> query = null) + { + return $"timelines/t{id}{CalculateUrlTail(subpath, query)}"; + } + + public delegate string TimelineUrlGenerator(int userId, string subpath = null, ICollection> query = null); public static IEnumerable TimelineUrlGeneratorData() { @@ -88,12 +116,12 @@ namespace Timeline.Tests.IntegratedTests private static string GeneratePersonalTimelineUrlByName(string name, string subpath = null) { - return $"timelines/@{name}/{(subpath ?? "")}"; + return $"timelines/@{name}{(subpath == null ? "" : "/" + subpath)}"; } private static string GenerateOrdinaryTimelineUrlByName(string name, string subpath = null) { - return $"timelines/{name}/{(subpath ?? "")}"; + return $"timelines/{name}{(subpath == null ? "" : "/" + subpath)}"; } public static IEnumerable TimelineUrlByNameGeneratorData() @@ -632,19 +660,20 @@ namespace Timeline.Tests.IntegratedTests await AssertEmptyMembers(); } - [Theory] - [InlineData(nameof(GenerateOrdinaryTimelineUrl), -1, 200, 401, 401, 401, 401)] - [InlineData(nameof(GenerateOrdinaryTimelineUrl), 1, 200, 200, 403, 200, 403)] - [InlineData(nameof(GenerateOrdinaryTimelineUrl), 0, 200, 200, 200, 200, 200)] - [InlineData(nameof(GeneratePersonalTimelineUrl), -1, 200, 401, 401, 401, 401)] - [InlineData(nameof(GeneratePersonalTimelineUrl), 1, 200, 200, 403, 200, 403)] - [InlineData(nameof(GeneratePersonalTimelineUrl), 0, 200, 200, 200, 200, 200)] - - public async Task Permission_Timeline(string generatorName, int userNumber, int get, int opPatchUser, int opPatchAdmin, int opMemberUser, int opMemberAdmin) + public static IEnumerable Permission_Timeline_Data() { - var method = GetType().GetMethod(generatorName, System.Reflection.BindingFlags.Static | System.Reflection.BindingFlags.NonPublic); - Func generator = (int id, string subpath) => (string)method.Invoke(null, new object[] { id, subpath }); + yield return new object[] { new TimelineUrlGenerator(GenerateOrdinaryTimelineUrl), -1, 200, 401, 401, 401, 401 }; + yield return new object[] { new TimelineUrlGenerator(GenerateOrdinaryTimelineUrl), 1, 200, 200, 403, 200, 403 }; + yield return new object[] { new TimelineUrlGenerator(GenerateOrdinaryTimelineUrl), 0, 200, 200, 200, 200, 200 }; + yield return new object[] { new TimelineUrlGenerator(GeneratePersonalTimelineUrl), -1, 200, 401, 401, 401, 401 }; + yield return new object[] { new TimelineUrlGenerator(GeneratePersonalTimelineUrl), 1, 200, 200, 403, 200, 403 }; + yield return new object[] { new TimelineUrlGenerator(GeneratePersonalTimelineUrl), 0, 200, 200, 200, 200, 200 }; + } + [Theory] + [MemberData(nameof(Permission_Timeline_Data))] + public async Task Permission_Timeline(TimelineUrlGenerator generator, int userNumber, int get, int opPatchUser, int opPatchAdmin, int opMemberUser, int opMemberAdmin) + { using var client = await CreateClientAs(userNumber); { var res = await client.GetAsync("timelines/t1"); @@ -1150,7 +1179,7 @@ namespace Timeline.Tests.IntegratedTests [Theory] [MemberData(nameof(TimelineUrlGeneratorData))] - public async Task LastModified(TimelineUrlGenerator generator) + public async Task Timeline_LastModified(TimelineUrlGenerator generator) { using var client = await CreateClientAsUser(); @@ -1193,5 +1222,36 @@ namespace Timeline.Tests.IntegratedTests .Which.LastModified.Should().BeAfter(lastModified); } } + + [Theory] + [MemberData(nameof(TimelineUrlGeneratorData))] + public async Task Post_ModifiedSince(TimelineUrlGenerator generator) + { + using var client = await CreateClientAsUser(); + + DateTime testPoint = new DateTime(); + var postContentList = new List { "a", "b", "c", "d" }; + + foreach (var (content, index) in postContentList.Select((v, i) => (v, i))) + { + var res = await client.PostAsJsonAsync(generator(1, "posts"), + new TimelinePostCreateRequest { Content = new TimelinePostCreateRequestContent { Text = content, Type = TimelinePostContentTypes.Text } }); + var post = res.Should().HaveStatusCode(200) + .And.HaveJsonBody().Which; + if (index == 1) + testPoint = post.LastUpdated; + await Task.Delay(1000); + } + + { + + var res = await client.GetAsync(generator(1, "posts", + new Dictionary { { "modifiedSince", testPoint.ToString("s", CultureInfo.InvariantCulture) } })); + res.Should().HaveStatusCode(200) + .And.HaveJsonBody>() + .Which.Should().HaveCount(3) + .And.Subject.Select(p => p.Content.Text).Should().Equal(postContentList.Skip(1)); + } + } } } diff --git a/Timeline.Tests/Services/TimelineServiceTest.cs b/Timeline.Tests/Services/TimelineServiceTest.cs index cde827db..7e7242a2 100644 --- a/Timeline.Tests/Services/TimelineServiceTest.cs +++ b/Timeline.Tests/Services/TimelineServiceTest.cs @@ -115,8 +115,8 @@ namespace Timeline.Tests.Services } var posts = await _timelineService.GetPosts(timelineName, testPoint); - posts.Should().HaveCount(2) - .And.Subject.Select(p => (p.Content as TextTimelinePostContent).Text).Should().Equal(postContentList.Skip(2)); + posts.Should().HaveCount(3) + .And.Subject.Select(p => (p.Content as TextTimelinePostContent).Text).Should().Equal(postContentList.Skip(1)); } } } diff --git a/Timeline/Services/TimelineService.cs b/Timeline/Services/TimelineService.cs index e0b1b51d..73f6c8ef 100644 --- a/Timeline/Services/TimelineService.cs +++ b/Timeline/Services/TimelineService.cs @@ -541,7 +541,7 @@ namespace Timeline.Services throw new ArgumentNullException(nameof(timelineName)); var timelineId = await FindTimelineId(timelineName); - var postEntities = await _database.TimelinePosts.OrderBy(p => p.Time).Where(p => p.TimelineId == timelineId && p.Content != null && p.LastUpdated > modifiedSince).ToListAsync(); + var postEntities = await _database.TimelinePosts.OrderBy(p => p.Time).Where(p => p.TimelineId == timelineId && p.Content != null && p.LastUpdated >= modifiedSince).ToListAsync(); var posts = new List(); foreach (var entity in postEntities) -- cgit v1.2.3