Cleanup folder structure again

src/Imprink.Application/Commands/Categories/CreateCategoryHandler.cs

@@ -1,9 +1,8 @@
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Application.Products.Dtos;
+using Imprink.Domain.Entities;
-using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Categories.Commands;
+namespace Imprink.Application.Commands.Categories;
 
 public class CreateCategoryCommand : IRequest<CategoryDto>
 {

src/Imprink.Application/Commands/Categories/DeleteCategoryHandler.cs

@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.Categories.Commands;
+namespace Imprink.Application.Commands.Categories;
 
 public class DeleteCategoryCommand : IRequest<bool>
 {

src/Imprink.Application/Commands/Categories/GetCategoriesHandler.cs

@@ -1,9 +1,8 @@
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Application.Products.Dtos;
+using Imprink.Domain.Entities;
-using Imprink.Domain.Entities.Products;
 using MediatR;
 
-namespace Imprink.Application.Categories.Commands;
+namespace Imprink.Application.Commands.Categories;
 
 public class GetCategoriesQuery : IRequest<IEnumerable<CategoryDto>>
 {

src/Imprink.Application/Commands/Categories/UpdateCategoryHandler.cs

@@ -1,9 +1,8 @@
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Products.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Categories.Commands;
+namespace Imprink.Application.Commands.Categories;
 
 public class UpdateCategoryCommand : IRequest<CategoryDto>
 {

src/Imprink.Application/Commands/ProductVariants/CreateProductVariantHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
-using Imprink.Application.ProductVariants.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 using MediatR;
 
-namespace Imprink.Application.ProductVariants.Commands;
+namespace Imprink.Application.Commands.ProductVariants;
 
 public class CreateProductVariantCommand : IRequest<ProductVariantDto>
 {

src/Imprink.Application/Commands/ProductVariants/DeleteProductVariantHandler.cs

@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.ProductVariants.Commands;
+namespace Imprink.Application.Commands.ProductVariants;
 
 public class DeleteProductVariantCommand : IRequest<bool>
 {

src/Imprink.Application/Commands/ProductVariants/GetProductVariantsHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
-using Imprink.Application.ProductVariants.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
-namespace Imprink.Application.ProductVariants.Commands;
+namespace Imprink.Application.Commands.ProductVariants;
 
 public class GetProductVariantsQuery : IRequest<IEnumerable<ProductVariantDto>>
 {

src/Imprink.Application/Commands/ProductVariants/UpdateProductVariantHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.ProductVariants.Dtos;
 using MediatR;
 
-namespace Imprink.Application.ProductVariants.Commands;
+namespace Imprink.Application.Commands.ProductVariants;
 
 public class UpdateProductVariantCommand : IRequest<ProductVariantDto>
 {

src/Imprink.Application/Commands/Products/CreateProductHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
-using Imprink.Application.Products.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 using MediatR;
 
-namespace Imprink.Application.Products.Commands;
+namespace Imprink.Application.Commands.Products;
 
 public class CreateProductCommand : IRequest<ProductDto>
 {
@@ -33,6 +33,7 @@ public class CreateProductHandler(IUnitOfWork unitOfWork, IMapper mapper) : IReq
                 createdProduct.Category = (await unitOfWork.CategoryRepository.GetByIdAsync(createdProduct.CategoryId.Value, cancellationToken))!;
             }
             
+            await unitOfWork.SaveAsync(cancellationToken);
             await unitOfWork.CommitTransactionAsync(cancellationToken);
 
             return mapper.Map<ProductDto>(createdProduct);

src/Imprink.Application/Commands/Products/DeleteProductHandler.cs

@@ -1,6 +1,6 @@
 using MediatR;
 
-namespace Imprink.Application.Products.Commands;
+namespace Imprink.Application.Commands.Products;
 
 public class DeleteProductCommand : IRequest<bool>
 {

src/Imprink.Application/Commands/Products/GetProductsHandler.cs

@@ -1,9 +1,8 @@
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 
-namespace Imprink.Application.Products.Commands;
+namespace Imprink.Application.Commands.Products;
 
 public class GetProductsQuery : IRequest<PagedResultDto<ProductDto>>
 {

src/Imprink.Application/Commands/Products/UpdateProductCommand.cs

@@ -1,9 +1,8 @@
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Products.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Products.Commands;
+namespace Imprink.Application.Commands.Products;
 
 public class UpdateProductCommand : IRequest<ProductDto>
 {

src/Imprink.Application/Commands/Users/DeleteUserRoleHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Users.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record DeleteUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 

src/Imprink.Application/Commands/Users/GetAllRolesHandler.cs

@@ -1,8 +1,8 @@
 using AutoMapper;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record GetAllRolesCommand : IRequest<IEnumerable<RoleDto>>;
 

src/Imprink.Application/Commands/Users/GetUserRolesHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Users.Dtos;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record GetUserRolesCommand(string Sub) : IRequest<IEnumerable<RoleDto>>;
 

src/Imprink.Application/Commands/Users/SetUserFullNameHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Services;
-using Imprink.Application.Users.Services;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record SetUserFullNameCommand(string FirstName, string LastName) : IRequest<UserDto?>;
 

src/Imprink.Application/Commands/Users/SetUserPhoneHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Services;
-using Imprink.Application.Users.Services;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record SetUserPhoneCommand(string PhoneNumber) : IRequest<UserDto?>;
 

src/Imprink.Application/Commands/Users/SetUserRoleHandler.cs

@@ -1,10 +1,10 @@
 using AutoMapper;
+using Imprink.Application.Dtos;
 using Imprink.Application.Exceptions;
-using Imprink.Application.Users.Dtos;
+using Imprink.Domain.Entities;
-using Imprink.Domain.Entities.Users;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record SetUserRoleCommand(string Sub, Guid RoleId) : IRequest<UserRoleDto?>;
 

src/Imprink.Application/Commands/Users/SyncUserHandler.cs

@@ -1,9 +1,9 @@
 using AutoMapper;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 
-namespace Imprink.Application.Users.Commands;
+namespace Imprink.Application.Commands.Users;
 
 public record SyncUserCommand(Auth0User User) : IRequest<UserDto?>;
 

src/Imprink.Application/Dtos/CategoryDto.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Application.Categories.Dtos;
+namespace Imprink.Application.Dtos;
 
 public class CategoryDto
 {

src/Imprink.Application/Dtos/PagedResultDto.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Application.Products.Dtos;
+namespace Imprink.Application.Dtos;
 
 public class PagedResultDto<T>
 {

src/Imprink.Application/Dtos/ProductDto.cs

@@ -1,6 +1,4 @@
-using Imprink.Application.Categories.Dtos;
+namespace Imprink.Application.Dtos;
-
-namespace Imprink.Application.Products.Dtos;
 
 public class ProductDto
 {

src/Imprink.Application/Dtos/ProductVariantDto.cs

@@ -1,6 +1,4 @@
-using Imprink.Application.Products.Dtos;
+namespace Imprink.Application.Dtos;
-
-namespace Imprink.Application.ProductVariants.Dtos;
 
 public class ProductVariantDto
 {

src/Imprink.Application/Dtos/RoleDto.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Application.Users.Dtos;
+namespace Imprink.Application.Dtos;
 
 public class RoleDto
 {

src/Imprink.Application/Dtos/UserDto.cs

@@ -1,7 +1,6 @@
-using Imprink.Domain.Entities.Orders;
+using Imprink.Domain.Entities;
-using Imprink.Domain.Entities.Users;
 
-namespace Imprink.Application.Users.Dtos;
+namespace Imprink.Application.Dtos;
 
 public class UserDto
 {

src/Imprink.Application/Dtos/UserRoleDto.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Application.Users.Dtos;
+namespace Imprink.Application.Dtos;
 
 public class UserRoleDto
 {

src/Imprink.Application/IUnitOfWork.cs

@@ -1,7 +1,4 @@
 using Imprink.Domain.Repositories;
-using Imprink.Domain.Repositories.Orders;
-using Imprink.Domain.Repositories.Products;
-using Imprink.Domain.Repositories.Users;
 
 namespace Imprink.Application;
 

src/Imprink.Application/Mappings/ProductMappingProfile.cs

@@ -1,12 +1,10 @@
 using AutoMapper;
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Commands.Products;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Commands.ProductVariants;
-using Imprink.Application.Products.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Domain.Entities;
-using Imprink.Application.ProductVariants.Dtos;
-using Imprink.Domain.Entities.Products;
 
-namespace Imprink.Application.Products.Mappings;
+namespace Imprink.Application.Mappings;
 
 public class ProductMappingProfile: Profile
 {

src/Imprink.Application/Mappings/UserMappingProfile.cs

@@ -1,10 +1,10 @@
 using System.Security.Claims;
 using AutoMapper;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Domain.Entities.Users;
+using Imprink.Domain.Entities;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Users.Mappings;
+namespace Imprink.Application.Mappings;
 
 public class UserMappingProfile: Profile
 {

src/Imprink.Application/Services/ICurrentUserService.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Application.Users.Services;
+namespace Imprink.Application.Services;
 
 public interface ICurrentUserService
 {

src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Categories.Commands;
+using Imprink.Application.Commands.Categories;
 
-namespace Imprink.Application.Categories.Validation;
+namespace Imprink.Application.Validation.Categories;
 
 public class CreateCategoryCommandValidator : AbstractValidator<CreateCategoryCommand>
 {

src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Categories.Commands;
+using Imprink.Application.Commands.Categories;
 
-namespace Imprink.Application.Categories.Validation;
+namespace Imprink.Application.Validation.Categories;
 
 public class DeleteCategoryCommandValidator : AbstractValidator<DeleteCategoryCommand>
 {

src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Categories.Commands;
+using Imprink.Application.Commands.Categories;
 
-namespace Imprink.Application.Categories.Validation;
+namespace Imprink.Application.Validation.Categories;
 
 public class UpdateCategoryCommandValidator : AbstractValidator<UpdateCategoryCommand>
 {

src/Imprink.Application/Validation/Orders/OrderFilterParametersValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Orders.Validation;
+namespace Imprink.Application.Validation.Orders;
 
 public class OrderFilterParametersValidator : AbstractValidator<OrderFilterParameters>
 {

src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.Commands.ProductVariants;
 
-namespace Imprink.Application.ProductVariants.Validation;
+namespace Imprink.Application.Validation.ProductVariants;
 
 public class CreateProductVariantCommandValidator : AbstractValidator<CreateProductVariantCommand>
 {

src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.Commands.ProductVariants;
 
-namespace Imprink.Application.ProductVariants.Validation;
+namespace Imprink.Application.Validation.ProductVariants;
 
 public class DeleteProductVariantCommandValidator : AbstractValidator<DeleteProductVariantCommand>
 {

src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.Commands.ProductVariants;
 
-namespace Imprink.Application.ProductVariants.Validation;
+namespace Imprink.Application.Validation.ProductVariants;
 
 public class GetProductVariantsQueryValidator : AbstractValidator<GetProductVariantsQuery>
 {

src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.Commands.ProductVariants;
 
-namespace Imprink.Application.ProductVariants.Validation;
+namespace Imprink.Application.Validation.ProductVariants;
 
 public class UpdateProductVariantCommandValidator : AbstractValidator<UpdateProductVariantCommand>
 {

src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Commands.Products;
 
-namespace Imprink.Application.Products.Validation;
+namespace Imprink.Application.Validation.Products;
 
 public class CreateProductCommandValidator : AbstractValidator<CreateProductCommand>
 {

src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Commands.Products;
 
-namespace Imprink.Application.Products.Validation;
+namespace Imprink.Application.Validation.Products;
 
 public class DeleteProductCommandValidator : AbstractValidator<DeleteProductCommand>
 {

src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Commands.Products;
 
-namespace Imprink.Application.Products.Validation;
+namespace Imprink.Application.Validation.Products;
 
 public class GetProductsQueryValidator : AbstractValidator<GetProductsQuery>
 {

src/Imprink.Application/Validation/Products/ProductFilterParametersValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Products.Validation;
+namespace Imprink.Application.Validation.Products;
 
 public class ProductFilterParametersValidator : AbstractValidator<ProductFilterParameters>
 {

src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Commands.Products;
 
-namespace Imprink.Application.Products.Validation;
+namespace Imprink.Application.Validation.Products;
 
 public class UpdateProductCommandValidator : AbstractValidator<UpdateProductCommand>
 {

src/Imprink.Application/Validation/Users/Auth0UserValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
 using Imprink.Domain.Models;
 
-namespace Imprink.Application.Users.Validation;
+namespace Imprink.Application.Validation.Users;
 
 public class Auth0UserValidator : AbstractValidator<Auth0User>
 {

src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Users.Commands;
+using Imprink.Application.Commands.Users;
 
-namespace Imprink.Application.Users.Validation;
+namespace Imprink.Application.Validation.Users;
 
 public class SetUserFullNameCommandValidator : AbstractValidator<SetUserFullNameCommand>
 {

src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
-using Imprink.Application.Users.Commands;
+using Imprink.Application.Commands.Users;
 
-namespace Imprink.Application.Users.Validation;
+namespace Imprink.Application.Validation.Users;
 
 public class SetUserPhoneCommandValidator : AbstractValidator<SetUserPhoneCommand>
 {

src/Imprink.Domain/Entities/Address.cs

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

src/Imprink.Domain/Entities/Category.cs

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

src/Imprink.Domain/Entities/Order.cs

@@ -1,6 +1,4 @@
-using Imprink.Domain.Entities.Users;
+namespace Imprink.Domain.Entities;
-
-namespace Imprink.Domain.Entities.Orders;
 
 public class Order : EntityBase
 {

src/Imprink.Domain/Entities/OrderAddress.cs

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

src/Imprink.Domain/Entities/OrderItem.cs

@@ -1,6 +1,4 @@
-using Imprink.Domain.Entities.Products;
+namespace Imprink.Domain.Entities;
-
-namespace Imprink.Domain.Entities.Orders;
 
 public class OrderItem : EntityBase
 {

src/Imprink.Domain/Entities/OrderStatus.cs

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

src/Imprink.Domain/Entities/Product.cs

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

src/Imprink.Domain/Entities/ProductVariant.cs

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

src/Imprink.Domain/Entities/Role.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Domain.Entities.Users;
+namespace Imprink.Domain.Entities;
 
 public class Role
 {

src/Imprink.Domain/Entities/ShippingStatus.cs

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

src/Imprink.Domain/Entities/User.cs

@@ -1,6 +1,4 @@
-using Imprink.Domain.Entities.Orders;
+namespace Imprink.Domain.Entities;
-
-namespace Imprink.Domain.Entities.Users;
 
 public class User
 {

src/Imprink.Domain/Entities/UserRole.cs

@@ -1,4 +1,4 @@
-namespace Imprink.Domain.Entities.Users;
+namespace Imprink.Domain.Entities;
 
 public class UserRole
 {

src/Imprink.Domain/Models/BaseFilterParameters.cs

@@ -0,0 +1,6 @@
+namespace Imprink.Domain.Models;
+
+public class BaseFilterParameters
+{
+    //  ToDo
+}

src/Imprink.Domain/Repositories/ICategoryRepository.cs

@@ -1,6 +1,6 @@
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 
-namespace Imprink.Domain.Repositories.Products;
+namespace Imprink.Domain.Repositories;
 
 public interface ICategoryRepository
 {

src/Imprink.Domain/Repositories/IOrderItemRepository.cs

@@ -1,6 +1,6 @@
-using Imprink.Domain.Entities.Orders;
+using Imprink.Domain.Entities;
 
-namespace Imprink.Domain.Repositories.Orders;
+namespace Imprink.Domain.Repositories;
 
 public interface IOrderItemRepository
 {

src/Imprink.Domain/Repositories/IOrderRepository.cs

@@ -1,7 +1,7 @@
-using Imprink.Domain.Entities.Orders;
+using Imprink.Domain.Entities;
 using Imprink.Domain.Models;
 
-namespace Imprink.Domain.Repositories.Orders;
+namespace Imprink.Domain.Repositories;
 
 public interface IOrderRepository
 {

src/Imprink.Domain/Repositories/IProductRepository.cs

@@ -1,7 +1,7 @@
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 using Imprink.Domain.Models;
 
-namespace Imprink.Domain.Repositories.Products;
+namespace Imprink.Domain.Repositories;
 
 public interface IProductRepository
 {

src/Imprink.Domain/Repositories/IProductVariantRepository.cs

@@ -1,6 +1,6 @@
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 
-namespace Imprink.Domain.Repositories.Products;
+namespace Imprink.Domain.Repositories;
 
 public interface IProductVariantRepository
 {

src/Imprink.Domain/Repositories/IRoleRepository.cs

@@ -1,6 +1,6 @@
-using Imprink.Domain.Entities.Users;
+using Imprink.Domain.Entities;
 
-namespace Imprink.Domain.Repositories.Users;
+namespace Imprink.Domain.Repositories;
 
 public interface IRoleRepository
 {

src/Imprink.Domain/Repositories/IUserRepository.cs

@@ -1,7 +1,7 @@
-using Imprink.Domain.Entities.Users;
+using Imprink.Domain.Entities;
 using Imprink.Domain.Models;
 
-namespace Imprink.Domain.Repositories.Users;
+namespace Imprink.Domain.Repositories;
 
 public interface IUserRepository
 {

src/Imprink.Domain/Repositories/IUserRoleRepository.cs

@@ -1,6 +1,6 @@
-using Imprink.Domain.Entities.Users;
+using Imprink.Domain.Entities;
 
-namespace Imprink.Domain.Repositories.Users;
+namespace Imprink.Domain.Repositories;
 
 public interface IUserRoleRepository
 {

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;
-using Imprink.Domain.Entities.Products;
+using Imprink.Infrastructure.Configuration;
-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 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.Entities;
-using Imprink.Domain.Repositories.Products;
+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.Entities;
-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 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.Entities;
-using Imprink.Domain.Repositories.Products;
+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.Entities;
-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 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.Entities;
-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 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;

src/Imprink.WebApi/Controllers/CategoriesController.cs

@@ -1,6 +1,5 @@
-using Imprink.Application.Categories.Commands;
+using Imprink.Application.Commands.Categories;
-using Imprink.Application.Categories.Dtos;
+using Imprink.Application.Dtos;
-using Imprink.Application.Products.Dtos;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Imprink.WebApi/Controllers/ProductVariantsController.cs

@@ -1,6 +1,5 @@
-using Imprink.Application.Products.Dtos;
+using Imprink.Application.Commands.ProductVariants;
-using Imprink.Application.ProductVariants.Commands;
+using Imprink.Application.Dtos;
-using Imprink.Application.ProductVariants.Dtos;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

src/Imprink.WebApi/Controllers/ProductsController.cs

@@ -1,6 +1,5 @@
-using Imprink.Application.Products;
+using Imprink.Application.Commands.Products;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Dtos;
-using Imprink.Application.Products.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
@@ -16,9 +15,9 @@ public class ProductsController(IMediator mediator) : ControllerBase
     [HttpGet]
     [AllowAnonymous]
     public async Task<ActionResult<PagedResultDto<ProductDto>>> GetProducts(
-        [FromQuery] ProductFilterParameters filterParameters)
+        [FromQuery] ProductFilterParameters filterParameters, CancellationToken cancellationToken)
     {
-        var result = await mediator.Send(new GetProductsQuery { FilterParameters = filterParameters});
+        var result = await mediator.Send(new GetProductsQuery { FilterParameters = filterParameters}, cancellationToken);
         return Ok(result);
     }
     

src/Imprink.WebApi/Controllers/UsersController.cs

@@ -1,13 +1,13 @@
 using System.Security.Claims;
 using AutoMapper;
-using Imprink.Application.Users.Commands;
+using Imprink.Application.Commands.Users;
-using Imprink.Application.Users.Dtos;
+using Imprink.Application.Dtos;
 using Imprink.Domain.Models;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
-namespace Imprink.WebApi.Controllers.Users;
+namespace Imprink.WebApi.Controllers;
 
 [ApiController]
 [Route("/api/users")]

src/Imprink.WebApi/Imprink.WebApi.csproj

@@ -32,4 +32,8 @@
       </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Extensions\" />
+    </ItemGroup>
+
 </Project>

src/Imprink.WebApi/Program.cs

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

src/Imprink.WebApi/Seeder.cs

@@ -1,4 +1,4 @@
-using Imprink.Domain.Entities.Products;
+using Imprink.Domain.Entities;
 using Imprink.Infrastructure.Database;
 using Microsoft.EntityFrameworkCore;
 

src/Imprink.WebApi/Startup.cs

@@ -1,22 +1,14 @@
 using System.Security.Claims;
 using FluentValidation;
 using Imprink.Application;
-using Imprink.Application.Products;
+using Imprink.Application.Commands.Products;
-using Imprink.Application.Products.Commands;
+using Imprink.Application.Services;
-using Imprink.Application.Users.Services;
+using Imprink.Application.Validation.Users;
-using Imprink.Application.Users.Validation;
 using Imprink.Domain.Repositories;
-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.Orders.Repositories;
+using Imprink.Infrastructure.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;