Cleanup folder structure again

src/Imprink.Infrastructure/Configuration/AddressConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/CategoryConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/OrderAddressConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/OrderConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/OrderItemConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/OrderStatusConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/ProductConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/ProductVariantConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/RoleConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/ShippingStatusConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/UserConfiguration.cs

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

src/Imprink.Infrastructure/Configuration/UserRoleConfiguration.cs

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

src/Imprink.Infrastructure/Database/ApplicationDbContext.cs

@@ -1,11 +1,5 @@
-using Imprink.Domain.Entities.Orders;
-using Imprink.Domain.Entities.Products;
-using Imprink.Domain.Entities.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 Imprink.Domain.Entities;
+using Imprink.Infrastructure.Configuration;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
 

src/Imprink.Infrastructure/Imprink.Infrastructure.csproj

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

src/Imprink.Infrastructure/Repositories/CategoryRepository.cs

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

src/Imprink.Infrastructure/Repositories/OrderItemRepository.cs

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

src/Imprink.Infrastructure/Repositories/OrderRepository.cs

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

src/Imprink.Infrastructure/Repositories/ProductRepository.cs

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

src/Imprink.Infrastructure/Repositories/ProductVariantRepository.cs

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

src/Imprink.Infrastructure/Repositories/RoleRepository.cs

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

src/Imprink.Infrastructure/Repositories/UserRepository.cs

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

src/Imprink.Infrastructure/Repositories/UserRoleRepository.cs

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

src/Imprink.Infrastructure/Services/CurrentUserService.cs

@@ -1,5 +1,5 @@
 using System.Security.Claims;
-using Imprink.Application.Users.Services;
+using Imprink.Application.Services;
 using Microsoft.AspNetCore.Http;
 
 namespace Imprink.Infrastructure.Services;

src/Imprink.Infrastructure/UnitOfWork.cs

@@ -1,8 +1,5 @@
 using Imprink.Application;
 using Imprink.Domain.Repositories;
-using Imprink.Domain.Repositories.Orders;
-using Imprink.Domain.Repositories.Products;
-using Imprink.Domain.Repositories.Users;
 using Imprink.Infrastructure.Database;
 
 namespace Imprink.Infrastructure;