src/Imprink.Infrastructure/Categories/Configuration/CategoryConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Products;
+namespace Imprink.Infrastructure.Categories.Configuration;
 
 public class CategoryConfiguration : EntityBaseConfiguration<Category>
 {

src/Imprink.Infrastructure/Categories/Repositories/CategoryRepository.cs

@@ -3,7 +3,7 @@ using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Products;
+namespace Imprink.Infrastructure.Categories.Repositories;
 
 public class CategoryRepository(ApplicationDbContext context) : ICategoryRepository
 {

src/Imprink.Infrastructure/Database/ApplicationDbContext.cs

@@ -1,9 +1,11 @@
 using Imprink.Domain.Entities.Orders;
 using Imprink.Domain.Entities.Products;
 using Imprink.Domain.Entities.Users;
-using Imprink.Infrastructure.Configuration.Orders;
-using Imprink.Infrastructure.Configuration.Products;
-using Imprink.Infrastructure.Configuration.Users;
+using Imprink.Infrastructure.Categories.Configuration;
+using Imprink.Infrastructure.Orders.Configuration;
+using Imprink.Infrastructure.Products.Configuration;
+using Imprink.Infrastructure.ProductVariants.Configuration;
+using Imprink.Infrastructure.Users.Configuration;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 

src/Imprink.Infrastructure/EntityBaseConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration;
+namespace Imprink.Infrastructure;
 
 public class EntityBaseConfiguration<T> : IEntityTypeConfiguration<T> where T : EntityBase
 {

src/Imprink.Infrastructure/Imprink.Infrastructure.csproj

@@ -25,6 +25,7 @@
 
     <ItemGroup>
       <Folder Include="Migrations\" />
+      <Folder Include="Orders\Repositories\Repositories\" />
     </ItemGroup>
 
 </Project>

src/Imprink.Infrastructure/Orders/Configuration/OrderAddressConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Orders;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Orders;
+namespace Imprink.Infrastructure.Orders.Configuration;
 
 public class OrderAddressConfiguration : EntityBaseConfiguration<OrderAddress>
 {

src/Imprink.Infrastructure/Orders/Configuration/OrderConfiguration.cs

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

src/Imprink.Infrastructure/Orders/Configuration/OrderItemConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Orders;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Orders;
+namespace Imprink.Infrastructure.Orders.Configuration;
 
 public class OrderItemConfiguration : EntityBaseConfiguration<OrderItem>
     {

src/Imprink.Infrastructure/Orders/Configuration/OrderStatusConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Orders;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Orders;
+namespace Imprink.Infrastructure.Orders.Configuration;
 
 public class OrderStatusConfiguration : IEntityTypeConfiguration<OrderStatus>
 {

src/Imprink.Infrastructure/Orders/Configuration/ShippingStatusConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Orders;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Orders;
+namespace Imprink.Infrastructure.Orders.Configuration;
 
 public class ShippingStatusConfiguration : IEntityTypeConfiguration<ShippingStatus>
 {

src/Imprink.Infrastructure/Orders/Repositories/OrderItemRepository.cs

@@ -3,7 +3,7 @@ using Imprink.Domain.Repositories.Orders;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Orders;
+namespace Imprink.Infrastructure.Orders.Repositories;
 
 public class OrderItemRepository(ApplicationDbContext context) : IOrderItemRepository
 {

src/Imprink.Infrastructure/Orders/Repositories/OrderRepository.cs

@@ -4,7 +4,7 @@ using Imprink.Domain.Repositories.Orders;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Orders;
+namespace Imprink.Infrastructure.Orders.Repositories;
 
 public class OrderRepository(ApplicationDbContext context) : IOrderRepository
 {

src/Imprink.Infrastructure/ProductVariants/Configuration/ProductVariantConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Products;
+namespace Imprink.Infrastructure.ProductVariants.Configuration;
 
 public class ProductVariantConfiguration : EntityBaseConfiguration<ProductVariant>
 {

src/Imprink.Infrastructure/ProductVariants/Repositories/ProductVariantRepository.cs

@@ -3,7 +3,7 @@ using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Products;
+namespace Imprink.Infrastructure.ProductVariants.Repositories;
 
 public class ProductVariantRepository(ApplicationDbContext context) : IProductVariantRepository
 {

src/Imprink.Infrastructure/Products/Configuration/ProductConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Products;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Products;
+namespace Imprink.Infrastructure.Products.Configuration;
 
 public class ProductConfiguration : EntityBaseConfiguration<Product>
 {

src/Imprink.Infrastructure/Products/Repositories/ProductRepository.cs

@@ -4,7 +4,7 @@ using Imprink.Domain.Repositories.Products;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Products;
+namespace Imprink.Infrastructure.Products.Repositories;
 
 public class ProductRepository(ApplicationDbContext context) : IProductRepository
 {

src/Imprink.Infrastructure/Users/Configuration/AddressConfiguration.cs

@@ -2,7 +2,7 @@ using Imprink.Domain.Entities.Users;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
-namespace Imprink.Infrastructure.Configuration.Users;
+namespace Imprink.Infrastructure.Users.Configuration;
 
 public class AddressConfiguration : EntityBaseConfiguration<Address>
 {

src/Imprink.Infrastructure/Users/Configuration/RoleConfiguration.cs

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

src/Imprink.Infrastructure/Users/Configuration/UserConfiguration.cs

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

src/Imprink.Infrastructure/Users/Configuration/UserRoleConfiguration.cs

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

src/Imprink.Infrastructure/Users/Repositories/RoleRepository.cs

@@ -1,10 +1,9 @@
 using Imprink.Domain.Entities.Users;
-using Imprink.Domain.Repositories;
 using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Users;
+namespace Imprink.Infrastructure.Users.Repositories;
 
 public class RoleRepository(ApplicationDbContext context) : IRoleRepository
 {

src/Imprink.Infrastructure/Users/Repositories/UserRepository.cs

@@ -1,11 +1,10 @@
 using Imprink.Domain.Entities.Users;
 using Imprink.Domain.Models;
-using Imprink.Domain.Repositories;
 using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Users;
+namespace Imprink.Infrastructure.Users.Repositories;
 
 public class UserRepository(ApplicationDbContext context) : IUserRepository
 {

src/Imprink.Infrastructure/Users/Repositories/UserRoleRepository.cs

@@ -3,7 +3,7 @@ using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 
-namespace Imprink.Infrastructure.Repositories.Users;
+namespace Imprink.Infrastructure.Users.Repositories;
 
 public class UserRoleRepository(ApplicationDbContext context) : IUserRoleRepository
 {

src/Imprink.WebApi/Program.cs

@@ -13,3 +13,5 @@ var app = builder.Build();
 Startup.Configure(app, app.Environment);
 
 app.Run();
+
+public partial class Program { }

src/Imprink.WebApi/Startup.cs

@@ -10,11 +10,13 @@ using Imprink.Domain.Repositories.Orders;
 using Imprink.Domain.Repositories.Products;
 using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure;
+using Imprink.Infrastructure.Categories.Repositories;
 using Imprink.Infrastructure.Database;
-using Imprink.Infrastructure.Repositories.Orders;
-using Imprink.Infrastructure.Repositories.Products;
-using Imprink.Infrastructure.Repositories.Users;
+using Imprink.Infrastructure.Orders.Repositories;
+using Imprink.Infrastructure.Products.Repositories;
+using Imprink.Infrastructure.ProductVariants.Repositories;
 using Imprink.Infrastructure.Services;
+using Imprink.Infrastructure.Users.Repositories;
 using Imprink.WebApi.Filters;
 using Imprink.WebApi.Middleware;
 using Microsoft.AspNetCore.Authentication.JwtBearer;

tests/Imprink.WebApi.Tests/Imprink.WebApi.Tests.csproj

@@ -5,6 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
+    <PreserveCompilationContext>true</PreserveCompilationContext>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +13,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.5" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.7.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>