Legacy Entities and Catalog Data Seeding (2024-06-24) (#49)

* chore; moved entities from data to domain project * feat; api pagination models * chore; cleanup around messaging * re-introduced seeding for Catalog, Inventory is WIP
erikshafer · Jun 24, 2024 · cd80876 · cd80876
1 parent c6bad04
commit cd80876
Show file tree

Hide file tree

Showing 54 changed files with 165 additions and 136 deletions.
diff --git a/EventSourcingEcommerce.sln b/EventSourcingEcommerce.sln
@@ -59,7 +59,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShoppingCart.Api", "src\Ret
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Legacy.Domain", "src\Legacy\Legacy.Domain\Legacy.Domain.csproj", "{80CEA321-B1F7-49F2-B4C0-6A41DC539BD4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Legacy.Messages", "src\Legacy\Legacy.Messages\Legacy.Messages.csproj", "{3D478A6A-7CF9-452C-9D04-80E09C7F255E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Legacy.SharedMessages", "src\Legacy\Legacy.SharedMessages\Legacy.SharedMessages.csproj", "{3D478A6A-7CF9-452C-9D04-80E09C7F255E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Legacy/Legacy.Api/Legacy.Api.csproj b/src/Legacy/Legacy.Api/Legacy.Api.csproj
@@ -5,8 +5,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="EasyNetQ" Version="7.8.0" />
-        <PackageReference Include="EasyNetQ.Management.Client" Version="2.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.6" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
@@ -20,7 +18,7 @@
     <ItemGroup>
         <ProjectReference Include="..\Legacy.Data\Legacy.Data.csproj" />
         <ProjectReference Include="..\Legacy.Application\Legacy.Application.csproj" />
-        <ProjectReference Include="..\Legacy.Messages\Legacy.Messages.csproj" />
+        <ProjectReference Include="..\Legacy.SharedMessages\Legacy.SharedMessages.csproj" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Legacy/Legacy.Api/Models/PaginatedItems.cs b/src/Legacy/Legacy.Api/Models/PaginatedItems.cs
@@ -0,0 +1,13 @@
+namespace Legacy.Api.Models;
+
+public class PaginatedItems<TEntity>(int pageIndex, int pageSize, long count, IEnumerable<TEntity> items)
+    where TEntity : class
+{
+    public int PageIndex { get; } = pageIndex;
+
+    public int PageSize { get; } = pageSize;
+
+    public long Count { get; } = count;
+
+    public IEnumerable<TEntity> Items { get;} = items;
+}
diff --git a/src/Legacy/Legacy.Api/Models/PaginatedRequest.cs b/src/Legacy/Legacy.Api/Models/PaginatedRequest.cs
@@ -0,0 +1,3 @@
+namespace Legacy.Api.Models;
+
+public record PaginatedRequest(int PageSize = 10, int PageIndex = 0);
diff --git a/src/Legacy/Legacy.Api/Program.cs b/src/Legacy/Legacy.Api/Program.cs
@@ -67,9 +67,9 @@
 var catalogDb = scope.ServiceProvider.GetRequiredService<CatalogDbContext>();
 catalogDb.Database.EnsureDeleted();
 catalogDb.Database.EnsureCreated();
-// catalogDb.Seed();
 var inventoryDb = scope.ServiceProvider.GetRequiredService<InventoryDbContext>();
-// inventoryDb.Seed();
+// inventoryDb.Database.EnsureDeleted();
+inventoryDb.Database.EnsureCreated();
 
 await app.RunAsync();
 

diff --git a/src/Legacy/Legacy.Application/Services/Catalog/CatalogService.cs b/src/Legacy/Legacy.Application/Services/Catalog/CatalogService.cs
@@ -1,6 +1,6 @@
 using Legacy.Application.Events.Events;
 using Legacy.Data.DbContexts;
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 

diff --git a/src/Legacy/Legacy.Application/Services/Inventory/InventoryService.cs b/src/Legacy/Legacy.Application/Services/Inventory/InventoryService.cs
@@ -1,6 +1,6 @@
 using Legacy.Application.Events.Inventory;
 using Legacy.Data.DbContexts;
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/AddressConfig.cs b/src/Legacy/Legacy.Data/Configurations/AddressConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
@@ -12,15 +12,23 @@ public void Configure(EntityTypeBuilder<Address> builder)
 
         builder.Property(e => e.AddressLine1)
             .IsRequired()
-            .HasMaxLength(255);
+            .HasMaxLength(128);
 
         builder.Property(e => e.AddressLine2)
             .IsRequired(false)
-            .HasMaxLength(255);
+            .HasMaxLength(128);
 
         builder.Property(e => e.City)
             .IsRequired()
-            .HasMaxLength(255);
+            .HasMaxLength(128);
+
+        builder.Property(e => e.StateProvince)
+            .IsRequired()
+            .HasMaxLength(128);
+
+        builder.Property(e => e.PostalCode)
+            .IsRequired()
+            .HasMaxLength(64);
 
         builder.Property(e => e.CountryId);
         builder.HasOne<Country>(e => e.Country)
@@ -29,6 +37,6 @@ public void Configure(EntityTypeBuilder<Address> builder)
 
         builder.Property(e => e.Phone)
             .IsRequired(false)
-            .HasMaxLength(50);
+            .HasMaxLength(64);
     }
 }
diff --git a/src/Legacy/Legacy.Data/Configurations/BrandConfig.cs b/src/Legacy/Legacy.Data/Configurations/BrandConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/CartConfig.cs b/src/Legacy/Legacy.Data/Configurations/CartConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/CategoryConfig.cs b/src/Legacy/Legacy.Data/Configurations/CategoryConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/CountryConfig.cs b/src/Legacy/Legacy.Data/Configurations/CountryConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/CustomerConfig.cs b/src/Legacy/Legacy.Data/Configurations/CustomerConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/InventoryConfig.cs b/src/Legacy/Legacy.Data/Configurations/InventoryConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/ItemConfig.cs b/src/Legacy/Legacy.Data/Configurations/ItemConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/ListingConfig.cs b/src/Legacy/Legacy.Data/Configurations/ListingConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/ListingErrorConfig.cs b/src/Legacy/Legacy.Data/Configurations/ListingErrorConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/OrderConfig.cs b/src/Legacy/Legacy.Data/Configurations/OrderConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/PaymentConfig.cs b/src/Legacy/Legacy.Data/Configurations/PaymentConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/PromotionConfig.cs b/src/Legacy/Legacy.Data/Configurations/PromotionConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/RestrictionConfig.cs b/src/Legacy/Legacy.Data/Configurations/RestrictionConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/Configurations/WarehouseConfig.cs b/src/Legacy/Legacy.Data/Configurations/WarehouseConfig.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 

diff --git a/src/Legacy/Legacy.Data/DbContexts/CatalogDbContext.cs b/src/Legacy/Legacy.Data/DbContexts/CatalogDbContext.cs
@@ -1,4 +1,5 @@
-using Legacy.Data.Entities;
+using Legacy.Data.Seeds;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 
@@ -43,6 +44,18 @@ public CatalogDbContext()
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.ApplyConfigurationsFromAssembly(typeof(CatalogDbContext).Assembly);
+
+        modelBuilder.Entity<Brand>()
+            .HasData(CatalogSeeder.GenerateBrands());
+
+        modelBuilder.Entity<Category>()
+            .HasData(CatalogSeeder.GenerateCategories());
+
+        modelBuilder.Entity<Item>()
+            .HasData(CatalogSeeder.GenerateItems());
+
+        modelBuilder.Entity<Restriction>()
+            .HasData(CatalogSeeder.GenerateRestrictions());
     }
 }
 

diff --git a/src/Legacy/Legacy.Data/DbContexts/CustomersDbContext.cs b/src/Legacy/Legacy.Data/DbContexts/CustomersDbContext.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 

diff --git a/src/Legacy/Legacy.Data/DbContexts/InventoryDbContext.cs b/src/Legacy/Legacy.Data/DbContexts/InventoryDbContext.cs
@@ -1,4 +1,5 @@
-using Legacy.Data.Entities;
+using Legacy.Data.Seeds;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 
@@ -42,6 +43,15 @@ public InventoryDbContext()
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         modelBuilder.ApplyConfigurationsFromAssembly(typeof(InventoryDbContext).Assembly);
+
+        modelBuilder.Entity<Warehouse>()
+            .HasData(InventorySeeder.GenerateWarehouses());
+
+        modelBuilder.Entity<Inventory>()
+            .HasData(InventorySeeder.GenerateInventories());
+
+        modelBuilder.Entity<InventoryHistory>()
+            .HasData(InventorySeeder.GenerateInventoryHistories());
     }
 }
 

diff --git a/src/Legacy/Legacy.Data/DbContexts/ListingDbContext.cs b/src/Legacy/Legacy.Data/DbContexts/ListingDbContext.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 

diff --git a/src/Legacy/Legacy.Data/DbContexts/OrderingDbContext.cs b/src/Legacy/Legacy.Data/DbContexts/OrderingDbContext.cs
@@ -1,4 +1,4 @@
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
 

diff --git a/src/Legacy/Legacy.Data/Legacy.Data.csproj b/src/Legacy/Legacy.Data/Legacy.Data.csproj
@@ -21,4 +21,8 @@
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\Legacy.Domain\Legacy.Domain.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Legacy/Legacy.Data/Seeds/CatalogSeeder.cs b/src/Legacy/Legacy.Data/Seeds/CatalogSeeder.cs
@@ -1,6 +1,5 @@
 using Bogus;
-using Legacy.Data.DbContexts;
-using Legacy.Data.Entities;
+using Legacy.Domain.Entities;
 
 namespace Legacy.Data.Seeds;
 
@@ -11,64 +10,37 @@ public static class CatalogSeeder
     private const int MaxItems = 1_024;
     private const int MaxRestrictions = 128;
 
-    public static void Seed(this CatalogDbContext dbContext)
-    {
-        // brands
-        if (dbContext.Brands.Any() is false)
-        {
-            var brands = GenerateBrands();
-            dbContext.AddRange(brands);
-            dbContext.SaveChanges();
-        }
-
-        // categories
-        if (dbContext.Categories.Any() is false)
-        {
-
-            var categories = GenerateCategories();
-            dbContext.AddRange(categories);
-            dbContext.SaveChanges();
-        }
-
-        // items
-        if (dbContext.Items.Any() is false)
-        {
-            var items = GenerateItems();
-            dbContext.AddRange(items);
-            dbContext.SaveChanges();
-        }
-
-        // restrictions
-        if (dbContext.Restrictions.Any() is false)
-        {
-            var restrictions = GenerateRestrictions();
-            dbContext.AddRange(restrictions);
-            dbContext.SaveChanges();
-        }
-    }
-
-    private static IEnumerable<Brand> GenerateBrands()
+    public static IEnumerable<Brand> GenerateBrands()
     {
+        var id = 0;
         var brandFaker = new Faker<Brand>()
+            .UseSeed(100)
+            .RuleFor(p => p.Id, f => ++id)
             .RuleFor(p => p.Name, f => f.Company.CompanyName(0))
             .RuleFor(p => p.PrimaryContactName, f => f.Name.FullName());
         var brands = brandFaker.Generate(MaxBrands);
         return brands;
     }
 
-    private static IEnumerable<Category> GenerateCategories()
+    public static IEnumerable<Category> GenerateCategories()
     {
+        var id = 0;
         var categoryFaker = new Faker<Category>()
+            .UseSeed(100)
+            .RuleFor(p => p.Id, f => ++id)
             .RuleFor(p => p.Name, f => f.Commerce.Department(1))
             .RuleFor(p => p.Code, f => f.Random.AlphaNumeric(8).ToUpper())
             .RuleFor(p => p.Description, f => f.Random.Words(4));
         var categories = categoryFaker.Generate(MaxCategories);
         return categories;
     }
 
-    private static IEnumerable<Item> GenerateItems()
+    public static IEnumerable<Item> GenerateItems()
     {
+        var id = 0;
         var itemFaker = new Faker<Item>()
+            .UseSeed(1_000)
+            .RuleFor(p => p.Id, f => ++id)
             .RuleFor(p => p.Name, f => f.Commerce.ProductName())
             .RuleFor(p => p.Description, f => f.Commerce.ProductDescription())
             .RuleFor(p => p.Color, f => f.Commerce.Color())
@@ -85,18 +57,22 @@ private static IEnumerable<Item> GenerateItems()
             .RuleFor(p => p.Discontinued, f => f.Random.Bool(0.10f))
             .RuleFor(p => p.IsVariant, f => f.Random.Bool(0.10f))
             .RuleFor(p => p.ChildCouldChokeWarning, f => f.Random.Bool(0.02f))
-            // .Ignore(p => p.Brand)
+            .Ignore(p => p.Brand)
             .RuleFor(p => p.BrandId, f => f.Random.Number(1, MaxBrands))
-            // .Ignore(p => p.Category)
+            .Ignore(p => p.Category)
             .RuleFor(p => p.CategoryId, f => f.Random.Number(1, MaxBrands));
         var items = itemFaker.Generate(MaxItems);
         return items;
     }
 
-    private static IEnumerable<Restriction> GenerateRestrictions()
+    public static IEnumerable<Restriction> GenerateRestrictions()
     {
+        var id = 0;
         var restrictionFaker = new Faker<Restriction>()
+            .UseSeed(1_000)
+            .RuleFor(p => p.Id, f => ++id)
             .RuleFor(p => p.ItemId, f => f.Random.Number(1, MaxItems))
+            .Ignore(p => p.Item)
             .RuleFor(p => p.IsRestricted, f => f.Random.Bool(0.35f))
             .RuleFor(p => p.Reason, f => f.Lorem.Sentence(1, 2));
         var restrictions = restrictionFaker.Generate(MaxRestrictions);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		namespace Legacy.Api.Models;

		public record PaginatedRequest(int PageSize = 10, int PageIndex = 0);