Add support for promote properties to be nullable - i.e. promote item…

…s without an end date (fully evergreen) (#200)
endjin · Nov 12, 2023 · b66d533 · b66d533
1 parent 6ad8788
commit b66d533
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/Solutions/Stacker.Cli/Domain/Universal/ContentItem.cs b/Solutions/Stacker.Cli/Domain/Universal/ContentItem.cs
@@ -20,9 +20,9 @@ public class ContentItem
 
     public string Id { get; internal set; }
 
-    public bool Promote { get; internal set; }
+    public bool? Promote { get; internal set; }
 
-    public DateTimeOffset PromoteUntil { get; set; }
+    public DateTimeOffset? PromoteUntil { get; set; }
 
     public DateTimeOffset PublishedOn { get; set; }
 

diff --git a/Solutions/Stacker.Cli/Domain/WordPress/BlogSite.cs b/Solutions/Stacker.Cli/Domain/WordPress/BlogSite.cs
@@ -350,14 +350,7 @@ private void ParseStackerPromote(XElement metaKeyElement, Post post)
             {
                 XElement promoteUntilElement = metaKeyElement.NextNode as XElement;
 
-                if (DateTimeOffset.TryParse(promoteUntilElement?.Value, out DateTimeOffset promoteUntil))
-                {
-                    post.PromoteUntil = promoteUntil;
-                }
-                else
-                {
-                    post.PromoteUntil = DateTimeOffset.MaxValue;
-                }
+                post.PromoteUntil = DateTimeOffset.TryParse(promoteUntilElement?.Value, out DateTimeOffset promoteUntil) ? promoteUntil : DateTimeOffset.MaxValue;
             }
         }
         catch (Exception)

diff --git a/Solutions/Stacker.Cli/Domain/WordPress/Post.cs b/Solutions/Stacker.Cli/Domain/WordPress/Post.cs
@@ -35,9 +35,9 @@ public Post()
 
     public Dictionary<string, string> MetaData { get; set; }
 
-    public bool Promote { get; set; }
+    public bool? Promote { get; set; }
 
-    public DateTimeOffset PromoteUntil { get; set; } = DateTimeOffset.MaxValue;
+    public DateTimeOffset? PromoteUntil { get; set; } = DateTimeOffset.MaxValue;
 
     public DateTimeOffset PublishedAtUtc { get; set; }
 

diff --git a/Solutions/Stacker.Cli/Domain/WordPress/PostExtensions.cs b/Solutions/Stacker.Cli/Domain/WordPress/PostExtensions.cs
@@ -14,7 +14,7 @@ public static class PostExtensions
 {
     public static IEnumerable<Post> FilterByPromotable(this IEnumerable<Post> posts)
     {
-        return posts.Where(p => (p.Promote && p.PromoteUntil == DateTimeOffset.MinValue) || (p.Promote && p.PromoteUntil > DateTimeOffset.Now));
+        return posts.Where(p => (p.Promote is not null && p.Promote.Value &&  p.PromoteUntil == DateTimeOffset.MinValue) || (p.Promote is not null && p.Promote.Value && p.PromoteUntil > DateTimeOffset.Now));
     }
 
     public static IEnumerable<Post> FilterByValid(this IEnumerable<Post> posts, StackerSettings settings)

diff --git a/Solutions/Stacker.Cli/Tasks/ContentTasks.cs b/Solutions/Stacker.Cli/Tasks/ContentTasks.cs
@@ -85,7 +85,7 @@ public async Task<IEnumerable<ContentItem>> LoadContentItemsAsync(
     {
         string fileContent = string.Empty;
 
-        if (contentUri is not null || !string.IsNullOrEmpty(contentUri.AbsoluteUri))
+        if (contentUri is not null && !string.IsNullOrEmpty(contentUri.AbsoluteUri))
         {
             using HttpClient client = this.httpClientFactory.CreateClient();
             fileContent = await client.GetStringAsync(contentUri).ConfigureAwait(false);