group correctly and cleanup

This commit is contained in:
lumijiez
2025-05-26 15:05:31 +03:00
parent e8c5fbb5cc
commit e3ad03e751
23 changed files with 48 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Orders;
public class Order : EntityBase public class Order : EntityBase
{ {

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Orders;
public class OrderAddress : EntityBase public class OrderAddress : EntityBase
{ {

View File

@@ -1,4 +1,6 @@
namespace Printbase.Domain.Entities; using Printbase.Domain.Entities.Product;
namespace Printbase.Domain.Entities.Orders;
public class OrderItem : EntityBase public class OrderItem : EntityBase
{ {
@@ -12,6 +14,6 @@ public class OrderItem : EntityBase
public string CustomizationDescription { get; set; } public string CustomizationDescription { get; set; }
public virtual Order Order { 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; } public virtual ProductVariant ProductVariant { get; set; }
} }

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Orders;
public class OrderStatus public class OrderStatus
{ {

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Orders;
public class ShippingStatus public class ShippingStatus
{ {

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Product;
public class Category : EntityBase public class Category : EntityBase
{ {

View File

@@ -1,4 +1,6 @@
namespace Printbase.Domain.Entities; using Printbase.Domain.Entities.Orders;
namespace Printbase.Domain.Entities.Product;
public class Product : EntityBase public class Product : EntityBase
{ {

View File

@@ -1,4 +1,6 @@
namespace Printbase.Domain.Entities; using Printbase.Domain.Entities.Orders;
namespace Printbase.Domain.Entities.Product;
public class ProductVariant : EntityBase public class ProductVariant : EntityBase
{ {

View File

@@ -1,4 +1,4 @@
namespace Printbase.Domain.Entities; namespace Printbase.Domain.Entities.Users;
public class Address : EntityBase public class Address : EntityBase
{ {

View File

@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
namespace Printbase.Domain.Entities.Users;
public class ApplicationRole : IdentityRole public class ApplicationRole : IdentityRole
{ {
public string Description { get; set; } public string Description { get; set; }

View File

@@ -1,8 +1,9 @@
using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity;
using Printbase.Domain.Entities.Orders;
namespace Printbase.Domain.Entities.Users; namespace Printbase.Domain.Entities.Users;
public class ApplicationUser : IdentityUser public sealed class ApplicationUser : IdentityUser
{ {
public string FirstName { get; set; } public string FirstName { get; set; }
public string LastName { get; set; } public string LastName { get; set; }
@@ -12,6 +13,6 @@ public class ApplicationUser : IdentityUser
public bool IsActive { get; set; } public bool IsActive { get; set; }
public string ProfileImageUrl { get; set; } public string ProfileImageUrl { get; set; }
public virtual ICollection<Address> Addresses { get; set; } = new List<Address>(); public ICollection<Address> Addresses { get; set; } = new List<Address>();
public virtual ICollection<Order> Orders { get; set; } = new List<Order>(); public ICollection<Order> Orders { get; set; } = new List<Order>();
} }

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<OrderAddress> public class OrderAddressConfiguration : EntityBaseConfiguration<OrderAddress>
{ {

View File

@@ -1,9 +1,9 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Printbase.Domain.Entities; using Printbase.Domain.Entities.Orders;
using Printbase.Domain.Entities.Users; using Printbase.Domain.Entities.Users;
namespace Printbase.Infrastructure.Configuration; namespace Printbase.Infrastructure.Configuration.Orders;
public class OrderConfiguration : EntityBaseConfiguration<Order> public class OrderConfiguration : EntityBaseConfiguration<Order>
{ {

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<OrderItem> public class OrderItemConfiguration : EntityBaseConfiguration<OrderItem>
{ {

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<OrderStatus> public class OrderStatusConfiguration : IEntityTypeConfiguration<OrderStatus>
{ {

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<ShippingStatus> public class ShippingStatusConfiguration : IEntityTypeConfiguration<ShippingStatus>
{ {

View File

@@ -1,9 +1,8 @@
using Printbase.Domain.Entities;
namespace Printbase.Infrastructure.Configuration;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Printbase.Domain.Entities.Product;
namespace Printbase.Infrastructure.Configuration.Products;
public class CategoryConfiguration : EntityBaseConfiguration<Category> public class CategoryConfiguration : EntityBaseConfiguration<Category>
{ {

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<Product> public class ProductConfiguration : EntityBaseConfiguration<Product>
{ {

View File

@@ -1,8 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; 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<ProductVariant> public class ProductVariantConfiguration : EntityBaseConfiguration<ProductVariant>
{ {

View File

@@ -1,9 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Printbase.Domain.Entities;
using Printbase.Domain.Entities.Users; using Printbase.Domain.Entities.Users;
namespace Printbase.Infrastructure.Configuration; namespace Printbase.Infrastructure.Configuration.Users;
public class AddressConfiguration : EntityBaseConfiguration<Address> public class AddressConfiguration : EntityBaseConfiguration<Address>
{ {

View File

@@ -1,7 +1,8 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Printbase.Domain.Entities.Users;
namespace Printbase.Infrastructure.Configuration; namespace Printbase.Infrastructure.Configuration.Users;
public class ApplicationRoleConfiguration : IEntityTypeConfiguration<ApplicationRole> public class ApplicationRoleConfiguration : IEntityTypeConfiguration<ApplicationRole>
{ {

View File

@@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders; using Microsoft.EntityFrameworkCore.Metadata.Builders;
using Printbase.Domain.Entities.Users; using Printbase.Domain.Entities.Users;
namespace Printbase.Infrastructure.Configuration; namespace Printbase.Infrastructure.Configuration.Users;
public class ApplicationUserConfiguration : IEntityTypeConfiguration<ApplicationUser> public class ApplicationUserConfiguration : IEntityTypeConfiguration<ApplicationUser>
{ {

View File

@@ -1,8 +1,13 @@
using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Printbase.Domain.Entities; using Printbase.Domain.Entities;
using Printbase.Domain.Entities.Orders;
using Printbase.Domain.Entities.Product;
using Printbase.Domain.Entities.Users; using Printbase.Domain.Entities.Users;
using Printbase.Infrastructure.Configuration; using Printbase.Infrastructure.Configuration;
using Printbase.Infrastructure.Configuration.Orders;
using Printbase.Infrastructure.Configuration.Products;
using Printbase.Infrastructure.Configuration.Users;
namespace Printbase.Infrastructure.Database; namespace Printbase.Infrastructure.Database;