Allow user to enter schedule date

linkdotnet · linkdotnet · commit bcd881d338e2 · 2023-03-24T19:09:46.000+01:00
diff --git a/src/LinkDotNet.Blog.Domain/BlogPost.cs b/src/LinkDotNet.Blog.Domain/BlogPost.cs
@@ -46,12 +46,14 @@ public static BlogPost Create(
             throw new InvalidOperationException("Can't schedule publish date if the blog post is already published.");
         }
 
+        var blogPostUpdateDate = scheduledPublishDate ?? updatedDate ?? DateTime.Now;
+
         var blogPost = new BlogPost
         {
             Title = title,
             ShortDescription = shortDescription,
             Content = content,
-            UpdatedDate = updatedDate ?? DateTime.Now,
+            UpdatedDate = blogPostUpdateDate,
             ScheduledPublishDate = scheduledPublishDate,
             PreviewImageUrl = previewImageUrl,
             PreviewImageUrlFallback = previewImageUrlFallback,
@@ -64,12 +66,7 @@ public static BlogPost Create(
 
     public void Publish()
     {
-        if (ScheduledPublishDate is not null)
-        {
-            UpdatedDate = ScheduledPublishDate.Value;
-            ScheduledPublishDate = null;
-        }
-
+        ScheduledPublishDate = null;
         IsPublished = true;
     }
 
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPost.razor
@@ -35,31 +35,43 @@
                 <label for="preview">Preview-Url</label>
                 <InputText class="form-control" id="preview" @bind-Value="model.PreviewImageUrl"/>
                 <small for="preview" class="form-text text-muted">The primary image which will be used.</small>
-                 <ValidationMessage For="() => model.PreviewImageUrl"></ValidationMessage>
+	            <ValidationMessage For="() => model.PreviewImageUrl"></ValidationMessage>
             </div>
             <div class="mb-3">
-                <label for="preview">Fallback Preview-Url</label>
-                <InputText class="form-control" id="fallback-preview" @bind-Value="model.PreviewImageUrlFallback"/>
-                <small for="fallback-preview" class="form-text text-muted">Optional: Used as a fallback if the preview image can't be used by the browser.
-	                <br>For example using a jpg or png as fallback for avif which is not supported in Safari or Edge.</small>
-                 <ValidationMessage For="() => model.PreviewImageUrlFallback"></ValidationMessage>
+	            <label for="preview">Fallback Preview-Url</label>
+	            <InputText class="form-control" id="fallback-preview" @bind-Value="model.PreviewImageUrlFallback"/>
+	            <small for="fallback-preview" class="form-text text-muted">Optional: Used as a fallback if the preview image can't be used by the browser.
+		            <br>For example using a jpg or png as fallback for avif which is not supported in Safari or Edge.</small>
+	            <ValidationMessage For="() => model.PreviewImageUrlFallback"></ValidationMessage>
+            </div>
+            <div class="mb-3">
+	            <label for="scheduled">Scheduled Publish Date</label>
+	            <InputDate Type="InputDateType.DateTimeLocal"
+	                       class="form-control"
+	                       id="scheduled"
+	                       @bind-Value="model.ScheduledPublishDate"
+	                       @bind-Value:after="@(() => model.IsPublished &= !IsScheduled)"/>
+	            <small for="scheduled" class="form-text text-muted">If set the blog post will be published at the given date.
+		            A blog post with a schedule date can't be set to published.</small>
+	            <ValidationMessage For="() => model.ScheduledPublishDate"></ValidationMessage>
             </div>
             <div class="form-check">
-                <InputCheckbox class="form-check-input" id="published" @bind-Value="model.IsPublished" />
+                <InputCheckbox class="form-check-input" id="published" @bind-Value="model.IsPublished"/>
                 <label class="form-check-label" for="published">Publish</label><br/>
-                <small for="published" class="form-text text-muted">If this blog post is only draft uncheck the box</small>
+                <small for="published" class="form-text text-muted">If this blog post is only draft or it will be scheduled, uncheck the box.</small>
+                <ValidationMessage For="() => model.IsPublished"></ValidationMessage>
             </div>
             <div class="mb-3">
-                <label for="tags">Tags</label>
-                <InputText class="form-control" id="tags" @bind-Value="model.Tags"/>
+	            <label for="tags">Tags</label>
+	            <InputText class="form-control" id="tags" @bind-Value="model.Tags"/>
             </div>
-            @if (BlogPost != null)
+            @if (BlogPost != null && !IsScheduled)
             {
                 <div class="form-check">
                     <InputCheckbox class="form-check-input" id="updatedate" @bind-Value="model.ShouldUpdateDate" />
                     <label class="form-check-label" for="updatedate">Update Publish Date?</label><br/>
                     <small for="updatedate" class="form-text text-muted">If set the publish date is set to now,
-                    otherwise its original date</small>
+                    otherwise its original date.</small>
                 </div>
             }
             <button class="btn btn-primary" type="submit" disabled="@(!canSubmit)">Submit</button>
@@ -101,6 +113,8 @@
 
 	private bool canSubmit = true;
 
+	private bool IsScheduled => model.ScheduledPublishDate.HasValue;
+
     protected override void OnParametersSet()
     {
         if (BlogPost == null)
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/PublishedWithScheduledDateValidationAttribute.cs b/src/LinkDotNet.Blog.Web/Features/Admin/BlogPostEditor/Components/PublishedWithScheduledDateValidationAttribute.cs
@@ -9,7 +9,7 @@ public sealed class PublishedWithScheduledDateValidationAttribute : ValidationAt
     protected override ValidationResult IsValid(object value, ValidationContext validationContext)
     {
         return validationContext.ObjectInstance is CreateNewModel { IsPublished: true, ScheduledPublishDate: { } }
-            ? new ValidationResult("Cannot have a scheduled publish date when the post is already published.")
+            ? new ValidationResult("Cannot publish the post right away and schedule it for later.")
             : ValidationResult.Success;
     }
 }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs
@@ -101,4 +101,14 @@ public void ShouldUpdateScheduledPublishDate()
 
         blogPost.ScheduledPublishDate.Should().Be(new DateTime(2023, 3, 24));
     }
+
+    [Fact]
+    public void GivenScheduledPublishDate_WhenCreating_ThenUpdateDateIsScheduledPublishDate()
+    {
+        var date = new DateTime(2023, 3, 24);
+
+        var bp = BlogPost.Create("1", "2", "3", "4", false, scheduledPublishDate: date);
+
+        bp.UpdatedDate.Should().Be(date);
+    }
 }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Web/Features/Admin/BlogPostEditor/Components/CreateNewBlogPostTests.cs
@@ -1,5 +1,7 @@
 ﻿using System;
 using System.Linq;
+using AngleSharp.Html.Dom;
+using AngleSharpWrappers;
 using LinkDotNet.Blog.Domain;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Blog.Web.Features.Admin.BlogPostEditor.Components;
@@ -207,4 +209,40 @@ public void ShouldNotBlogNavigationOnInitialLoad()
         fakeNavigationManager.History.Count.Should().Be(1);
         fakeNavigationManager.History.Single().State.Should().Be(NavigationState.Succeeded);
     }
-}
+
+    [Fact]
+    public void GivenBlogPostWithSchedule_ShouldSetSchedule()
+    {
+        BlogPost blogPost = null;
+        var cut = RenderComponent<CreateNewBlogPost>(
+            p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
+        cut.Find("#title").Input("My Title");
+        cut.Find("#short").Input("My short Description");
+        cut.Find("#content").Input("My content");
+        cut.Find("#preview").Change("My preview url");
+        cut.Find("#published").Change(false);
+        cut.Find("#scheduled").Change("01/01/2099 00:00");
+
+        cut.Find("form").Submit();
+
+        blogPost.ScheduledPublishDate.Should().Be(new DateTime(2099, 01, 01));
+    }
+
+    [Fact]
+    public void GivenBlogPost_WhenEnteringScheduledDate_ThenIsPublishedSetToFalse()
+    {
+        BlogPost blogPost = null;
+        var cut = RenderComponent<CreateNewBlogPost>(
+            p => p.Add(c => c.OnBlogPostCreated, bp => blogPost = bp));
+        cut.Find("#title").Input("My Title");
+        cut.Find("#short").Input("My short Description");
+        cut.Find("#content").Input("My content");
+        cut.Find("#preview").Change("My preview url");
+        cut.Find("#published").Change(true);
+
+        cut.Find("#scheduled").Change("01/01/2099 00:00");
+
+        var element = cut.Find("#published").Unwrap() as IHtmlInputElement;
+        element.IsChecked.Should().BeFalse();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public sealed class PublishedWithScheduledDateValidationAttribute : ValidationAt`
`9`	`9`	`protected override ValidationResult IsValid(object value, ValidationContext validationContext)`
`10`	`10`	`{`
`11`	`11`	`return validationContext.ObjectInstance is CreateNewModel { IsPublished: true, ScheduledPublishDate: { } }`
`12`		`- ? new ValidationResult("Cannot have a scheduled publish date when the post is already published.")`
	`12`	`+ ? new ValidationResult("Cannot publish the post right away and schedule it for later.")`
`13`	`13`	`: ValidationResult.Success;`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,4 +101,14 @@ public void ShouldUpdateScheduledPublishDate()`
`101`	`101`
`102`	`102`	`blogPost.ScheduledPublishDate.Should().Be(new DateTime(2023, 3, 24));`
`103`	`103`	`}`
	`104`	`+`
	`105`	`+ [Fact]`
	`106`	`+ public void GivenScheduledPublishDate_WhenCreating_ThenUpdateDateIsScheduledPublishDate()`
	`107`	`+ {`
	`108`	`+ var date = new DateTime(2023, 3, 24);`
	`109`	`+`
	`110`	`+ var bp = BlogPost.Create("1", "2", "3", "4", false, scheduledPublishDate: date);`
	`111`	`+`
	`112`	`+ bp.UpdatedDate.Should().Be(date);`
	`113`	`+ }`
`104`	`114`	`}`