Use sort order instead of date (enabling drag and drop)

linkdotnet · linkdotnet · commit 111b0bf9578f · 2021-07-28T10:13:23.000+02:00
diff --git a/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs b/LinkDotNet.Blog.IntegrationTests/Web/Shared/ProfileTests.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using Bunit;
 using FluentAssertions;
 using LinkDotNet.Blog.TestUtilities;
@@ -16,10 +15,10 @@ namespace LinkDotNet.Blog.IntegrationTests.Web.Shared
     public class ProfileTests : TestContext
     {
         [Fact]
-        public void ShouldRenderAllItemsSortedByCreated()
+        public void ShouldRenderAllItemsSortedByOrder()
         {
-            var entry1 = new ProfileInformationEntryBuilder().WithContent("key 1").WithCreatedDate(new DateTime(1)).Build();
-            var entry2 = new ProfileInformationEntryBuilder().WithContent("key 2").WithCreatedDate(new DateTime(2)).Build();
+            var entry1 = new ProfileInformationEntryBuilder().WithContent("key 1").WithSortOrder(1).Build();
+            var entry2 = new ProfileInformationEntryBuilder().WithContent("key 2").WithSortOrder(2).Build();
             var repoMock = RegisterServices();
             repoMock.Setup(r => r.GetAllAsync())
                 .ReturnsAsync(new List<ProfileInformationEntry> { entry1, entry2 });
@@ -62,12 +61,13 @@ public void ShouldAddEntry()
 
             entryToDb.Should().NotBeNull();
             entryToDb.Content.Should().Be("key");
+            entryToDb.SortOrder.Should().Be(0);
         }
 
         [Fact]
         public void ShouldDeleteEntryWhenConfirmed()
         {
-            var entryToDelete = new ProfileInformationEntryBuilder().WithContent("key 2").WithCreatedDate(new DateTime(2)).Build();
+            var entryToDelete = new ProfileInformationEntryBuilder().WithContent("key 2").Build();
             entryToDelete.Id = "SomeId";
             var repoMock = RegisterServices();
             repoMock.Setup(r => r.GetAllAsync()).ReturnsAsync(new[] { entryToDelete });
@@ -82,7 +82,7 @@ public void ShouldDeleteEntryWhenConfirmed()
         [Fact]
         public void ShouldNotDeleteEntryWhenNotConfirmed()
         {
-            var entryToDelete = new ProfileInformationEntryBuilder().WithContent("key 2").WithCreatedDate(new DateTime(2)).Build();
+            var entryToDelete = new ProfileInformationEntryBuilder().WithContent("key 2").Build();
             entryToDelete.Id = "SomeId";
             var repoMock = RegisterServices();
             repoMock.Setup(r => r.GetAllAsync()).ReturnsAsync(new[] { entryToDelete });
@@ -94,6 +94,26 @@ public void ShouldNotDeleteEntryWhenNotConfirmed()
             repoMock.Verify(r => r.DeleteAsync("SomeId"), Times.Never);
         }
 
+        [Fact]
+        public void ShouldAddEntryWithCorrectSortOrder()
+        {
+            var repo = RegisterServices();
+            var entry = new ProfileInformationEntryBuilder().WithSortOrder(1).Build();
+            repo.Setup(p => p.GetAllAsync()).ReturnsAsync(new[] { entry });
+            ProfileInformationEntry entryToDb = null;
+            repo.Setup(p => p.AddAsync(It.IsAny<ProfileInformationEntry>()))
+                .Callback<ProfileInformationEntry>(p => entryToDb = p);
+            var cut = RenderComponent<Profile>(p => p.Add(s => s.IsAuthenticated, true));
+            var addShortItemComponent = cut.FindComponent<AddProfileShortItem>();
+            addShortItemComponent.Find("input").Change("key");
+
+            addShortItemComponent.Find("button").Click();
+
+            entryToDb.Should().NotBeNull();
+            entryToDb.Content.Should().Be("key");
+            entryToDb.SortOrder.Should().Be(1001);
+        }
+
         private static AppConfiguration CreateEmptyConfiguration()
         {
             return new()
diff --git a/LinkDotNet.Blog.TestUtilities/ProfileInformationEntryBuilder.cs b/LinkDotNet.Blog.TestUtilities/ProfileInformationEntryBuilder.cs
@@ -1,28 +1,27 @@
-﻿using System;
-using LinkDotNet.Domain;
+﻿using LinkDotNet.Domain;
 
 namespace LinkDotNet.Blog.TestUtilities
 {
     public class ProfileInformationEntryBuilder
     {
         private string content = "Content";
-        private DateTime? createdDate;
+        private int sortOrder;
 
         public ProfileInformationEntryBuilder WithContent(string key)
         {
             this.content = key;
             return this;
         }
 
-        public ProfileInformationEntryBuilder WithCreatedDate(DateTime createdDate)
+        public ProfileInformationEntryBuilder WithSortOrder(int sortOrder)
         {
-            this.createdDate = createdDate;
+            this.sortOrder = sortOrder;
             return this;
         }
 
         public ProfileInformationEntry Build()
         {
-            return ProfileInformationEntry.Create(content, createdDate);
+            return ProfileInformationEntry.Create(content, sortOrder);
         }
     }
 }
diff --git a/LinkDotNet.Blog.UnitTests/Domain/ProfileInformationEntryTests.cs b/LinkDotNet.Blog.UnitTests/Domain/ProfileInformationEntryTests.cs
@@ -10,9 +10,10 @@ public class ProfileInformationEntryTests
         [Fact]
         public void ShouldCreateObject()
         {
-            var result = ProfileInformationEntry.Create("key");
+            var result = ProfileInformationEntry.Create("key", 12);
 
             result.Content.Should().Be("key");
+            result.SortOrder.Should().Be(12);
         }
 
         [Theory]
@@ -21,15 +22,15 @@ public void ShouldCreateObject()
         [InlineData(null)]
         public void ShouldThrowExceptionWhenEmptyKeyOrValue(string content)
         {
-            Action act = () => ProfileInformationEntry.Create(content);
+            Action act = () => ProfileInformationEntry.Create(content, 0);
 
             act.Should().Throw<ArgumentOutOfRangeException>();
         }
 
         [Fact]
         public void ShouldTrim()
         {
-            var result = ProfileInformationEntry.Create("   key ");
+            var result = ProfileInformationEntry.Create("   key ", 0);
 
             result.Content.Should().Be("key");
         }
diff --git a/LinkDotNet.Blog.Web/Shared/Profile.razor b/LinkDotNet.Blog.Web/Shared/Profile.razor
@@ -47,7 +47,7 @@ OnYesPressed="DeleteItem"></ConfirmDialog>
 
     protected override async Task OnInitializedAsync()
     {
-        profileInformationEntries = (await repository.GetAllAsync()).OrderBy(d => d.CreatedDate).ToList();
+        profileInformationEntries = (await repository.GetAllAsync()).OrderBy(d => d.SortOrder).ToList();
     }
 
     private void ShowDeleteDialog(string key)
@@ -65,9 +65,20 @@ OnYesPressed="DeleteItem"></ConfirmDialog>
 
     private async Task AddValue(string toAdd)
     {
-        var newEntry = ProfileInformationEntry.Create(toAdd);
+        var sortOrder = GetSortOrder();
+        var newEntry = ProfileInformationEntry.Create(toAdd, sortOrder);
 
         profileInformationEntries.Add(newEntry);
         await repository.AddAsync(newEntry);
     }
+
+    private int GetSortOrder()
+    {
+        if (profileInformationEntries.Any())
+        {
+            return profileInformationEntries.Max(p => p.SortOrder) + 1000;
+        }
+
+        return 0;
+    }
 }
diff --git a/LinkDotNet.Domain/ProfileInformationEntry.cs b/LinkDotNet.Domain/ProfileInformationEntry.cs
@@ -12,9 +12,9 @@ private ProfileInformationEntry()
 
         public string Content { get; private set; }
 
-        public DateTime CreatedDate { get; private set; }
+        public int SortOrder { get; set; }
 
-        public static ProfileInformationEntry Create(string key, DateTime? createdDate = null)
+        public static ProfileInformationEntry Create(string key, int sortOrder)
         {
             if (string.IsNullOrWhiteSpace(key))
             {
@@ -24,7 +24,7 @@ public static ProfileInformationEntry Create(string key, DateTime? createdDate =
             return new ProfileInformationEntry
             {
                 Content = key.Trim(),
-                CreatedDate = createdDate ?? DateTime.Now,
+                SortOrder = sortOrder,
             };
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,27 @@`
`1`		`-using System;`
`2`		`-using LinkDotNet.Domain;`
	`1`	`+using LinkDotNet.Domain;`
`3`	`2`
`4`	`3`	`namespace LinkDotNet.Blog.TestUtilities`
`5`	`4`	`{`
`6`	`5`	`public class ProfileInformationEntryBuilder`
`7`	`6`	`{`
`8`	`7`	`private string content = "Content";`
`9`		`- private DateTime? createdDate;`
	`8`	`+ private int sortOrder;`
`10`	`9`
`11`	`10`	`public ProfileInformationEntryBuilder WithContent(string key)`
`12`	`11`	`{`
`13`	`12`	`this.content = key;`
`14`	`13`	`return this;`
`15`	`14`	`}`
`16`	`15`
`17`		`- public ProfileInformationEntryBuilder WithCreatedDate(DateTime createdDate)`
	`16`	`+ public ProfileInformationEntryBuilder WithSortOrder(int sortOrder)`
`18`	`17`	`{`
`19`		`- this.createdDate = createdDate;`
	`18`	`+ this.sortOrder = sortOrder;`
`20`	`19`	`return this;`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`public ProfileInformationEntry Build()`
`24`	`23`	`{`
`25`		`- return ProfileInformationEntry.Create(content, createdDate);`
	`24`	`+ return ProfileInformationEntry.Create(content, sortOrder);`
`26`	`25`	`}`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,10 @@ public class ProfileInformationEntryTests`
`10`	`10`	`[Fact]`
`11`	`11`	`public void ShouldCreateObject()`
`12`	`12`	`{`
`13`		`- var result = ProfileInformationEntry.Create("key");`
	`13`	`+ var result = ProfileInformationEntry.Create("key", 12);`
`14`	`14`
`15`	`15`	`result.Content.Should().Be("key");`
	`16`	`+ result.SortOrder.Should().Be(12);`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`[Theory]`
`@@ -21,15 +22,15 @@ public void ShouldCreateObject()`
`21`	`22`	`[InlineData(null)]`
`22`	`23`	`public void ShouldThrowExceptionWhenEmptyKeyOrValue(string content)`
`23`	`24`	`{`
`24`		`- Action act = () => ProfileInformationEntry.Create(content);`
	`25`	`+ Action act = () => ProfileInformationEntry.Create(content, 0);`
`25`	`26`
`26`	`27`	`act.Should().Throw<ArgumentOutOfRangeException>();`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`[Fact]`
`30`	`31`	`public void ShouldTrim()`
`31`	`32`	`{`
`32`		`- var result = ProfileInformationEntry.Create(" key ");`
	`33`	`+ var result = ProfileInformationEntry.Create(" key ", 0);`
`33`	`34`
`34`	`35`	`result.Content.Should().Be("key");`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ OnYesPressed="DeleteItem"></ConfirmDialog>`
`47`	`47`
`48`	`48`	`protected override async Task OnInitializedAsync()`
`49`	`49`	`{`
`50`		`- profileInformationEntries = (await repository.GetAllAsync()).OrderBy(d => d.CreatedDate).ToList();`
	`50`	`+ profileInformationEntries = (await repository.GetAllAsync()).OrderBy(d => d.SortOrder).ToList();`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private void ShowDeleteDialog(string key)`
`@@ -65,9 +65,20 @@ OnYesPressed="DeleteItem"></ConfirmDialog>`
`65`	`65`
`66`	`66`	`private async Task AddValue(string toAdd)`
`67`	`67`	`{`
`68`		`- var newEntry = ProfileInformationEntry.Create(toAdd);`
	`68`	`+ var sortOrder = GetSortOrder();`
	`69`	`+ var newEntry = ProfileInformationEntry.Create(toAdd, sortOrder);`
`69`	`70`
`70`	`71`	`profileInformationEntries.Add(newEntry);`
`71`	`72`	`await repository.AddAsync(newEntry);`
`72`	`73`	`}`
	`74`	`+`
	`75`	`+ private int GetSortOrder()`
	`76`	`+ {`
	`77`	`+ if (profileInformationEntries.Any())`
	`78`	`+ {`
	`79`	`+ return profileInformationEntries.Max(p => p.SortOrder) + 1000;`
	`80`	`+ }`
	`81`	`+`
	`82`	`+ return 0;`
	`83`	`+ }`
`73`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ private ProfileInformationEntry()`
`12`	`12`
`13`	`13`	`public string Content { get; private set; }`
`14`	`14`
`15`		`- public DateTime CreatedDate { get; private set; }`
	`15`	`+ public int SortOrder { get; set; }`
`16`	`16`
`17`		`- public static ProfileInformationEntry Create(string key, DateTime? createdDate = null)`
	`17`	`+ public static ProfileInformationEntry Create(string key, int sortOrder)`
`18`	`18`	`{`
`19`	`19`	`if (string.IsNullOrWhiteSpace(key))`
`20`	`20`	`{`
`@@ -24,7 +24,7 @@ public static ProfileInformationEntry Create(string key, DateTime? createdDate =`
`24`	`24`	`return new ProfileInformationEntry`
`25`	`25`	`{`
`26`	`26`	`Content = key.Trim(),`
`27`		`- CreatedDate = createdDate ?? DateTime.Now,`
	`27`	`+ SortOrder = sortOrder,`
`28`	`28`	`};`
`29`	`29`	`}`
`30`	`30`	`}`