Use OPEN_JSON for persisting tags

linkdotnet · linkdotnet · commit afb88248dddf · 2023-08-01T21:58:08.000+02:00
diff --git a/src/LinkDotNet.Blog.Domain/BlogPost.cs b/src/LinkDotNet.Blog.Domain/BlogPost.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 
 namespace LinkDotNet.Blog.Domain;
@@ -24,15 +25,15 @@ private BlogPost()
 
     public DateTime? ScheduledPublishDate { get; private set; }
 
-    public ICollection<Tag> Tags { get; private set; }
+    public ICollection<string> Tags { get; private set; }
 
     public bool IsPublished { get; private set; }
 
     public int Likes { get; set; }
 
     public bool IsScheduled => ScheduledPublishDate is not null;
 
-    public string TagsAsString => Tags is null ? string.Empty : string.Join(", ", Tags.Select(t => t.Content));
+    public string TagsAsString => Tags is null ? string.Empty : string.Join(", ", Tags);
 
     public static BlogPost Create(
         string title,
@@ -62,7 +63,7 @@ public static BlogPost Create(
             PreviewImageUrl = previewImageUrl,
             PreviewImageUrlFallback = previewImageUrlFallback,
             IsPublished = isPublished,
-            Tags = tags?.Select(Tag.Create).ToList(),
+            Tags = tags?.Select(t => t.Trim()).ToImmutableArray(),
         };
 
         return blogPost;
@@ -89,22 +90,6 @@ public void Update(BlogPost from)
         PreviewImageUrl = from.PreviewImageUrl;
         PreviewImageUrlFallback = from.PreviewImageUrlFallback;
         IsPublished = from.IsPublished;
-        ReplaceTags(from.Tags);
-    }
-
-    private void ReplaceTags(IEnumerable<Tag> tags)
-    {
-        Tags?.Clear();
-        if (Tags == null || tags == null)
-        {
-            Tags = tags?.ToList();
-        }
-        else
-        {
-            foreach (var tag in tags)
-            {
-                Tags.Add(tag);
-            }
-        }
+        Tags = from.Tags;
     }
 }
diff --git a/src/LinkDotNet.Blog.Domain/Tag.cs b/src/LinkDotNet.Blog.Domain/Tag.cs
diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/BlogDbContext.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/BlogDbContext.cs
@@ -14,8 +14,6 @@ public BlogDbContext(DbContextOptions options)
 
     public DbSet<BlogPost> BlogPosts { get; set; }
 
-    public DbSet<Tag> Tags { get; set; }
-
     public DbSet<ProfileInformationEntry> ProfileInformationEntries { get; set; }
 
     public DbSet<Skill> Skills { get; set; }
@@ -27,7 +25,6 @@ public BlogDbContext(DbContextOptions options)
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.ApplyConfiguration(new BlogPostConfiguration());
-        modelBuilder.ApplyConfiguration(new TagsConfiguration());
         modelBuilder.ApplyConfiguration(new ProfileInformationEntryConfiguration());
         modelBuilder.ApplyConfiguration(new SkillConfiguration());
         modelBuilder.ApplyConfiguration(new UserRecordConfiguration());
diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/BlogPostConfiguration.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/BlogPostConfiguration.cs
@@ -10,11 +10,6 @@ public void Configure(EntityTypeBuilder<BlogPost> builder)
     {
         builder.HasKey(c => c.Id);
         builder.Property(c => c.Id).ValueGeneratedOnAdd();
-
-        builder.HasMany(t => t.Tags)
-            .WithOne()
-            .OnDelete(DeleteBehavior.Cascade);
-        builder.Navigation(x => x.Tags).AutoInclude();
         builder.Property(x => x.Title).HasMaxLength(256).IsRequired();
         builder.Property(x => x.PreviewImageUrl).HasMaxLength(1024).IsRequired();
         builder.Property(x => x.PreviewImageUrlFallback).HasMaxLength(1024);
diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/TagsConfiguration.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Mapping/TagsConfiguration.cs
diff --git a/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs b/src/LinkDotNet.Blog.Infrastructure/Persistence/Sql/Repository.cs
@@ -69,12 +69,21 @@ public async ValueTask StoreAsync(TEntity entity)
         }
         else
         {
-            blogDbContext.Entry(entity).State = EntityState.Modified;
+            var dbEntity = blogDbContext.Set<TEntity>().Local.FirstOrDefault(e => e.Id == entity.Id);
+            if (dbEntity != null)
+            {
+                blogDbContext.Entry(dbEntity).CurrentValues.SetValues(entity);
+                blogDbContext.Entry(dbEntity).State = EntityState.Modified;
+            }
+            else
+            {
+                blogDbContext.Entry(entity).State = EntityState.Modified;
+            }
         }
 
         await blogDbContext.SaveChangesAsync();
     }
-
+    
     public async ValueTask DeleteAsync(string id)
     {
         var entityToDelete = await GetByIdAsync(id);
diff --git a/src/LinkDotNet.Blog.Web/Controller/RssFeedController.cs b/src/LinkDotNet.Blog.Web/Controller/RssFeedController.cs
@@ -86,9 +86,9 @@ private static SyndicationItem CreateSyndicationItemFromBlogPost(string url, Blo
 
     private static void AddCategories(ICollection<SyndicationCategory> categories, BlogPostRssInfo blogPost)
     {
-        foreach (var tag in blogPost.Tags ?? Array.Empty<Tag>())
+        foreach (var tag in blogPost.Tags ?? Array.Empty<string>())
         {
-            categories.Add(new SyndicationCategory(tag.Content));
+            categories.Add(new SyndicationCategory(tag));
         }
     }
 
@@ -107,5 +107,5 @@ private sealed record BlogPostRssInfo(
         string ShortDescription,
         DateTime UpdatedDate,
         string PreviewImageUrl,
-        ICollection<Tag> Tags);
+        ICollection<string> Tags);
 }
diff --git a/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapService.cs b/src/LinkDotNet.Blog.Web/Features/Admin/Sitemap/Services/SitemapService.cs
@@ -57,7 +57,6 @@ private IEnumerable<SitemapUrl> CreateUrlsForTags(IEnumerable<BlogPost> blogPost
     {
         return blogPosts
             .SelectMany(b => b.Tags)
-            .Select(t => t.Content)
             .Distinct()
             .Select(t => new SitemapUrl
             {
diff --git a/src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor b/src/LinkDotNet.Blog.Web/Features/Components/ShortBlogPost.razor
@@ -28,7 +28,7 @@
 				{
 					<li class="tags me-4">
 						<ul>
-							@foreach (var tag in BlogPost.Tags.Select(t => t.Content))
+							@foreach (var tag in BlogPost.Tags)
 							{
 								<li><a class="goto-tag" href="/searchByTag/@(Uri.EscapeDataString(tag))">@tag</a></li>
 							}
diff --git a/src/LinkDotNet.Blog.Web/Features/Search/SearchPage.razor b/src/LinkDotNet.Blog.Web/Features/Search/SearchPage.razor
@@ -24,7 +24,7 @@
     {
         var term = Uri.UnescapeDataString(SearchTerm);
         blogPosts = await BlogPostRepository.GetAllAsync(t => t.IsPublished && (t.Title.Contains(term)
-                                                                                 || t.Tags.Any(tag => tag.Content == term)),
+                                                                                 || t.Tags.Any(tag => tag == term)),
             b => b.UpdatedDate);
     }
 
diff --git a/src/LinkDotNet.Blog.Web/Features/SearchByTag/SearchByTagPage.razor b/src/LinkDotNet.Blog.Web/Features/SearchByTag/SearchByTagPage.razor
@@ -23,7 +23,7 @@
     {
         Tag = Uri.UnescapeDataString(Tag);
         blogPosts = await BlogPostRepository.GetAllAsync(
-            b => b.IsPublished && b.Tags.Any(t => t.Content == Tag),
+            b => b.IsPublished && b.Tags.Any(t => t == Tag),
             b => b.UpdatedDate);
     }
 
diff --git a/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor b/src/LinkDotNet.Blog.Web/Features/ShowBlogPost/ShowBlogPostPage.razor
@@ -37,7 +37,7 @@ else
 					@if (BlogPost.Tags != null && BlogPost.Tags.Any())
 					{
 						<span class="blogpost-tag d-inline-block">
-							@foreach (var tag in BlogPost.Tags.Select(t => t.Content))
+							@foreach (var tag in BlogPost.Tags)
 							{
 								<a class="goto-tag ms-1" href="/searchByTag/@(Uri.EscapeDataString(tag))">@tag</a>
 							}
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/CachedRepositoryTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/CachedRepositoryTests.cs
@@ -20,13 +20,13 @@ public async Task ShouldNotCacheWhenDifferentQueries()
         await Repository.StoreAsync(bp3);
         var searchTerm = "tag 1";
         var sut = new CachedRepository<BlogPost>(Repository, new MemoryCache(new MemoryCacheOptions()));
-        await sut.GetAllAsync(f => f.Tags.Any(t => t.Content == searchTerm));
+        await sut.GetAllAsync(f => f.Tags.Any(t => t == searchTerm));
         searchTerm = "tag 2";
 
-        var allWithTag2 = await sut.GetAllAsync(f => f.Tags.Any(t => t.Content == searchTerm));
+        var allWithTag2 = await sut.GetAllAsync(f => f.Tags.Any(t => t == searchTerm));
 
         allWithTag2.Count.Should().Be(1);
-        allWithTag2.Single().Tags.Single().Content.Should().Be("tag 2");
+        allWithTag2.Single().Tags.Single().Should().Be("tag 2");
     }
 
     [Fact]
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/RavenDb/BlogPostRepositoryTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/RavenDb/BlogPostRepositoryTests.cs
@@ -37,7 +37,7 @@ public async Task ShouldLoadBlogPost()
         blogPostFromRepo.PreviewImageUrl.Should().Be("url");
         blogPostFromRepo.IsPublished.Should().BeTrue();
         blogPostFromRepo.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromRepo.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromRepo.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
@@ -96,7 +96,7 @@ public async Task ShouldSaveBlogPost()
         blogPostFromContext.IsPublished.Should().BeTrue();
         blogPostFromContext.PreviewImageUrl.Should().Be("url");
         blogPostFromContext.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromContext.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromContext.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
@@ -117,7 +117,7 @@ public async Task ShouldGetAllBlogPosts()
         blogPostFromRepo.PreviewImageUrl.Should().Be("url");
         blogPostFromRepo.IsPublished.Should().BeTrue();
         blogPostFromRepo.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromRepo.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromRepo.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
diff --git a/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/Sql/BlogPostRepositoryTests.cs b/tests/LinkDotNet.Blog.IntegrationTests/Infrastructure/Persistence/Sql/BlogPostRepositoryTests.cs
@@ -1,8 +1,10 @@
 ﻿using System.Linq;
 using System.Threading.Tasks;
 using LinkDotNet.Blog.Domain;
+using LinkDotNet.Blog.Infrastructure.Persistence;
 using LinkDotNet.Blog.TestUtilities;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
 
 namespace LinkDotNet.Blog.IntegrationTests.Infrastructure.Persistence.Sql;
 
@@ -24,7 +26,7 @@ public async Task ShouldLoadBlogPost()
         blogPostFromRepo.PreviewImageUrl.Should().Be("url");
         blogPostFromRepo.IsPublished.Should().BeTrue();
         blogPostFromRepo.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromRepo.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromRepo.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
@@ -35,15 +37,15 @@ public async Task ShouldSaveBlogPost()
 
         await Repository.StoreAsync(blogPost);
 
-        var blogPostFromContext = await DbContext.BlogPosts.Include(b => b.Tags).AsNoTracking().SingleOrDefaultAsync(s => s.Id == blogPost.Id);
+        var blogPostFromContext = await DbContext.BlogPosts.AsNoTracking().SingleOrDefaultAsync(s => s.Id == blogPost.Id);
         blogPostFromContext.Should().NotBeNull();
         blogPostFromContext.Title.Should().Be("Title");
         blogPostFromContext.ShortDescription.Should().Be("Subtitle");
         blogPostFromContext.Content.Should().Be("Content");
         blogPostFromContext.IsPublished.Should().BeTrue();
         blogPostFromContext.PreviewImageUrl.Should().Be("url");
         blogPostFromContext.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromContext.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromContext.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
@@ -65,7 +67,7 @@ public async Task ShouldGetAllBlogPosts()
         blogPostFromRepo.PreviewImageUrl.Should().Be("url");
         blogPostFromRepo.IsPublished.Should().BeTrue();
         blogPostFromRepo.Tags.Should().HaveCount(2);
-        var tagContent = blogPostFromRepo.Tags.Select(t => t.Content).ToList();
+        var tagContent = blogPostFromRepo.Tags;
         tagContent.Should().Contain(new[] { "Tag 1", "Tag 2" });
     }
 
@@ -116,4 +118,20 @@ public async Task ShouldDelete()
 
         (await DbContext.BlogPosts.AsNoTracking().AnyAsync(b => b.Id == blogPost.Id)).Should().BeFalse();
     }
+    
+    [Fact]
+    public async Task GivenBlogPostWithTags_WhenLoadingAndDeleting_ThenShouldBeUpdated()
+    {
+        var bp = new BlogPostBuilder().WithTags("tag 1").Build();
+        var sut = new CachedRepository<BlogPost>(Repository, new MemoryCache(new MemoryCacheOptions()));
+        await sut.StoreAsync(bp);
+        var updateBp = new BlogPostBuilder().WithTags("tag 2").Build();
+        var bpFromCache = await sut.GetByIdAsync(bp.Id);
+        bpFromCache.Update(updateBp);
+        await sut.StoreAsync(bpFromCache);
+
+        var bpFromDb = await sut.GetByIdAsync(bp.Id);
+
+        bpFromDb.Tags.Single().Should().Be("tag 2");
+    }
 }
diff --git a/tests/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs b/tests/LinkDotNet.Blog.UnitTests/Domain/BlogPostTests.cs
@@ -37,16 +37,16 @@ public void ShouldUpdateTagsWhenExisting()
         blogPostToUpdate.Update(blogPost);
 
         blogPostToUpdate.Tags.Should().HaveCount(1);
-        blogPostToUpdate.Tags.Single().Content.Should().Be("tag 2");
+        blogPostToUpdate.Tags.Single().Should().Be("tag 2");
     }
 
     [Fact]
     public void ShouldTrimWhitespacesFromTags()
     {
         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");
+        blogPost.Tags.Should().Contain("Tag 1");
+        blogPost.Tags.Should().Contain("Tag 2");
     }
 
     [Fact]
@@ -67,7 +67,7 @@ public void ShouldNotDeleteTagsWhenSameReference()
         bp.Update(bp);
 
         bp.Tags.Should().HaveCount(1);
-        bp.Tags.Single().Content.Should().Be("tag 1");
+        bp.Tags.Single().Should().Be("tag 1");
     }
 
     [Fact]
diff --git a/tests/LinkDotNet.Blog.UnitTests/Domain/TagTests.cs b/tests/LinkDotNet.Blog.UnitTests/Domain/TagTests.cs
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

Original file line number	Diff line number	Diff line change
`@@ -69,12 +69,21 @@ public async ValueTask StoreAsync(TEntity entity)`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`		`- blogDbContext.Entry(entity).State = EntityState.Modified;`
	`72`	`+ var dbEntity = blogDbContext.Set<TEntity>().Local.FirstOrDefault(e => e.Id == entity.Id);`
	`73`	`+ if (dbEntity != null)`
	`74`	`+ {`
	`75`	`+ blogDbContext.Entry(dbEntity).CurrentValues.SetValues(entity);`
	`76`	`+ blogDbContext.Entry(dbEntity).State = EntityState.Modified;`
	`77`	`+ }`
	`78`	`+ else`
	`79`	`+ {`
	`80`	`+ blogDbContext.Entry(entity).State = EntityState.Modified;`
	`81`	`+ }`
`73`	`82`	`}`
`74`	`83`
`75`	`84`	`await blogDbContext.SaveChangesAsync();`
`76`	`85`	`}`
`77`		`-`
	`86`	`+`
`78`	`87`	`public async ValueTask DeleteAsync(string id)`
`79`	`88`	`{`
`80`	`89`	`var entityToDelete = await GetByIdAsync(id);`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,9 @@ private static SyndicationItem CreateSyndicationItemFromBlogPost(string url, Blo`
`86`	`86`
`87`	`87`	`private static void AddCategories(ICollection<SyndicationCategory> categories, BlogPostRssInfo blogPost)`
`88`	`88`	`{`
`89`		`- foreach (var tag in blogPost.Tags ?? Array.Empty<Tag>())`
	`89`	`+ foreach (var tag in blogPost.Tags ?? Array.Empty<string>())`
`90`	`90`	`{`
`91`		`- categories.Add(new SyndicationCategory(tag.Content));`
	`91`	`+ categories.Add(new SyndicationCategory(tag));`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
`@@ -107,5 +107,5 @@ private sealed record BlogPostRssInfo(`
`107`	`107`	`string ShortDescription,`
`108`	`108`	`DateTime UpdatedDate,`
`109`	`109`	`string PreviewImageUrl,`
`110`		`- ICollection<Tag> Tags);`
	`110`	`+ ICollection<string> Tags);`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ private IEnumerable<SitemapUrl> CreateUrlsForTags(IEnumerable<BlogPost> blogPost`
`57`	`57`	`{`
`58`	`58`	`return blogPosts`
`59`	`59`	`.SelectMany(b => b.Tags)`
`60`		`- .Select(t => t.Content)`
`61`	`60`	`.Distinct()`
`62`	`61`	`.Select(t => new SitemapUrl`
`63`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`{`
`29`	`29`	`<li class="tags me-4">`
`30`	`30`	`<ul>`
`31`		`- @foreach (var tag in BlogPost.Tags.Select(t => t.Content))`
	`31`	`+ @foreach (var tag in BlogPost.Tags)`
`32`	`32`	`{`
`33`	`33`	`<li><a class="goto-tag" href="/searchByTag/@(Uri.EscapeDataString(tag))">@tag</a></li>`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`{`
`25`	`25`	`var term = Uri.UnescapeDataString(SearchTerm);`
`26`	`26`	`blogPosts = await BlogPostRepository.GetAllAsync(t => t.IsPublished && (t.Title.Contains(term)`
`27`		`- \|\| t.Tags.Any(tag => tag.Content == term)),`
	`27`	`+ \|\| t.Tags.Any(tag => tag == term)),`
`28`	`28`	`b => b.UpdatedDate);`
`29`	`29`	`}`
`30`	`30`