Extend integration test #255

src/BraunauMobil.VeloBasar/BusinessLogic/BasarStatsService.cs

@@ -86,7 +86,7 @@ public IReadOnlyList<ChartDataPoint> GetPriceDistribution(IEnumerable<ProductEnt
         }
 
         decimal step = 10.0m;
-        decimal maxPrice = productPrices.Max();
+        decimal maxPrice = ((int)(productPrices.Max() / step) + 1) * step;
         decimal currentMin = 0;
         decimal currentMax = Math.Min(step, maxPrice);
 

test/BraunauMobil.VeloBasar.IntegrationTests/HttpClientExtensions.cs

@@ -1,6 +1,4 @@
-using AngleSharp.Dom;
-using AngleSharp.Io;
-using BraunauMobil.VeloBasar.Models.Documents;
+using AngleSharp.Io;
 
 namespace BraunauMobil.VeloBasar.IntegrationTests;
 
@@ -13,6 +11,7 @@ public static async Task<IHtmlDocument> GetDocumentAsync(this HttpClient client,
 
         HttpResponseMessage response = await client.GetAsync(requestUri);
         response.EnsureSuccessStatusCode();
+
         return await response.GetDocumentAsync();
     }
 
@@ -23,6 +22,7 @@ public static async Task<IHtmlDocument> GetDocumentAsync(this HttpClient client,
 
         HttpResponseMessage response = await client.SendAsync(request);
         response.EnsureSuccessStatusCode();
+
         return await response.GetDocumentAsync();
     }
 

test/BraunauMobil.VeloBasar.IntegrationTests/Mockups/ClockMock.cs

@@ -2,10 +2,10 @@
 
 namespace BraunauMobil.VeloBasar.IntegrationTests.Mockups;
 
-public class ClockMock(Func<DateTime> getDateTime)
+public class ClockMock(DateTime now)
         : IClock
 {
-    public DateTimeOffset Now { get => getDateTime(); }
+    public DateTimeOffset Now { get; set; } = now;
 
     public DateOnly GetCurrentDate()
         => DateOnly.FromDateTime(Now.DateTime);

test/BraunauMobil.VeloBasar.IntegrationTests/Steps/FirstBasar/AcceptSellers.cs

@@ -3,6 +3,13 @@
 public class AcceptSellers(TestContext context)
 {
     public async Task Run()
+    {
+        await AcceptSeller1(context);
+
+        await AssertBasarDetails();
+    }
+
+    private async Task AcceptSeller1(TestContext context)
     {
         IHtmlDocument newAcceptanceDocument = await context.HttpClient.NavigateMenuAsync("New Acceptance");
         newAcceptanceDocument.Title.Should().Be("Acceptance - Enter seller - Velo Basar");
@@ -27,7 +34,7 @@ public async Task Run()
         enterProductsDocument = await EnterProduct2(enterProductsDocument);
 
         IHtmlAnchorElement saveAnchor = enterProductsDocument.QueryAnchorByText("Save accept session");
-        
+
         IHtmlDocument successDocument = await context.HttpClient.GetDocumentAsync(saveAnchor.Href);
         successDocument.Title.Should().Be("Acceptance #1 - Velo Basar");
 
@@ -86,4 +93,40 @@ private async Task<IHtmlDocument> EnterProduct2(IHtmlDocument enterProductsDocum
         postDocument.Title.Should().Be("Acceptance for seller with ID: 1 - Enter products - Velo Basar");
         return postDocument;
     }
+
+    private async Task AssertBasarDetails()
+    {
+        BasarSettlementStatus basarSettlementStatus = new(false,
+            new SellerGroupSettlementStatus(1, 0),
+            new SellerGroupSettlementStatus(1, 0),
+            new SellerGroupSettlementStatus(0, 0)
+        );
+        BasarDetailsModel expectedDetails = new(new BasarEntity(), basarSettlementStatus)
+        {
+            AcceptanceCount = 1,
+            AcceptedProductsAmount = 191.88M,
+            AcceptedProductsCount = 2,
+            AcceptedProductTypesByAmount = [
+                new ChartDataPoint(92.99m, "Children's bike", X.AnyColor),
+                new ChartDataPoint(98.89m, "Steel steed", X.AnyColor)
+            ],
+            AcceptedProductTypesByCount = [
+                new ChartDataPoint(1, "Children's bike", X.AnyColor),
+                new ChartDataPoint(1, "Steel steed", X.AnyColor)
+            ],
+            LockedProductsCount = 0,
+            LostProductsCount = 0,
+            PriceDistribution = [
+                new ChartDataPoint(2, "$100.00", X.AnyColor)
+            ],
+            SaleCount = 0,
+            SaleDistribution = [],
+            SoldProductsAmount = 0,
+            SoldProductsCount = 0,
+            SoldProductTypesByCount = [],
+            SoldProductTypesByAmount = [],
+        };
+
+        await context.AssertBasarDetails(ID.FirstBasar, expectedDetails);
+    }
 }

test/BraunauMobil.VeloBasar.IntegrationTests/Steps/FirstBasar/SellProducts.cs

@@ -34,5 +34,49 @@ public async Task Run()
                 new ProductTableRowDocumentModel("1", "Votec - Children's bike".Line("Votec VRC Comp").Line(" green 1067425379"), "24", "$92.99", "* Schattenfell Magsame, Heidenschuss 41, 6295 Hobbingen")
             ])
         );
+
+        await AssertBasarDetails();
+    }
+
+    private async Task AssertBasarDetails()
+    {
+        BasarSettlementStatus basarSettlementStatus = new(false,
+            new SellerGroupSettlementStatus(1, 0),
+            new SellerGroupSettlementStatus(1, 0),
+            new SellerGroupSettlementStatus(0, 0)
+        );
+        BasarDetailsModel expectedDetails = new(new BasarEntity(), basarSettlementStatus)
+        {
+            AcceptanceCount = 1,
+            AcceptedProductsAmount = 191.88M,
+            AcceptedProductsCount = 2,
+            AcceptedProductTypesByAmount = [
+                new ChartDataPoint(92.99m, "Children's bike", X.AnyColor),
+                new ChartDataPoint(98.89m, "Steel steed", X.AnyColor),
+            ],
+            AcceptedProductTypesByCount = [
+                new ChartDataPoint(1, "Children's bike", X.AnyColor),
+                new ChartDataPoint(1, "Steel steed", X.AnyColor)
+            ],
+            LockedProductsCount = 0,
+            LostProductsCount = 0,
+            PriceDistribution = [
+                new ChartDataPoint(2, "$100.00", X.AnyColor)
+            ],
+            SaleCount = 1,
+            SaleDistribution = [
+                new ChartDataPoint(92.99M, "11:22 AM", X.AnyColor),
+            ],
+            SoldProductsAmount = 92.99m,
+            SoldProductsCount = 1,
+            SoldProductTypesByCount = [
+                new ChartDataPoint(1, "Children's bike", X.AnyColor),
+            ],
+            SoldProductTypesByAmount = [
+                new ChartDataPoint(92.99m, "Children's bike", X.AnyColor),
+            ],
+        };
+
+        await context.AssertBasarDetails(ID.FirstBasar, expectedDetails);
     }
 }

test/BraunauMobil.VeloBasar.IntegrationTests/Steps/FirstBasar/SettleSellers.cs

@@ -42,5 +42,49 @@ public async Task Run()
             "Edoras on Thursday, April 5, 2063 at 11:22 AM"
             )
         );
+
+        await AssertBasarDetails();
+    }
+
+    private async Task AssertBasarDetails()
+    {
+        BasarSettlementStatus basarSettlementStatus = new(true,
+            new SellerGroupSettlementStatus(1, 1),
+            new SellerGroupSettlementStatus(1, 1),
+            new SellerGroupSettlementStatus(0, 0)
+        );
+        BasarDetailsModel expectedDetails = new(new BasarEntity(), basarSettlementStatus)
+        {
+            AcceptanceCount = 1,
+            AcceptedProductsAmount = 191.88M,
+            AcceptedProductsCount = 2,
+            AcceptedProductTypesByAmount = [
+                new ChartDataPoint(92.99m, "Children's bike", X.AnyColor),
+                new ChartDataPoint(98.89m, "Steel steed", X.AnyColor)
+            ],
+            AcceptedProductTypesByCount = [
+                new ChartDataPoint(1, "Children's bike", X.AnyColor),
+                new ChartDataPoint(1, "Steel steed", X.AnyColor)
+            ],
+            LockedProductsCount = 0,
+            LostProductsCount = 0,
+            PriceDistribution = [
+                new ChartDataPoint(2, "$100.00", X.AnyColor)
+            ],
+            SaleCount = 1,
+            SaleDistribution = [
+                new ChartDataPoint(92.99M, "11:22 AM", X.AnyColor),
+            ],
+            SoldProductsAmount = 92.99m,
+            SoldProductsCount = 1,
+            SoldProductTypesByCount = [
+                new ChartDataPoint(1, "Children's bike", X.AnyColor),
+            ],
+            SoldProductTypesByAmount = [
+                new ChartDataPoint(92.99m, "Children's bike", X.AnyColor),
+            ],
+        };
+
+        await context.AssertBasarDetails(ID.FirstBasar, expectedDetails);
     }
 }

test/BraunauMobil.VeloBasar.IntegrationTests/Steps/SecondBasar/AcceptSellers.cs

@@ -5,7 +5,7 @@ public class AcceptSellers(TestContext context)
     public async Task Run()
     {
         await Seller2();
-        await AssertOverview();
+        await AssertBasarDetails();
     }
 
     private async Task Seller2()
@@ -75,7 +75,7 @@ private async Task Seller2()
         );
     }
 
-    private async Task AssertOverview()
+    private async Task AssertBasarDetails()
     {
         BasarSettlementStatus basarSettlementStatus = new(false,
             new SellerGroupSettlementStatus(1, 0),
@@ -88,15 +88,16 @@ private async Task AssertOverview()
             AcceptedProductsAmount = 96.81M,
             AcceptedProductsCount = 2,
             AcceptedProductTypesByAmount = [
-                new ChartDataPoint(96.81M, "Scooter", Color.FromArgb(0xFF, 0x00, 0x7B, 0xFF))
+                new ChartDataPoint(96.81M, "Scooter", X.AnyColor)
             ],
             AcceptedProductTypesByCount = [
-                new ChartDataPoint(2M, "Scooter", Color.FromArgb(0xFF, 0x00, 0x7B, 0xFF))
+                new ChartDataPoint(2M, "Scooter", X.AnyColor)
             ],
             LockedProductsCount = 0,
             LostProductsCount = 0,
             PriceDistribution = [
-                new ChartDataPoint(1, "$50.00", Color.FromArgb(0xFF, 0x00, 0x7B, 0xFF))
+                new ChartDataPoint(1, "$50.00", X.AnyColor),
+                new ChartDataPoint(1, "$60.00", X.AnyColor)
             ],
             SaleCount = 0,
             SaleDistribution = [],
@@ -106,7 +107,7 @@ private async Task AssertOverview()
             SoldProductTypesByAmount = [],
         };
 
-        await context.AssertBasarDetails(2, expectedDetails);
+        await context.AssertBasarDetails(ID.SecondBasar, expectedDetails);
     }
 
     private async Task<IHtmlDocument> EnterProduct(IHtmlDocument enterProductsDocument, string expectedTitle, IDictionary<string, object> values)

test/BraunauMobil.VeloBasar.IntegrationTests/TestContext.cs

@@ -42,7 +42,23 @@ public async Task AssertBasarDetails(int basarId, BasarDetailsModel expectedDeta
         IBasarService basarService = ServiceProvider.GetRequiredService<IBasarService>();
         BasarDetailsModel result = await basarService.GetDetailsAsync(basarId);
 
-        result.Should().BeEquivalentTo(expectedDetails, options => options.Excluding(details => details.Entity));
+        result.Should().BeEquivalentTo(expectedDetails, options =>
+        {
+            return options.Excluding(details => details.Entity)
+                .For(details => details.AcceptedProductTypesByAmount)
+                    .Exclude(chartData => chartData.Color)
+                .For(details => details.AcceptedProductTypesByCount)
+                    .Exclude(chartData => chartData.Color)
+                .For(details => details.PriceDistribution)
+                    .Exclude(chartData => chartData.Color)
+                .For(details => details.SaleDistribution)
+                    .Exclude(chartData => chartData.Color)
+                .For(details => details.SoldProductTypesByAmount)
+                    .Exclude(chartData => chartData.Color)
+                .For(details => details.SoldProductTypesByCount)
+                    .Exclude(chartData => chartData.Color)
+                ;
+        });
     }
 
     public string BankingQrCode(string seller, string amount, string decscription)

test/BraunauMobil.VeloBasar.IntegrationTests/VeloBasarTest.cs

@@ -28,10 +28,11 @@ public async Task Run()
         await new Steps.FirstBasar.SellProducts(_context).Run();
         await new Steps.FirstBasar.SettleSellers(_context).Run();
 
-        X.FirstContactDay = X.FirstContactDay.AddYears(1).AddMonths(1).AddDays(1).AddHours(1).AddMinutes(1).AddSeconds(1);
+        X.Clock.Now = X.FirstContactDay.AddYears(1).AddMonths(1).AddDays(1).AddHours(1).AddMinutes(1).AddSeconds(1);
 
         await new Steps.SecondBasar.Creation(_context).Run();
         await new Steps.SecondBasar.AcceptSellers(_context).Run();
+
     }
 
     private async Task Login()

test/BraunauMobil.VeloBasar.IntegrationTests/X.cs

@@ -6,7 +6,9 @@ public static class X
 {
     public static DateTime FirstContactDay { get; set; } = new DateTime(2063, 04, 05, 11, 22, 33);
 
-    public static ClockMock Clock { get; } = new (() => FirstContactDay);
+    public static ClockMock Clock { get; } = new (FirstContactDay);
+
+    public static Color AnyColor { get; } = new Color();
 
     public static string Line(this string s, string nextLine = "")
     {

test/BraunauMobil.VeloBasar.Tests/BusinessLogic/BasarStatsServiceTests/GetPriceDistribution.cs

@@ -26,8 +26,8 @@ public void Products_ShouldReturnDistribution(Color primaryColor)
     {
         // Arrange
         A.CallTo(() => ColorProvider.Primary).Returns(primaryColor);
-        ProductEntity[] products = new[]
-        {
+        ProductEntity[] products =
+        [
             CreateProduct(0),
             CreateProduct(0),
             CreateProduct(1),
@@ -37,7 +37,9 @@ public void Products_ShouldReturnDistribution(Color primaryColor)
             CreateProduct(11),
             CreateProduct(100),
             CreateProduct(1000),
-        };
+            CreateProduct(9989.89M),
+            CreateProduct(9999.99M),
+        ];
 
         // Act
         IReadOnlyList<ChartDataPoint> result = Sut.GetPriceDistribution(products);
@@ -49,32 +51,58 @@ public void Products_ShouldReturnDistribution(Color primaryColor)
             new ChartDataPoint(2, "€ 20,00", primaryColor),
             new ChartDataPoint(1, "€ 100,00", primaryColor),
             new ChartDataPoint(1, "€ 1.000,00", primaryColor),
+            new ChartDataPoint(1, "€ 9.990,00", primaryColor),
+            new ChartDataPoint(1, "€ 10.000,00", primaryColor),
         });
 
-        A.CallTo(() => ColorProvider.Primary).MustHaveHappened(4, Times.Exactly);
+        A.CallTo(() => ColorProvider.Primary).MustHaveHappened(result.Count, Times.Exactly);
     }
 
     [Theory]
     [VeloAutoData]
-    public void ProductsWithPricesLowerThan10_ShouldReturnDistribution(Color primaryColor)
+    public void ProductsWithTwoPricesInTheSameRange_ShouldReturnDistribution(Color primaryColor)
     {
         // Arrange
         A.CallTo(() => ColorProvider.Primary).Returns(primaryColor);
-        ProductEntity[] products = new[]
+        ProductEntity[] products =
+        [
+            CreateProduct(92.99M),
+            CreateProduct(98.89M)
+        ];
+
+        // Act
+        IReadOnlyList<ChartDataPoint> result = Sut.GetPriceDistribution(products);
+
+        // Assert
+        result.Should().BeEquivalentTo(new[]
         {
+            new ChartDataPoint(2, "€ 100,00", primaryColor)
+        });
+
+        A.CallTo(() => ColorProvider.Primary).MustHaveHappened(1, Times.Exactly);
+    }
+
+    [Theory]
+    [VeloAutoData]
+    public void ProductsWithPricesLowerThan10_ShouldReturnDistribution(Color primaryColor)
+    {
+        // Arrange
+        A.CallTo(() => ColorProvider.Primary).Returns(primaryColor);
+        ProductEntity[] products =
+        [
             CreateProduct(0),
             CreateProduct(0),
             CreateProduct(1),
             CreateProduct(5)
-        };
+        ];
 
         // Act
         IReadOnlyList<ChartDataPoint> result = Sut.GetPriceDistribution(products);
 
         // Assert
         result.Should().BeEquivalentTo(new[]
         {
-            new ChartDataPoint(4, "€ 5,00", primaryColor),
+            new ChartDataPoint(4, "€ 10,00", primaryColor),
         });
 
         A.CallTo(() => ColorProvider.Primary).MustHaveHappenedOnceExactly();