1 files changed, 11 insertions, 4 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<TimelinePost, TimelinePostInfo, TimelinePostContentInfo>

+    public class TimelinePostContentResolver : IValueResolver<TimelinePost, TimelinePostInfo, TimelinePostContentInfo?>

     {

         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<Timeline, TimelineInfo>().ForMember(u => u._links, opt => opt.MapFrom<TimelineInfoLinksValueResolver>());

-            CreateMap<TimelinePost, TimelinePostInfo>().ForMember(p => p.Content, opt => opt.MapFrom<TimelinePostContentResolver>());

+            CreateMap<TimelinePost, TimelinePostInfo>().ForMember(p => p.Content, opt => opt.MapFrom<TimelinePostContentResolver>())

+                                                       .ForMember(p => p.Deleted, opt => opt.MapFrom((source, dest) => { return source.Content == null; }));

             CreateMap<TimelinePatchRequest, TimelineChangePropertyRequest>();

         }

     }