Sorting by place name (#11)

eebbesen · Nov 1, 2024 · 281f386 · 281f386
1 parent 735ce46
commit 281f386
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 18 deletions.
diff --git a/StpFoodBlazor/StpFoodBlazor/Components/Pages/Deals.razor b/StpFoodBlazor/StpFoodBlazor/Components/Pages/Deals.razor
@@ -67,6 +67,7 @@ else
             allDeals = await DealServiceImpl.GetDealsAsync();
             selectedDayOfWeek = TimeServiceImpl.GetDayOfWeek();
             FilterDeals();
+            SortDeals();
             StateHasChanged();
         }
     }
@@ -75,6 +76,7 @@ else
     {
         selectedDayOfWeek = (string?)e.Value;
         FilterDeals();
+        SortDeals();
     }
 
     private void FilterDeals()
@@ -84,4 +86,9 @@ else
         filter.Deals = allDeals;
         deals = filter.Filter();
     }
+
+    private void SortDeals()
+    {
+        deals = DealSorter.SortDealEventsByName(deals);
+    }
 }
diff --git a/StpFoodBlazor/StpFoodBlazor/Helpers/DealSorter.cs b/StpFoodBlazor/StpFoodBlazor/Helpers/DealSorter.cs
@@ -0,0 +1,19 @@
+using StpFoodBlazor.Models;
+
+namespace StpFoodBlazor.Helpers
+{
+    public static class DealSorter
+    {
+        public static DealEvent[] SortDealEventsByName(DealEvent[]? DealEvents)
+        {
+            if (DealEvents == null)
+            {
+                return [];
+            }
+
+            Array.Sort(DealEvents, static (x, y) =>
+                string.Compare(x.Name, y.Name, StringComparison.Ordinal));
+            return [.. DealEvents];
+        }
+    }
+}
diff --git a/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealSorterTest.cs b/StpFoodBlazor/StpFoodBlazorTest/Helpers/DealSorterTest.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using StpFoodBlazor.Helpers;
+using StpFoodBlazor.Models;
+
+namespace StpFoodBlazorTest.Helpers
+{
+    public class DealSorterTest
+    {
+        [Fact]
+        public void SortDealEventsByName_SortsCorrectly()
+        {
+            var dealEvents = new DealEvent[]
+            {
+                new() { Name = "Sawatdee Saint Paul" },
+                new() { Name = "Asian Express" },
+                new() { Name = "Afro Deli" }
+            };
+            var expectedOrder = new DealEvent[]
+            {
+                new() { Name = "Afro Deli" },
+                new() { Name = "Asian Express" },
+                new() { Name = "Sawatdee Saint Paul" }
+            };
+
+            var sortedDealEvents = DealSorter.SortDealEventsByName(dealEvents);
+
+            for (int i = 0; i < expectedOrder.Length; i++)
+            {
+                Assert.Equal(expectedOrder[i].Name, sortedDealEvents[i].Name);
+            }
+        }
+
+        [Fact]
+        public void SortDealEventsByName_EmptyArray()
+        {
+            // Arrange
+            var dealEvents = new DealEvent[]{};
+
+            // Act
+            var sortedDealEvents = DealSorter.SortDealEventsByName(dealEvents);
+
+            // Assert
+            Assert.Empty(sortedDealEvents);
+        }
+
+        [Fact]
+        public void SortDealEventsByName_SingleElement()
+        {
+            var dealEvents = new DealEvent[]
+            {
+                new() { Name = "Afro Deli" }
+            };
+
+            var sortedDealEvents = DealSorter.SortDealEventsByName(dealEvents);
+
+            Assert.Single(sortedDealEvents);
+            Assert.Equal("Afro Deli", sortedDealEvents[0].Name);
+        }
+    }
+}
diff --git a/StpFoodBlazor/StpFoodBlazorTest/Pages/DealsTest.razor b/StpFoodBlazor/StpFoodBlazorTest/Pages/DealsTest.razor
@@ -23,34 +23,34 @@
     {
         timeService.DayOfWeek = DayOfWeek.Wednesday.ToString();
         var cut = ctx.Render(@<Deals />);
-        var tbody = getTbody(cut);
+        var elements = getElements(cut);
 
-        Assert.Equal("Wednesday", tbody.Children[0].Children[0].InnerHtml);
-        Assert.Equal("Asian Express", tbody.Children[0].Children[1].InnerHtml);
-        Assert.Equal("$12.95 combo", tbody.Children[0].Children[2].InnerHtml);
+        Assert.Equal("Wednesday", elements.Children[0].Children[0].InnerHtml);
+        Assert.Equal("1881 by Lake Elmo Inn", elements.Children[0].Children[1].InnerHtml);
+        Assert.Equal("Discounted apps https://1881bylei.com/wp-content/uploads/2024/08/1881_happy_hour.pdf", elements.Children[0].Children[2].InnerHtml);
     }
 
     [Fact]
     public void DealsShouldDisplayAllColumnsThursday()
     {
         timeService.DayOfWeek = DayOfWeek.Thursday.ToString();
         var cut = ctx.Render(@<Deals />);
-        var tbody = getTbody(cut);
+        var elements = getElements(cut);
 
-        Assert.Equal("Thursday", tbody.Children[0].Children[0].InnerHtml);
-        Assert.Equal("Asian Express", tbody.Children[0].Children[1].InnerHtml);
-        Assert.Equal("$12.95 combo", tbody.Children[0].Children[2].InnerHtml);
+        Assert.Equal("Thursday", elements.Children[0].Children[0].InnerHtml);
+        Assert.Equal("1881 by Lake Elmo Inn", elements.Children[0].Children[1].InnerHtml);
+        Assert.Equal("Discounted apps https://1881bylei.com/wp-content/uploads/2024/08/1881_happy_hour.pdf", elements.Children[0].Children[2].InnerHtml);
     }
 
     [Fact]
     public void DealsShouldDisplayOnlyDealsForSelectedDay()
     {
         timeService.DayOfWeek = DayOfWeek.Wednesday.ToString();
         var cut = ctx.Render(@<Deals />);
-        var tbody = getTbody(cut);
+        var elements = getElements(cut);
 
-        Assert.Equal(55, tbody.ChildElementCount);
-        foreach (var tr in tbody.Children)
+        Assert.Equal(55, elements.ChildElementCount);
+        foreach (var tr in elements.Children)
         {
             Assert.Equal("Wednesday", tr.Children[0].InnerHtml);
         }
@@ -74,9 +74,9 @@
 
         dowSelect.Change("Monday");
 
-        var tbody = getTbody(cut);
-        Assert.Equal(45, tbody.ChildElementCount);
-        foreach (var tr in tbody.Children)
+        var elements = getElements(cut);
+        Assert.Equal(45, elements.ChildElementCount);
+        foreach (var tr in elements.Children)
         {
             Assert.Equal("Monday", tr.Children[0].InnerHtml);
         }
@@ -90,15 +90,15 @@
 
         dowSelect.Change("Friday");
 
-        var tbody = getTbody(cut);
-        Assert.Equal(51, tbody.ChildElementCount);
-        foreach (var tr in tbody.Children)
+        var elements = getElements(cut);
+        Assert.Equal(51, elements.ChildElementCount);
+        foreach (var tr in elements.Children)
         {
             Assert.Equal("Friday", tr.Children[0].InnerHtml);
         }
     }
 
-    private IElement getTbody(IRenderedFragment cut)
+    private IElement getElements(IRenderedFragment cut)
     {
         cut.WaitForElement("#deals_table_body", TimeSpan.FromSeconds(5));
         return cut.Find("#deals_table_body");