From bac1c733f276ad0f449b4c60e5662d0413cd2121 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 10 Jul 2020 15:36:51 +0800 Subject: Add deleted field. --- Timeline/Models/Http/Timeline.cs | 15 ++++++--- Timeline/Models/Timeline.cs | 4 +-- Timeline/Services/TimelineService.cs | 60 ++++++++++++++---------------------- 3 files changed, 36 insertions(+), 43 deletions(-) diff --git a/Timeline/Models/Http/Timeline.cs b/Timeline/Models/Http/Timeline.cs index 80e6e69d..aad9aa7b 100644 --- a/Timeline/Models/Http/Timeline.cs +++ b/Timeline/Models/Http/Timeline.cs @@ -18,7 +18,8 @@ namespace Timeline.Models.Http public class TimelinePostInfo { public long Id { get; set; } - public TimelinePostContentInfo Content { get; set; } = default!; + public TimelinePostContentInfo? Content { get; set; } + public bool Deleted { get; set; } public DateTime Time { get; set; } public UserInfo Author { get; set; } = default!; public DateTime LastUpdated { get; set; } = default!; @@ -73,7 +74,7 @@ namespace Timeline.Models.Http } } - public class TimelinePostContentResolver : IValueResolver + public class TimelinePostContentResolver : IValueResolver { private readonly IActionContextAccessor _actionContextAccessor; private readonly IUrlHelperFactory _urlHelperFactory; @@ -84,13 +85,18 @@ namespace Timeline.Models.Http _urlHelperFactory = urlHelperFactory; } - public TimelinePostContentInfo Resolve(TimelinePost source, TimelinePostInfo destination, TimelinePostContentInfo destMember, ResolutionContext context) + public TimelinePostContentInfo? Resolve(TimelinePost source, TimelinePostInfo destination, TimelinePostContentInfo? destMember, ResolutionContext context) { var actionContext = _actionContextAccessor.AssertActionContextForUrlFill(); var urlHelper = _urlHelperFactory.GetUrlHelper(actionContext); var sourceContent = source.Content; + if (sourceContent == null) + { + return null; + } + if (sourceContent is TextTimelinePostContent textContent) { return new TimelinePostContentInfo @@ -122,7 +128,8 @@ namespace Timeline.Models.Http public TimelineInfoAutoMapperProfile() { CreateMap().ForMember(u => u._links, opt => opt.MapFrom()); - CreateMap().ForMember(p => p.Content, opt => opt.MapFrom()); + CreateMap().ForMember(p => p.Content, opt => opt.MapFrom()) + .ForMember(p => p.Deleted, opt => opt.MapFrom((source, dest) => { return source.Content == null; })); CreateMap(); } } diff --git a/Timeline/Models/Timeline.cs b/Timeline/Models/Timeline.cs index 3701ed35..b1772fa7 100644 --- a/Timeline/Models/Timeline.cs +++ b/Timeline/Models/Timeline.cs @@ -48,7 +48,7 @@ namespace Timeline.Models public class TimelinePost { - public TimelinePost(long id, ITimelinePostContent content, DateTime time, User author, DateTime lastUpdated, string timelineName) + public TimelinePost(long id, ITimelinePostContent? content, DateTime time, User author, DateTime lastUpdated, string timelineName) { Id = id; Content = content; @@ -59,7 +59,7 @@ namespace Timeline.Models } public long Id { get; set; } - public ITimelinePostContent Content { get; set; } + public ITimelinePostContent? Content { get; set; } public DateTime Time { get; set; } public User Author { get; set; } public DateTime LastUpdated { get; set; } diff --git a/Timeline/Services/TimelineService.cs b/Timeline/Services/TimelineService.cs index 73f6c8ef..a0d72ad3 100644 --- a/Timeline/Services/TimelineService.cs +++ b/Timeline/Services/TimelineService.cs @@ -96,20 +96,8 @@ namespace Timeline.Services /// Get all the posts in the timeline. /// /// The name of the timeline. - /// A list of all posts. - /// Thrown when is null. - /// Throw when is of bad format. - /// - /// Thrown when timeline with name does not exist. - /// If it is a personal timeline, then inner exception is . - /// - Task> GetPosts(string timelineName); - - /// - /// Get the posts that have been modified since a given time in the timeline. - /// - /// The name of the timeline. /// The time that posts have been modified since. + /// Whether include deleted posts. /// A list of all posts. /// Thrown when is null. /// Throw when is of bad format. @@ -117,7 +105,7 @@ namespace Timeline.Services /// Thrown when timeline with name does not exist. /// If it is a personal timeline, then inner exception is . /// - Task> GetPosts(string timelineName, DateTime modifiedSince); + Task> GetPosts(string timelineName, DateTime? modifiedSince = null, bool includeDeleted = false); /// /// Get the etag of data of a post. @@ -399,21 +387,23 @@ namespace Timeline.Services private async Task MapTimelinePostFromEntity(TimelinePostEntity entity, string timelineName) { - if (entity.Content == null) - { - throw new ArgumentException(ExceptionPostDeleted, nameof(entity)); - } + var author = await _userService.GetUserById(entity.AuthorId); - var type = entity.ContentType; + ITimelinePostContent? content = null; - ITimelinePostContent content = type switch + if (entity.Content != null) { - TimelinePostContentTypes.Text => new TextTimelinePostContent(entity.Content), - TimelinePostContentTypes.Image => new ImageTimelinePostContent(entity.Content), - _ => throw new DatabaseCorruptedException(string.Format(CultureInfo.InvariantCulture, ExceptionDatabaseUnknownContentType, type)) - }; + var type = entity.ContentType; + + content = type switch + { + TimelinePostContentTypes.Text => new TextTimelinePostContent(entity.Content), + TimelinePostContentTypes.Image => new ImageTimelinePostContent(entity.Content), + _ => throw new DatabaseCorruptedException(string.Format(CultureInfo.InvariantCulture, ExceptionDatabaseUnknownContentType, type)) + }; + } return new TimelinePost( id: entity.LocalId, @@ -519,29 +509,25 @@ namespace Timeline.Services return await MapTimelineFromEntity(timelineEntity); } - public async Task> GetPosts(string timelineName) + public async Task> GetPosts(string timelineName, DateTime? modifiedSince = null, bool includeDeleted = false) { if (timelineName == null) 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).ToListAsync(); + var query = _database.TimelinePosts.OrderBy(p => p.Time).Where(p => p.TimelineId == timelineId); - var posts = new List(); - foreach (var entity in postEntities) + if (!includeDeleted) { - posts.Add(await MapTimelinePostFromEntity(entity, timelineName)); + query = query.Where(p => p.Content != null); } - return posts; - } - public async Task> GetPosts(string timelineName, DateTime modifiedSince) - { - if (timelineName == null) - throw new ArgumentNullException(nameof(timelineName)); + if (modifiedSince.HasValue) + { + query = query.Where(p => p.LastUpdated >= modifiedSince); + } - 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 query.ToListAsync(); var posts = new List(); foreach (var entity in postEntities) -- cgit v1.2.3