Option to not update UpdateDate (fixes #20)

linkdotnet · linkdotnet · commit a0f84fe1788c · 2021-07-24T11:53:19.000+02:00
diff --git a/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/Sql/SqlRepositoryTests.cs b/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/Sql/SqlRepositoryTests.cs
@@ -13,7 +13,7 @@ public sealed class SqlRepositoryTests : SqlDatabaseTestBase
         [Fact]
         public async Task ShouldLoadBlogPost()
         {
-            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url",  true, new[] { "Tag 1", "Tag 2" });
+            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url",  true, tags: new[] { "Tag 1", "Tag 2" });
             await DbContext.BlogPosts.AddAsync(blogPost);
             await DbContext.SaveChangesAsync();
 
@@ -33,7 +33,7 @@ public async Task ShouldLoadBlogPost()
         [Fact]
         public async Task ShouldSaveBlogPost()
         {
-            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url", true, new[] { "Tag 1", "Tag 2" });
+            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url", true, tags: new[] { "Tag 1", "Tag 2" });
 
             await BlogPostRepository.StoreAsync(blogPost);
 
@@ -52,7 +52,7 @@ public async Task ShouldSaveBlogPost()
         [Fact]
         public async Task ShouldGetAllBlogPosts()
         {
-            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url", true, new[] { "Tag 1", "Tag 2" });
+            var blogPost = BlogPost.Create("Title", "Subtitle", "Content", "url", true, tags: new[] { "Tag 1", "Tag 2" });
             await DbContext.BlogPosts.AddAsync(blogPost);
             await DbContext.SaveChangesAsync();
 
diff --git a/LinkDotNet.Blog.TestUtilities/BlogPostBuilder.cs b/LinkDotNet.Blog.TestUtilities/BlogPostBuilder.cs
@@ -1,4 +1,5 @@
-﻿using LinkDotNet.Domain;
+﻿using System;
+using LinkDotNet.Domain;
 
 namespace LinkDotNet.Blog.TestUtilities
 {
@@ -11,6 +12,7 @@ public class BlogPostBuilder
         private bool isPublished = true;
         private string[] tags;
         private int likes;
+        private DateTime? updateDate;
 
         public BlogPostBuilder WithTitle(string title)
         {
@@ -54,9 +56,15 @@ public BlogPostBuilder WithLikes(int likes)
             return this;
         }
 
+        public BlogPostBuilder WithUpdatedDate(DateTime updateDate)
+        {
+            this.updateDate = updateDate;
+            return this;
+        }
+
         public BlogPost Build()
         {
-            var blogPost = BlogPost.Create(title, shortDescription, content, url, isPublished, tags);
+            var blogPost = BlogPost.Create(title, shortDescription, content, url, isPublished, updateDate, tags);
             blogPost.Likes = likes;
             return blogPost;
         }
diff --git a/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs b/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
 using LinkDotNet.Domain;
@@ -29,10 +30,20 @@ public void ShouldUpdateBlogPost()
         [Fact]
         public void ShouldTrimWhitespacesFromTags()
         {
-            var blogPost = BlogPost.Create("Title", "Sub", "Content", "Preview", false, new[] { " Tag 1", " Tag 2 " });
+            var blogPost = BlogPost.Create("Title", "Sub", "Content", "Preview", false, tags: new[] { " Tag 1", " Tag 2 ", });
 
             blogPost.Tags.Select(t => t.Content).Should().Contain("Tag 1");
             blogPost.Tags.Select(t => t.Content).Should().Contain("Tag 2");
         }
+
+        [Fact]
+        public void ShouldSetDateWhenGiven()
+        {
+            var somewhen = new DateTime(1991, 5, 17);
+
+            var blog = BlogPost.Create("1", "2", "3", "4", false, somewhen);
+
+            blog.UpdatedDate.Should().Be(somewhen);
+        }
     }
 }
diff --git a/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs b/LinkDotNet.Blog.UnitTests/Web/Shared/Admin/CreateNewBlogPostTests.cs
@@ -1,4 +1,5 @@
-﻿using System.Linq;
+﻿using System;
+using System.Linq;
 using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
@@ -95,5 +96,37 @@ public void ShouldNotDeleteModelWhenNotSet()
 
             blogPost.Should().NotBeNull();
         }
+
+        [Fact]
+        public void ShouldNotUpdateUpdatedDateWhenCheckboxSet()
+        {
+            var somewhen = new DateTime(1991, 5, 17);
+            var originalBlogPost = new BlogPostBuilder().WithUpdatedDate(somewhen).Build();
+            BlogPost blogPostFromComponent = null;
+            var cut = RenderComponent<CreateNewBlogPost>(
+                p =>
+                    p.Add(c => c.OnBlogPostCreated, bp => blogPostFromComponent = bp)
+                        .Add(c => c.BlogPost, originalBlogPost));
+
+            cut.Find("#title").Change("My Title");
+            cut.Find("#short").Change("My short Description");
+            cut.Find("#content").Change("My content");
+            cut.Find("#preview").Change("My preview url");
+            cut.Find("#tags").Change("Tag1,Tag2,Tag3");
+            cut.Find("#updatedate").Change(false);
+            cut.Find("form").Submit();
+
+            blogPostFromComponent.UpdatedDate.Should().Be(somewhen);
+        }
+
+        [Fact]
+        public void ShouldNotSetOptionToNotUpdateUpdatedDateOnInitialCreate()
+        {
+            var cut = RenderComponent<CreateNewBlogPost>();
+
+            var found = cut.FindAll("#updatedate");
+
+            found.Should().HaveCount(0);
+        }
     }
 }
diff --git a/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor b/LinkDotNet.Blog.Web/Shared/Admin/CreateNewBlogPost.razor
@@ -34,6 +34,14 @@
                 <label for="tags">Tags</label>
                 <InputText class="form-control" id="tags" @bind-Value="model.Tags"/>
             </div>
+            @if (BlogPost != null)
+            {
+                <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 id="updatedate" class="form-text text-muted">If set the publish date is set to now, otherwise its original date</small>
+                </div>
+            }
             <button class="btn btn-primary" type="submit">Submit</button>
         </EditForm>
     </div>
diff --git a/LinkDotNet.Blog.Web/Shared/Admin/CreateNewModel.cs b/LinkDotNet.Blog.Web/Shared/Admin/CreateNewModel.cs
@@ -24,8 +24,13 @@ public class CreateNewModel
         [Required]
         public bool IsPublished { get; set; } = true;
 
+        [Required]
+        public bool ShouldUpdateDate { get; set; } = true;
+
         public string Tags { get; set; }
 
+        public DateTime OriginalUpdatedDate { get; set; }
+
         public static CreateNewModel FromBlogPost(BlogPost blogPost)
         {
             return new CreateNewModel
@@ -37,14 +42,16 @@ public static CreateNewModel FromBlogPost(BlogPost blogPost)
                 ShortDescription = blogPost.ShortDescription,
                 IsPublished = blogPost.IsPublished,
                 PreviewImageUrl = blogPost.PreviewImageUrl,
+                OriginalUpdatedDate = blogPost.UpdatedDate,
             };
         }
 
         public BlogPost ToBlogPost()
         {
             var tags = string.IsNullOrWhiteSpace(Tags) ? ArraySegment<string>.Empty : Tags.Split(",");
+            DateTime? updatedDate = ShouldUpdateDate ? null : OriginalUpdatedDate;
 
-            var blogPost = BlogPost.Create(Title, ShortDescription, Content, PreviewImageUrl, IsPublished, tags);
+            var blogPost = BlogPost.Create(Title, ShortDescription, Content, PreviewImageUrl, IsPublished, updatedDate, tags);
             blogPost.Id = Id;
             return blogPost;
         }
diff --git a/LinkDotNet.Domain/BlogPost.cs b/LinkDotNet.Domain/BlogPost.cs
@@ -34,14 +34,15 @@ public static BlogPost Create(
             string content,
             string previewImageUrl,
             bool isPublished,
+            DateTime? updatedDate = null,
             IEnumerable<string> tags = null)
         {
             var blogPost = new BlogPost
             {
                 Title = title,
                 ShortDescription = shortDescription,
                 Content = content,
-                UpdatedDate = DateTime.Now,
+                UpdatedDate = updatedDate ?? DateTime.Now,
                 PreviewImageUrl = previewImageUrl,
                 IsPublished = isPublished,
                 Tags = tags?.Select(t => new Tag { Content = t.Trim() }).ToList(),

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using LinkDotNet.Domain;`
	`1`	`+using System;`
	`2`	`+using LinkDotNet.Domain;`
`2`	`3`
`3`	`4`	`namespace LinkDotNet.Blog.TestUtilities`
`4`	`5`	`{`
`@@ -11,6 +12,7 @@ public class BlogPostBuilder`
`11`	`12`	`private bool isPublished = true;`
`12`	`13`	`private string[] tags;`
`13`	`14`	`private int likes;`
	`15`	`+ private DateTime? updateDate;`
`14`	`16`
`15`	`17`	`public BlogPostBuilder WithTitle(string title)`
`16`	`18`	`{`
`@@ -54,9 +56,15 @@ public BlogPostBuilder WithLikes(int likes)`
`54`	`56`	`return this;`
`55`	`57`	`}`
`56`	`58`
	`59`	`+ public BlogPostBuilder WithUpdatedDate(DateTime updateDate)`
	`60`	`+ {`
	`61`	`+ this.updateDate = updateDate;`
	`62`	`+ return this;`
	`63`	`+ }`
	`64`	`+`
`57`	`65`	`public BlogPost Build()`
`58`	`66`	`{`
`59`		`- var blogPost = BlogPost.Create(title, shortDescription, content, url, isPublished, tags);`
	`67`	`+ var blogPost = BlogPost.Create(title, shortDescription, content, url, isPublished, updateDate, tags);`
`60`	`68`	`blogPost.Likes = likes;`
`61`	`69`	`return blogPost;`
`62`	`70`	`}`