From e3ad03e751d8645fcdb31b8f455cd17224b0b551 Mon Sep 17 00:00:00 2001 From: lumijiez <59575049+lumijiez@users.noreply.github.com> Date: Mon, 26 May 2025 15:05:31 +0300 Subject: [PATCH] group correctly and cleanup --- src/Printbase.Domain/Entities/Orders/Order.cs | 2 +- src/Printbase.Domain/Entities/Orders/OrderAddress.cs | 2 +- src/Printbase.Domain/Entities/Orders/OrderItem.cs | 6 ++++-- src/Printbase.Domain/Entities/Orders/OrderStatus.cs | 2 +- src/Printbase.Domain/Entities/Orders/ShippingStatus.cs | 2 +- src/Printbase.Domain/Entities/Product/Category.cs | 2 +- src/Printbase.Domain/Entities/Product/Product.cs | 4 +++- src/Printbase.Domain/Entities/Product/ProductVariant.cs | 4 +++- src/Printbase.Domain/Entities/Users/Address.cs | 2 +- src/Printbase.Domain/Entities/Users/ApplicationRole.cs | 2 ++ src/Printbase.Domain/Entities/Users/ApplicationUser.cs | 7 ++++--- .../{ => Orders}/OrderAddressConfiguration.cs | 4 ++-- .../Configuration/{ => Orders}/OrderConfiguration.cs | 4 ++-- .../Configuration/{ => Orders}/OrderItemConfiguration.cs | 4 ++-- .../Configuration/{ => Orders}/OrderStatusConfiguration.cs | 4 ++-- .../{ => Orders}/ShippingStatusConfiguration.cs | 4 ++-- .../Configuration/{ => Products}/CategoryConfiguration.cs | 7 +++---- .../Configuration/{ => Products}/ProductConfiguration.cs | 4 ++-- .../{ => Products}/ProductVariantConfiguration.cs | 4 ++-- .../Configuration/{ => Users}/AddressConfiguration.cs | 3 +-- .../{ => Users}/ApplicationRoleConfiguration.cs | 3 ++- .../{ => Users}/ApplicationUserConfiguration.cs | 2 +- .../Database/ApplicationDbContext.cs | 5 +++++ 23 files changed, 48 insertions(+), 35 deletions(-) rename src/Printbase.Infrastructure/Configuration/{ => Orders}/OrderAddressConfiguration.cs (91%) rename src/Printbase.Infrastructure/Configuration/{ => Orders}/OrderConfiguration.cs (96%) rename src/Printbase.Infrastructure/Configuration/{ => Orders}/OrderItemConfiguration.cs (95%) rename src/Printbase.Infrastructure/Configuration/{ => Orders}/OrderStatusConfiguration.cs (90%) rename src/Printbase.Infrastructure/Configuration/{ => Orders}/ShippingStatusConfiguration.cs (90%) rename src/Printbase.Infrastructure/Configuration/{ => Products}/CategoryConfiguration.cs (96%) rename src/Printbase.Infrastructure/Configuration/{ => Products}/ProductConfiguration.cs (95%) rename src/Printbase.Infrastructure/Configuration/{ => Products}/ProductVariantConfiguration.cs (94%) rename src/Printbase.Infrastructure/Configuration/{ => Users}/AddressConfiguration.cs (95%) rename src/Printbase.Infrastructure/Configuration/{ => Users}/ApplicationRoleConfiguration.cs (95%) rename src/Printbase.Infrastructure/Configuration/{ => Users}/ApplicationUserConfiguration.cs (93%) diff --git a/src/Printbase.Domain/Entities/Orders/Order.cs b/src/Printbase.Domain/Entities/Orders/Order.cs index f93d7a1..b78be59 100644 --- a/src/Printbase.Domain/Entities/Orders/Order.cs +++ b/src/Printbase.Domain/Entities/Orders/Order.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Orders; public class Order : EntityBase { diff --git a/src/Printbase.Domain/Entities/Orders/OrderAddress.cs b/src/Printbase.Domain/Entities/Orders/OrderAddress.cs index 30573a5..ef873d2 100644 --- a/src/Printbase.Domain/Entities/Orders/OrderAddress.cs +++ b/src/Printbase.Domain/Entities/Orders/OrderAddress.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Orders; public class OrderAddress : EntityBase { diff --git a/src/Printbase.Domain/Entities/Orders/OrderItem.cs b/src/Printbase.Domain/Entities/Orders/OrderItem.cs index c818182..40392cc 100644 --- a/src/Printbase.Domain/Entities/Orders/OrderItem.cs +++ b/src/Printbase.Domain/Entities/Orders/OrderItem.cs @@ -1,4 +1,6 @@ -namespace Printbase.Domain.Entities; +using Printbase.Domain.Entities.Product; + +namespace Printbase.Domain.Entities.Orders; public class OrderItem : EntityBase { @@ -12,6 +14,6 @@ public class OrderItem : EntityBase public string CustomizationDescription { get; set; } public virtual Order Order { get; set; } - public virtual Product Product { get; set; } + public virtual Product.Product Product { get; set; } public virtual ProductVariant ProductVariant { get; set; } } \ No newline at end of file diff --git a/src/Printbase.Domain/Entities/Orders/OrderStatus.cs b/src/Printbase.Domain/Entities/Orders/OrderStatus.cs index 94211c5..5fadb33 100644 --- a/src/Printbase.Domain/Entities/Orders/OrderStatus.cs +++ b/src/Printbase.Domain/Entities/Orders/OrderStatus.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Orders; public class OrderStatus { diff --git a/src/Printbase.Domain/Entities/Orders/ShippingStatus.cs b/src/Printbase.Domain/Entities/Orders/ShippingStatus.cs index 7f4a923..d94c61a 100644 --- a/src/Printbase.Domain/Entities/Orders/ShippingStatus.cs +++ b/src/Printbase.Domain/Entities/Orders/ShippingStatus.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Orders; public class ShippingStatus { diff --git a/src/Printbase.Domain/Entities/Product/Category.cs b/src/Printbase.Domain/Entities/Product/Category.cs index 9eab20d..c0019f8 100644 --- a/src/Printbase.Domain/Entities/Product/Category.cs +++ b/src/Printbase.Domain/Entities/Product/Category.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Product; public class Category : EntityBase { diff --git a/src/Printbase.Domain/Entities/Product/Product.cs b/src/Printbase.Domain/Entities/Product/Product.cs index 7ac0b54..11caaaa 100644 --- a/src/Printbase.Domain/Entities/Product/Product.cs +++ b/src/Printbase.Domain/Entities/Product/Product.cs @@ -1,4 +1,6 @@ -namespace Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; + +namespace Printbase.Domain.Entities.Product; public class Product : EntityBase { diff --git a/src/Printbase.Domain/Entities/Product/ProductVariant.cs b/src/Printbase.Domain/Entities/Product/ProductVariant.cs index 8d19a67..38e52c2 100644 --- a/src/Printbase.Domain/Entities/Product/ProductVariant.cs +++ b/src/Printbase.Domain/Entities/Product/ProductVariant.cs @@ -1,4 +1,6 @@ -namespace Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; + +namespace Printbase.Domain.Entities.Product; public class ProductVariant : EntityBase { diff --git a/src/Printbase.Domain/Entities/Users/Address.cs b/src/Printbase.Domain/Entities/Users/Address.cs index 3d2b016..67ae370 100644 --- a/src/Printbase.Domain/Entities/Users/Address.cs +++ b/src/Printbase.Domain/Entities/Users/Address.cs @@ -1,4 +1,4 @@ -namespace Printbase.Domain.Entities; +namespace Printbase.Domain.Entities.Users; public class Address : EntityBase { diff --git a/src/Printbase.Domain/Entities/Users/ApplicationRole.cs b/src/Printbase.Domain/Entities/Users/ApplicationRole.cs index 9930478..9cb1efb 100644 --- a/src/Printbase.Domain/Entities/Users/ApplicationRole.cs +++ b/src/Printbase.Domain/Entities/Users/ApplicationRole.cs @@ -1,5 +1,7 @@ using Microsoft.AspNetCore.Identity; +namespace Printbase.Domain.Entities.Users; + public class ApplicationRole : IdentityRole { public string Description { get; set; } diff --git a/src/Printbase.Domain/Entities/Users/ApplicationUser.cs b/src/Printbase.Domain/Entities/Users/ApplicationUser.cs index fee1451..2449c82 100644 --- a/src/Printbase.Domain/Entities/Users/ApplicationUser.cs +++ b/src/Printbase.Domain/Entities/Users/ApplicationUser.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Identity; +using Printbase.Domain.Entities.Orders; namespace Printbase.Domain.Entities.Users; -public class ApplicationUser : IdentityUser +public sealed class ApplicationUser : IdentityUser { public string FirstName { get; set; } public string LastName { get; set; } @@ -12,6 +13,6 @@ public class ApplicationUser : IdentityUser public bool IsActive { get; set; } public string ProfileImageUrl { get; set; } - public virtual ICollection
Addresses { get; set; } = new List
(); - public virtual ICollection Orders { get; set; } = new List(); + public ICollection
Addresses { get; set; } = new List
(); + public ICollection Orders { get; set; } = new List(); } \ No newline at end of file diff --git a/src/Printbase.Infrastructure/Configuration/OrderAddressConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Orders/OrderAddressConfiguration.cs similarity index 91% rename from src/Printbase.Infrastructure/Configuration/OrderAddressConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Orders/OrderAddressConfiguration.cs index 6a5da97..fd50b33 100644 --- a/src/Printbase.Infrastructure/Configuration/OrderAddressConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Orders/OrderAddressConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Orders; public class OrderAddressConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/OrderConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Orders/OrderConfiguration.cs similarity index 96% rename from src/Printbase.Infrastructure/Configuration/OrderConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Orders/OrderConfiguration.cs index 1df0d21..9a08bf0 100644 --- a/src/Printbase.Infrastructure/Configuration/OrderConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Orders/OrderConfiguration.cs @@ -1,9 +1,9 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; using Printbase.Domain.Entities.Users; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Orders; public class OrderConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/OrderItemConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Orders/OrderItemConfiguration.cs similarity index 95% rename from src/Printbase.Infrastructure/Configuration/OrderItemConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Orders/OrderItemConfiguration.cs index db6ab19..c03d9b0 100644 --- a/src/Printbase.Infrastructure/Configuration/OrderItemConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Orders/OrderItemConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Orders; public class OrderItemConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/OrderStatusConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Orders/OrderStatusConfiguration.cs similarity index 90% rename from src/Printbase.Infrastructure/Configuration/OrderStatusConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Orders/OrderStatusConfiguration.cs index d7ca898..979b381 100644 --- a/src/Printbase.Infrastructure/Configuration/OrderStatusConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Orders/OrderStatusConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Orders; public class OrderStatusConfiguration : IEntityTypeConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/ShippingStatusConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Orders/ShippingStatusConfiguration.cs similarity index 90% rename from src/Printbase.Infrastructure/Configuration/ShippingStatusConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Orders/ShippingStatusConfiguration.cs index 9461bc0..fd98f43 100644 --- a/src/Printbase.Infrastructure/Configuration/ShippingStatusConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Orders/ShippingStatusConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Orders; public class ShippingStatusConfiguration : IEntityTypeConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/CategoryConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Products/CategoryConfiguration.cs similarity index 96% rename from src/Printbase.Infrastructure/Configuration/CategoryConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Products/CategoryConfiguration.cs index 6bc442d..16c1206 100644 --- a/src/Printbase.Infrastructure/Configuration/CategoryConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Products/CategoryConfiguration.cs @@ -1,9 +1,8 @@ -using Printbase.Domain.Entities; - -namespace Printbase.Infrastructure.Configuration; - using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Printbase.Domain.Entities.Product; + +namespace Printbase.Infrastructure.Configuration.Products; public class CategoryConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/ProductConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Products/ProductConfiguration.cs similarity index 95% rename from src/Printbase.Infrastructure/Configuration/ProductConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Products/ProductConfiguration.cs index c00499c..c425696 100644 --- a/src/Printbase.Infrastructure/Configuration/ProductConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Products/ProductConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Product; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Products; public class ProductConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/ProductVariantConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs similarity index 94% rename from src/Printbase.Infrastructure/Configuration/ProductVariantConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs index 3fbb87a..2d764d8 100644 --- a/src/Printbase.Infrastructure/Configuration/ProductVariantConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Product; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Products; public class ProductVariantConfiguration : EntityBaseConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/AddressConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Users/AddressConfiguration.cs similarity index 95% rename from src/Printbase.Infrastructure/Configuration/AddressConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Users/AddressConfiguration.cs index a0e16f8..09df0d6 100644 --- a/src/Printbase.Infrastructure/Configuration/AddressConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Users/AddressConfiguration.cs @@ -1,9 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Printbase.Domain.Entities; using Printbase.Domain.Entities.Users; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Users; public class AddressConfiguration : EntityBaseConfiguration
{ diff --git a/src/Printbase.Infrastructure/Configuration/ApplicationRoleConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Users/ApplicationRoleConfiguration.cs similarity index 95% rename from src/Printbase.Infrastructure/Configuration/ApplicationRoleConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Users/ApplicationRoleConfiguration.cs index d1b098f..14ec3ac 100644 --- a/src/Printbase.Infrastructure/Configuration/ApplicationRoleConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Users/ApplicationRoleConfiguration.cs @@ -1,7 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Printbase.Domain.Entities.Users; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Users; public class ApplicationRoleConfiguration : IEntityTypeConfiguration { diff --git a/src/Printbase.Infrastructure/Configuration/ApplicationUserConfiguration.cs b/src/Printbase.Infrastructure/Configuration/Users/ApplicationUserConfiguration.cs similarity index 93% rename from src/Printbase.Infrastructure/Configuration/ApplicationUserConfiguration.cs rename to src/Printbase.Infrastructure/Configuration/Users/ApplicationUserConfiguration.cs index cdfdd80..718337d 100644 --- a/src/Printbase.Infrastructure/Configuration/ApplicationUserConfiguration.cs +++ b/src/Printbase.Infrastructure/Configuration/Users/ApplicationUserConfiguration.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; using Printbase.Domain.Entities.Users; -namespace Printbase.Infrastructure.Configuration; +namespace Printbase.Infrastructure.Configuration.Users; public class ApplicationUserConfiguration : IEntityTypeConfiguration { diff --git a/src/Printbase.Infrastructure/Database/ApplicationDbContext.cs b/src/Printbase.Infrastructure/Database/ApplicationDbContext.cs index 23a9ec9..3175bf5 100644 --- a/src/Printbase.Infrastructure/Database/ApplicationDbContext.cs +++ b/src/Printbase.Infrastructure/Database/ApplicationDbContext.cs @@ -1,8 +1,13 @@ using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; using Printbase.Domain.Entities; +using Printbase.Domain.Entities.Orders; +using Printbase.Domain.Entities.Product; using Printbase.Domain.Entities.Users; using Printbase.Infrastructure.Configuration; +using Printbase.Infrastructure.Configuration.Orders; +using Printbase.Infrastructure.Configuration.Products; +using Printbase.Infrastructure.Configuration.Users; namespace Printbase.Infrastructure.Database;