fix migration

dominikus1993 · May 22, 2023 · 482bff2 · 482bff2
1 parent e20240a
commit 482bff2
Show file tree

Hide file tree

Showing 11 changed files with 239 additions and 49 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
       ]
     },
     "dotnet-ef": {
-      "version": "7.0.3",
+      "version": "7.0.5",
       "commands": [
         "dotnet-ef"
       ]

diff --git a/src/Modules/Catalog/Core/Model/Entity.cs b/src/Modules/Catalog/Core/Model/Entity.cs
@@ -1,6 +1,25 @@
+using System.Collections;
+
 namespace Catalog.Core.Model;
 
 public readonly record struct ProductName(string Name);
+
+public sealed record Tag(string Name);
+
+public sealed record Tags(IReadOnlyCollection<Tag> Value) : IEnumerable<Tag>
+{
+    public static readonly Tags Empty = new Tags(Array.Empty<Tag>());
+    public IEnumerator<Tag> GetEnumerator()
+    {
+        return Value.GetEnumerator();
+    }
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+        return GetEnumerator();
+    }
+}
+
 public sealed record ProductDescription(string Description);
 
 public readonly record struct Price(decimal Value)
@@ -30,4 +49,4 @@ public sealed record ProductPrice(Price CurrentPrice, Price? PromotionalPrice =
 public readonly record struct AvailableQuantity(int Value);
 
 public sealed record Product(ProductId Id, ProductName ProductName, ProductDescription ProductDescription, ProductPrice Price,
-    AvailableQuantity AvailableQuantity);
+    AvailableQuantity AvailableQuantity, Tags? Tags);
diff --git a/src/Modules/Catalog/Core/Repository/IProductFilter.cs b/src/Modules/Catalog/Core/Repository/IProductFilter.cs
@@ -9,6 +9,7 @@ public sealed class Filter
     public string? Query { get; init; }
     public decimal? PriceFrom { get; init; }
     public decimal? PriceTo { get; init; }
+    public string Tag { get; init; }
     internal int Skip => (Page - 1) * PageSize;
 }
 

diff --git a/src/Modules/Catalog/Infrastructure/Migrations/20230522115620_Tags2.Designer.cs b/src/Modules/Catalog/Infrastructure/Migrations/20230522115620_Tags2.Designer.cs
diff --git a/src/Modules/Catalog/Infrastructure/Migrations/20230522115620_Tags2.cs b/src/Modules/Catalog/Infrastructure/Migrations/20230522115620_Tags2.cs
@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Catalog.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class Tags2 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<List<string>>(
+                name: "tags",
+                table: "products",
+                type: "text[]",
+                nullable: true,
+                oldClrType: typeof(List<string>),
+                oldType: "text[]");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<List<string>>(
+                name: "tags",
+                table: "products",
+                type: "text[]",
+                nullable: false,
+                oldClrType: typeof(List<string>),
+                oldType: "text[]",
+                oldNullable: true);
+        }
+    }
+}
diff --git a/src/Modules/Catalog/Infrastructure/Migrations/ProductsDbContextModelSnapshot.cs b/src/Modules/Catalog/Infrastructure/Migrations/ProductsDbContextModelSnapshot.cs
@@ -67,7 +67,6 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasAnnotation("Npgsql:TsVectorProperties", new[] { "Name", "Description", "Tags" });
 
                     b.Property<List<string>>("Tags")
-                        .IsRequired()
                         .HasColumnType("text[]")
                         .HasColumnName("tags");
 

diff --git a/src/Modules/Catalog/Infrastructure/Model/EfProduct.cs b/src/Modules/Catalog/Infrastructure/Model/EfProduct.cs
@@ -18,7 +18,7 @@ public sealed class EfProduct
 
     public int AvailableQuantity { get; set; }
 
-    public List<string> Tags { get; set; }
+    public List<string>? Tags { get; set; }
 
     public NpgsqlTsVector SearchVector { get; set; } = null!;
 
@@ -41,11 +41,13 @@ public EfProduct(Product product)
         AvailableQuantity = product.AvailableQuantity.Value;
         Price = product.Price.CurrentPrice;
         PromotionalPrice = product.Price.PromotionalPrice;
+        Tags = product.Tags?.Select(x => x.Name).ToList();
     }
 
     public Product ToProduct()
     {
+        var tags = Tags?.Select(tag => new Tag(tag)).ToArray() ?? Array.Empty<Tag>();
         return new Product(ProductId, new ProductName(Name), new ProductDescription(Description),
-            new ProductPrice(Price, PromotionalPrice), new AvailableQuantity(AvailableQuantity));
+            new ProductPrice(Price, PromotionalPrice), new AvailableQuantity(AvailableQuantity), new Tags(tags));
     }
 }
diff --git a/src/Modules/Catalog/Infrastructure/Repositories/EfCoreProductFilter.cs b/src/Modules/Catalog/Infrastructure/Repositories/EfCoreProductFilter.cs
@@ -26,6 +26,11 @@ public async IAsyncEnumerable<Product> FilterProducts(Filter filter, [Enumerator
         {
             query = query.Where(x => x.SearchVector.Matches(filter.Query));
         }
+
+        if (!string.IsNullOrEmpty(filter.Tag))
+        {
+            query = query.Where(x => x.SearchVector.Matches(filter.Tag));
+        }
 
         if (filter.PriceFrom.HasValue)
         {

diff --git a/tests/Modules/Catalog.Tests/Api/Modules/SearchProductsModuleTests.cs b/tests/Modules/Catalog.Tests/Api/Modules/SearchProductsModuleTests.cs
@@ -45,7 +45,7 @@ public async Task ReadProductByIdWhenNoExistsShouldReturnNull()
         await using var host = await _apiFixture.GetHost();
         var productId = ProductId.New();
         // Act
-        var resp = await host.Scenario(s =>
+        await host.Scenario(s =>
         {
             s.Get.Url($"/api/products/{productId.Value}");
             s.StatusCodeShouldBe(404);
@@ -62,7 +62,7 @@ public async Task ReadProductByIdWhenExistsShouldReturnProduct()
         cts.CancelAfter(TimeSpan.FromSeconds(30));
         var productId = ProductId.New();
         var product = new Product(productId, new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         // Act
 
         await _apiFixture.ProductsWriter.AddProduct(product, cts.Token);
@@ -91,7 +91,7 @@ await host.Scenario(s =>
         {
             s.Get.Url($"/api/products");
             s.StatusCodeShouldBe(204);
-        }); ;
+        });
     }
 
     [Fact]
@@ -104,11 +104,11 @@ public async Task SearchProductsWhenNiveaProductExistsShouldReturnProductsWithNa
         await using var host = await _apiFixture.GetHost();
 
         var product1 = new Product(ProductId.New(), new ProductName("not xDDD"), new ProductDescription("nivea"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product2 = new Product(ProductId.New(), new ProductName("Nivea xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product3 = new Product(ProductId.New(), new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         await _apiFixture.ProductsWriter.AddProducts(new[] { product1, product2, product3 }, cts.Token);
         // Act
 
@@ -135,11 +135,11 @@ public async Task FilterProductWhenProductsInPriceConditionExistsShouldReturnPro
 
         await using var host = await _apiFixture.GetHost();
         var product1 = new Product(ProductId.New(), new ProductName("not xDDD"), new ProductDescription("nivea"),
-            new ProductPrice(new Price(5m), new Price(1m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(5m), new Price(1m)), new AvailableQuantity(10), Tags.Empty);
         var product2 = new Product(ProductId.New(), new ProductName("Nivea xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(11m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(11m)), new AvailableQuantity(10), Tags.Empty);
         var product3 = new Product(ProductId.New(), new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(20m), new Price(20m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(20m), new Price(20m)), new AvailableQuantity(10), Tags.Empty);
         await _apiFixture.ProductsWriter.AddProducts(new[] { product1, product2, product3 }, cts.Token);
         // Act
 
@@ -168,11 +168,11 @@ public async Task FilterProductWhenNiveaProductExistsShouldReturnOneProductWithN
 
         await using var host = await _apiFixture.GetHost();
         var product1 = new Product(ProductId.New(), new ProductName("not xDDD"), new ProductDescription("nivea"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product2 = new Product(ProductId.New(), new ProductName("Nivea xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product3 = new Product(ProductId.New(), new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         await _apiFixture.ProductsWriter.AddProducts(new[] { product1, product2, product3 }, cts.Token);
         // Act
         var resp = await host.Scenario(s =>
@@ -200,11 +200,11 @@ public async Task FilterProductWhenNiveaProductExistsShouldReturnOneProductWithN
         await using var host = await _apiFixture.GetHost();
 
         var product1 = new Product(ProductId.New(), new ProductName("not xDDD"), new ProductDescription("nivea"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product2 = new Product(ProductId.New(), new ProductName("Nivea xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product3 = new Product(ProductId.New(), new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         await _apiFixture.ProductsWriter.AddProducts(new[] { product1, product2, product3 }, cts.Token);
         // Act
 
@@ -234,15 +234,15 @@ public async Task SearchProductInNonExistentPage()
         await using var host = await _apiFixture.GetHost();
 
         var product1 = new Product(ProductId.New(), new ProductName("not xDDD"), new ProductDescription("nivea"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product2 = new Product(ProductId.New(), new ProductName("Nivea xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         var product3 = new Product(ProductId.New(), new ProductName("xDDD"), new ProductDescription("xDDD"),
-            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10));
+            new ProductPrice(new Price(10m), new Price(5m)), new AvailableQuantity(10), Tags.Empty);
         await _apiFixture.ProductsWriter.AddProducts(new[] { product1, product2, product3 }, cts.Token);
         // Act
 
-        var resp = await host.Scenario(s =>
+        await host.Scenario(s =>
         {
             s.Get.Url($"/api/products?query=nivea&pageSize=1&page=2137");
             s.StatusCodeShouldBe(204);