From 716c5c94e88ca1e5c285afe76ac7101fa8b45e43 Mon Sep 17 00:00:00 2001 From: lumijiez <59575049+lumijiez@users.noreply.github.com> Date: Fri, 20 Jun 2025 14:56:29 +0300 Subject: [PATCH] Fix all namespaces --- .../Categories/Commands/CreateCategoryHandler.cs | 5 +++-- .../Categories/Commands/DeleteCategoryHandler.cs | 2 +- .../Categories/Commands/GetCategoriesHandler.cs | 5 +++-- .../Categories/Commands/UpdateCategoryHandler.cs | 3 ++- src/Imprink.Application/Categories/Dtos/CategoryDto.cs | 2 +- .../Validation/CreateCategoryCommandValidator.cs | 4 ++-- .../Validation/DeleteCategoryCommandValidator.cs | 4 ++-- .../Validation/UpdateCategoryCommandValidator.cs | 4 ++-- src/Imprink.Application/MappingProfile.cs | 2 +- .../Validation/OrderFilterParametersValidator.cs | 2 +- .../Commands/CreateProductVariantHandler.cs | 6 +++--- .../Commands/DeleteProductVariantHandler.cs | 2 +- .../Commands/GetProductVariantsHandler.cs | 6 +++--- .../Commands/UpdateProductVariantHandler.cs | 4 ++-- .../ProductVariants/Dtos/ProductVariantDto.cs | 4 +++- .../Validation/CreateProducVariantCommandValidator.cs | 4 ++-- .../Validation/DeleteProductVariantCommandValidator.cs | 4 ++-- .../Validation/GetProductVariantsQueryValidator.cs | 4 ++-- .../Validation/UpdateProductVariantCommandValidator.cs | 4 ++-- .../Products/Commands/CreateProductHandler.cs | 4 ++-- .../Products/Commands/DeleteProductHandler.cs | 2 +- .../Products/Commands/GetProductsHandler.cs | 3 ++- .../Products/Commands/UpdateProductCommand.cs | 3 ++- src/Imprink.Application/Products/Dtos/ProductDto.cs | 2 ++ .../Products/Mappings/ProductMappingProfile.cs | 10 ++++++---- .../Validation/CreateProductCommandValidator.cs | 4 ++-- .../Validation/DeleteProductCommandValidator.cs | 4 ++-- .../Products/Validation/GetProductsQueryValidator.cs | 5 ++--- .../Validation/ProductFilterParametersValidator.cs | 2 +- .../Validation/UpdateProductCommandValidator.cs | 4 ++-- .../Users/Commands/DeleteUserRoleHandler.cs | 2 +- .../Users/Commands/GetAllRolesHandler.cs | 2 +- .../Users/Commands/GetUserRolesHandler.cs | 2 +- .../Users/Commands/SetUserFullNameHandler.cs | 4 ++-- .../Users/Commands/SetUserPhoneHandler.cs | 4 ++-- .../Users/Commands/SetUserRoleHandler.cs | 2 +- .../Users/Commands/SyncUserHandler.cs | 2 +- .../Users/Mappings/UserMappingProfile.cs | 2 +- .../Users/Services/ICurrentUserService.cs | 2 +- .../Users/Validation/Auth0UserValidator.cs | 2 +- .../Validation/SetUserFullNameCommandValidator.cs | 4 ++-- .../Users/Validation/SetUserPhoneCommandValidator.cs | 4 ++-- src/Imprink.Domain/Entities/Orders/OrderItem.cs | 4 ++-- src/Imprink.Domain/Entities/Products/Category.cs | 2 +- src/Imprink.Domain/Entities/Products/Product.cs | 2 +- src/Imprink.Domain/Entities/Products/ProductVariant.cs | 4 ++-- .../Repositories/Products/ICategoryRepository.cs | 2 +- .../Repositories/Products/IProductRepository.cs | 2 +- .../Repositories/Products/IProductVariantRepository.cs | 2 +- .../Repositories/Users/IRoleRepository.cs | 2 +- .../Configuration/Products/CategoryConfiguration.cs | 2 +- .../Configuration/Products/ProductConfiguration.cs | 2 +- .../Products/ProductVariantConfiguration.cs | 2 +- .../Database/ApplicationDbContext.cs | 2 +- .../Repositories/Products/CategoryRepository.cs | 2 +- .../Repositories/Products/ProductRepository.cs | 2 +- .../Repositories/Products/ProductVariantRepository.cs | 2 +- .../Repositories/Users/RoleRepository.cs | 1 + .../Services/CurrentUserService.cs | 2 +- .../Controllers/Products/CategoriesController.cs | 3 ++- .../Controllers/Products/ProductVariantsController.cs | 3 ++- .../Controllers/Products/ProductsController.cs | 2 +- .../Controllers/Users/UsersController.cs | 2 +- src/Imprink.WebApi/Seeder.cs | 2 +- src/Imprink.WebApi/Startup.cs | 7 +++---- 65 files changed, 107 insertions(+), 95 deletions(-) diff --git a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs index 2b67a75..dfc5a1b 100644 --- a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs +++ b/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs @@ -1,8 +1,9 @@ +using Imprink.Application.Categories.Dtos; using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using MediatR; -namespace Imprink.Application.Domains.Categories; +namespace Imprink.Application.Categories.Commands; public class CreateCategoryCommand : IRequest { diff --git a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs index b3d5850..7220027 100644 --- a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs +++ b/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Imprink.Application.Domains.Categories; +namespace Imprink.Application.Categories.Commands; public class DeleteCategoryCommand : IRequest { diff --git a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs index a0b13f1..5c4b3e3 100644 --- a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs +++ b/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs @@ -1,8 +1,9 @@ +using Imprink.Application.Categories.Dtos; using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using MediatR; -namespace Imprink.Application.Domains.Categories; +namespace Imprink.Application.Categories.Commands; public class GetCategoriesQuery : IRequest> { diff --git a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs index a10eb1f..c236880 100644 --- a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs +++ b/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs @@ -1,8 +1,9 @@ +using Imprink.Application.Categories.Dtos; using Imprink.Application.Exceptions; using Imprink.Application.Products.Dtos; using MediatR; -namespace Imprink.Application.Domains.Categories; +namespace Imprink.Application.Categories.Commands; public class UpdateCategoryCommand : IRequest { diff --git a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs index fbc701b..64b9e19 100644 --- a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs +++ b/src/Imprink.Application/Categories/Dtos/CategoryDto.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Products.Dtos; +namespace Imprink.Application.Categories.Dtos; public class CategoryDto { diff --git a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs index 6f20535..88e9f22 100644 --- a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs +++ b/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Categories; +using Imprink.Application.Categories.Commands; -namespace Imprink.Application.Validation.Categories; +namespace Imprink.Application.Categories.Validation; public class CreateCategoryCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs index d1f9cb3..89c8c7e 100644 --- a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs +++ b/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Categories; +using Imprink.Application.Categories.Commands; -namespace Imprink.Application.Validation.Categories; +namespace Imprink.Application.Categories.Validation; public class DeleteCategoryCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs index 7e493bf..dfb0af8 100644 --- a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs +++ b/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Categories; +using Imprink.Application.Categories.Commands; -namespace Imprink.Application.Validation.Categories; +namespace Imprink.Application.Categories.Validation; public class UpdateCategoryCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/MappingProfile.cs b/src/Imprink.Application/MappingProfile.cs index 572be15..9391d58 100644 --- a/src/Imprink.Application/MappingProfile.cs +++ b/src/Imprink.Application/MappingProfile.cs @@ -1,5 +1,5 @@ using AutoMapper; -namespace Imprink.Application.Mappings; +namespace Imprink.Application; public abstract class MappingProfile : Profile { } \ No newline at end of file diff --git a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs index 0efcdad..243f5e8 100644 --- a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs +++ b/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; using Imprink.Domain.Models; -namespace Imprink.Application.Validation.Models; +namespace Imprink.Application.Orders.Validation; public class OrderFilterParametersValidator : AbstractValidator { diff --git a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs index d1ab5fd..fbb3f1a 100644 --- a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs +++ b/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs @@ -1,9 +1,9 @@ using AutoMapper; -using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Application.ProductVariants.Dtos; +using Imprink.Domain.Entities.Products; using MediatR; -namespace Imprink.Application.Domains.ProductVariants; +namespace Imprink.Application.ProductVariants.Commands; public class CreateProductVariantCommand : IRequest { diff --git a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs index 7fdf8a9..3c6609f 100644 --- a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs +++ b/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Imprink.Application.Domains.ProductVariants; +namespace Imprink.Application.ProductVariants.Commands; public class DeleteProductVariantCommand : IRequest { diff --git a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs index c572305..92deb03 100644 --- a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs +++ b/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs @@ -1,10 +1,10 @@ using AutoMapper; -using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Application.ProductVariants.Dtos; +using Imprink.Domain.Entities.Products; using MediatR; using Microsoft.Extensions.Logging; -namespace Imprink.Application.Domains.ProductVariants; +namespace Imprink.Application.ProductVariants.Commands; public class GetProductVariantsQuery : IRequest> { diff --git a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs index 07a7724..53eefc2 100644 --- a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs +++ b/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs @@ -1,9 +1,9 @@ using AutoMapper; using Imprink.Application.Exceptions; -using Imprink.Application.Products.Dtos; +using Imprink.Application.ProductVariants.Dtos; using MediatR; -namespace Imprink.Application.Domains.ProductVariants; +namespace Imprink.Application.ProductVariants.Commands; public class UpdateProductVariantCommand : IRequest { diff --git a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs index 881c54d..0afec2c 100644 --- a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs +++ b/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs @@ -1,4 +1,6 @@ -namespace Imprink.Application.Products.Dtos; +using Imprink.Application.Products.Dtos; + +namespace Imprink.Application.ProductVariants.Dtos; public class ProductVariantDto { diff --git a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs index c3d3957..8897c47 100644 --- a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs +++ b/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.ProductVariants; +using Imprink.Application.ProductVariants.Commands; -namespace Imprink.Application.Validation.ProductVariants; +namespace Imprink.Application.ProductVariants.Validation; public class CreateProductVariantCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs index acda88f..419aa93 100644 --- a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs +++ b/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.ProductVariants; +using Imprink.Application.ProductVariants.Commands; -namespace Imprink.Application.Validation.ProductVariants; +namespace Imprink.Application.ProductVariants.Validation; public class DeleteProductVariantCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs index 2ad4d09..9aa11b1 100644 --- a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs +++ b/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.ProductVariants; +using Imprink.Application.ProductVariants.Commands; -namespace Imprink.Application.Validation.ProductVariants; +namespace Imprink.Application.ProductVariants.Validation; public class GetProductVariantsQueryValidator : AbstractValidator { diff --git a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs index dd9fe23..d01b1b2 100644 --- a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs +++ b/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.ProductVariants; +using Imprink.Application.ProductVariants.Commands; -namespace Imprink.Application.Validation.ProductVariants; +namespace Imprink.Application.ProductVariants.Validation; public class UpdateProductVariantCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs index 2e84304..a36e606 100644 --- a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs +++ b/src/Imprink.Application/Products/Commands/CreateProductHandler.cs @@ -1,9 +1,9 @@ using AutoMapper; using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using MediatR; -namespace Imprink.Application.Domains.Products; +namespace Imprink.Application.Products.Commands; public class CreateProductCommand : IRequest { diff --git a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs index c81d3d8..2983496 100644 --- a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs +++ b/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Imprink.Application.Domains.Products; +namespace Imprink.Application.Products.Commands; public class DeleteProductCommand : IRequest { diff --git a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs index 615553d..ea83640 100644 --- a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs +++ b/src/Imprink.Application/Products/Commands/GetProductsHandler.cs @@ -1,8 +1,9 @@ +using Imprink.Application.Categories.Dtos; using Imprink.Application.Products.Dtos; using Imprink.Domain.Models; using MediatR; -namespace Imprink.Application.Domains.Products; +namespace Imprink.Application.Products.Commands; public class GetProductsQuery : IRequest> { diff --git a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs index 3aadffa..f6c3e8c 100644 --- a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs +++ b/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs @@ -1,8 +1,9 @@ +using Imprink.Application.Categories.Dtos; using Imprink.Application.Exceptions; using Imprink.Application.Products.Dtos; using MediatR; -namespace Imprink.Application.Domains.Products; +namespace Imprink.Application.Products.Commands; public class UpdateProductCommand : IRequest { diff --git a/src/Imprink.Application/Products/Dtos/ProductDto.cs b/src/Imprink.Application/Products/Dtos/ProductDto.cs index abb8403..cc71be2 100644 --- a/src/Imprink.Application/Products/Dtos/ProductDto.cs +++ b/src/Imprink.Application/Products/Dtos/ProductDto.cs @@ -1,3 +1,5 @@ +using Imprink.Application.Categories.Dtos; + namespace Imprink.Application.Products.Dtos; public class ProductDto diff --git a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs index e58e2cc..97d1fd7 100644 --- a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs +++ b/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs @@ -1,10 +1,12 @@ using AutoMapper; -using Imprink.Application.Domains.Products; -using Imprink.Application.Domains.ProductVariants; +using Imprink.Application.Categories.Dtos; +using Imprink.Application.Products.Commands; using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Product; +using Imprink.Application.ProductVariants.Commands; +using Imprink.Application.ProductVariants.Dtos; +using Imprink.Domain.Entities.Products; -namespace Imprink.Application.Mappings; +namespace Imprink.Application.Products.Mappings; public class ProductMappingProfile: Profile { diff --git a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs index 60da2bd..d79875a 100644 --- a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs +++ b/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Products; +using Imprink.Application.Products.Commands; -namespace Imprink.Application.Validation.Products; +namespace Imprink.Application.Products.Validation; public class CreateProductCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs index 5cb3cea..53903ab 100644 --- a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs +++ b/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Products; +using Imprink.Application.Products.Commands; -namespace Imprink.Application.Validation.Products; +namespace Imprink.Application.Products.Validation; public class DeleteProductCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs index 9026474..1194b72 100644 --- a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs +++ b/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs @@ -1,8 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Products; -using Imprink.Application.Validation.Models; +using Imprink.Application.Products.Commands; -namespace Imprink.Application.Validation.Products; +namespace Imprink.Application.Products.Validation; public class GetProductsQueryValidator : AbstractValidator { diff --git a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs index 08131c9..55cd4d0 100644 --- a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs +++ b/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; using Imprink.Domain.Models; -namespace Imprink.Application.Validation.Models; +namespace Imprink.Application.Products.Validation; public class ProductFilterParametersValidator : AbstractValidator { diff --git a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs index afc7cbf..3c49ebe 100644 --- a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs +++ b/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Products; +using Imprink.Application.Products.Commands; -namespace Imprink.Application.Validation.Products; +namespace Imprink.Application.Products.Validation; public class UpdateProductCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs index 7755d01..6d1888a 100644 --- a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs +++ b/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs @@ -3,7 +3,7 @@ using Imprink.Application.Exceptions; using Imprink.Application.Users.Dtos; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record DeleteUserRoleCommand(string Sub, Guid RoleId) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs index 12d3df2..4d9ab5e 100644 --- a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs +++ b/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs @@ -2,7 +2,7 @@ using AutoMapper; using Imprink.Application.Users.Dtos; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record GetAllRolesCommand : IRequest>; diff --git a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs index 902900f..9c39568 100644 --- a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs +++ b/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs @@ -3,7 +3,7 @@ using Imprink.Application.Exceptions; using Imprink.Application.Users.Dtos; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record GetUserRolesCommand(string Sub) : IRequest>; diff --git a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs index 7fa91ce..d7865d8 100644 --- a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs +++ b/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs @@ -1,10 +1,10 @@ using AutoMapper; using Imprink.Application.Exceptions; -using Imprink.Application.Services; using Imprink.Application.Users.Dtos; +using Imprink.Application.Users.Services; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record SetUserFullNameCommand(string FirstName, string LastName) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs index 369c15d..d1e3ca7 100644 --- a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs +++ b/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs @@ -1,10 +1,10 @@ using AutoMapper; using Imprink.Application.Exceptions; -using Imprink.Application.Services; using Imprink.Application.Users.Dtos; +using Imprink.Application.Users.Services; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record SetUserPhoneCommand(string PhoneNumber) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs index d681363..bb9d892 100644 --- a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs +++ b/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs @@ -4,7 +4,7 @@ using Imprink.Application.Users.Dtos; using Imprink.Domain.Entities.Users; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record SetUserRoleCommand(string Sub, Guid RoleId) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs index ae2cac8..99bdc9f 100644 --- a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs +++ b/src/Imprink.Application/Users/Commands/SyncUserHandler.cs @@ -3,7 +3,7 @@ using Imprink.Application.Users.Dtos; using Imprink.Domain.Models; using MediatR; -namespace Imprink.Application.Domains.Users; +namespace Imprink.Application.Users.Commands; public record SyncUserCommand(Auth0User User) : IRequest; diff --git a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs index 8eda701..16a8a43 100644 --- a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs +++ b/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs @@ -4,7 +4,7 @@ using Imprink.Application.Users.Dtos; using Imprink.Domain.Entities.Users; using Imprink.Domain.Models; -namespace Imprink.Application.Mappings; +namespace Imprink.Application.Users.Mappings; public class UserMappingProfile: Profile { diff --git a/src/Imprink.Application/Users/Services/ICurrentUserService.cs b/src/Imprink.Application/Users/Services/ICurrentUserService.cs index 83bbe41..86b15a4 100644 --- a/src/Imprink.Application/Users/Services/ICurrentUserService.cs +++ b/src/Imprink.Application/Users/Services/ICurrentUserService.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Services; +namespace Imprink.Application.Users.Services; public interface ICurrentUserService { diff --git a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs index 4df6070..309558b 100644 --- a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs +++ b/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; using Imprink.Domain.Models; -namespace Imprink.Application.Validation.Models; +namespace Imprink.Application.Users.Validation; public class Auth0UserValidator : AbstractValidator { diff --git a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs index b97eed6..cadda16 100644 --- a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs +++ b/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Users; +using Imprink.Application.Users.Commands; -namespace Imprink.Application.Validation.Users; +namespace Imprink.Application.Users.Validation; public class SetUserFullNameCommandValidator : AbstractValidator { diff --git a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs index 54a73a8..b0c0508 100644 --- a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs +++ b/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Imprink.Application.Domains.Users; +using Imprink.Application.Users.Commands; -namespace Imprink.Application.Validation.Users; +namespace Imprink.Application.Users.Validation; public class SetUserPhoneCommandValidator : AbstractValidator { diff --git a/src/Imprink.Domain/Entities/Orders/OrderItem.cs b/src/Imprink.Domain/Entities/Orders/OrderItem.cs index 4013d51..7f63ce2 100644 --- a/src/Imprink.Domain/Entities/Orders/OrderItem.cs +++ b/src/Imprink.Domain/Entities/Orders/OrderItem.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; namespace Imprink.Domain.Entities.Orders; @@ -14,6 +14,6 @@ public class OrderItem : EntityBase public string CustomizationDescription { get; set; } = null!; public Order Order { get; set; } = null!; - public Product.Product Product { get; set; } = null!; + public Product Product { get; set; } = null!; public ProductVariant ProductVariant { get; set; } = null!; } \ No newline at end of file diff --git a/src/Imprink.Domain/Entities/Products/Category.cs b/src/Imprink.Domain/Entities/Products/Category.cs index 3bbf53c..19d4299 100644 --- a/src/Imprink.Domain/Entities/Products/Category.cs +++ b/src/Imprink.Domain/Entities/Products/Category.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Product; +namespace Imprink.Domain.Entities.Products; public class Category : EntityBase { diff --git a/src/Imprink.Domain/Entities/Products/Product.cs b/src/Imprink.Domain/Entities/Products/Product.cs index d728d5b..e551681 100644 --- a/src/Imprink.Domain/Entities/Products/Product.cs +++ b/src/Imprink.Domain/Entities/Products/Product.cs @@ -1,6 +1,6 @@ using Imprink.Domain.Entities.Orders; -namespace Imprink.Domain.Entities.Product; +namespace Imprink.Domain.Entities.Products; public class Product : EntityBase { diff --git a/src/Imprink.Domain/Entities/Products/ProductVariant.cs b/src/Imprink.Domain/Entities/Products/ProductVariant.cs index 5dd781e..a802569 100644 --- a/src/Imprink.Domain/Entities/Products/ProductVariant.cs +++ b/src/Imprink.Domain/Entities/Products/ProductVariant.cs @@ -1,6 +1,6 @@ using Imprink.Domain.Entities.Orders; -namespace Imprink.Domain.Entities.Product; +namespace Imprink.Domain.Entities.Products; public class ProductVariant : EntityBase { @@ -13,6 +13,6 @@ public class ProductVariant : EntityBase public int StockQuantity { get; set; } public bool IsActive { get; set; } - public virtual required Imprink.Domain.Entities.Product.Product Product { get; set; } + public virtual required Product Product { get; set; } public virtual ICollection OrderItems { get; set; } = new List(); } \ No newline at end of file diff --git a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs b/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs index 3308a6e..ba41959 100644 --- a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs +++ b/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; namespace Imprink.Domain.Repositories.Products; diff --git a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs b/src/Imprink.Domain/Repositories/Products/IProductRepository.cs index 9fd577e..a4dd90a 100644 --- a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs +++ b/src/Imprink.Domain/Repositories/Products/IProductRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Domain.Models; namespace Imprink.Domain.Repositories.Products; diff --git a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs b/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs index ae8af5e..8f01e7e 100644 --- a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs +++ b/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; namespace Imprink.Domain.Repositories.Products; diff --git a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs b/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs index f92043c..f2dfee2 100644 --- a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs +++ b/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs @@ -1,6 +1,6 @@ using Imprink.Domain.Entities.Users; -namespace Imprink.Domain.Repositories; +namespace Imprink.Domain.Repositories.Users; public interface IRoleRepository { diff --git a/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs index 0867cb7..b019efa 100644 --- a/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs +++ b/src/Imprink.Infrastructure/Configuration/Products/CategoryConfiguration.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; diff --git a/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs index ed3054e..49bb909 100644 --- a/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs +++ b/src/Imprink.Infrastructure/Configuration/Products/ProductConfiguration.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; diff --git a/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs b/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs index 7593b6b..42dd79a 100644 --- a/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs +++ b/src/Imprink.Infrastructure/Configuration/Products/ProductVariantConfiguration.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; diff --git a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs b/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs index 4fe7a92..96eaeed 100644 --- a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs +++ b/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs @@ -1,5 +1,5 @@ using Imprink.Domain.Entities.Orders; -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Domain.Entities.Users; using Imprink.Infrastructure.Configuration.Orders; using Imprink.Infrastructure.Configuration.Products; diff --git a/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs index b5d9873..89afab7 100644 --- a/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs +++ b/src/Imprink.Infrastructure/Repositories/Products/CategoryRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Domain.Repositories.Products; using Imprink.Infrastructure.Database; using Microsoft.EntityFrameworkCore; diff --git a/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs index 95af010..7c8acdd 100644 --- a/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs +++ b/src/Imprink.Infrastructure/Repositories/Products/ProductRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Domain.Models; using Imprink.Domain.Repositories.Products; using Imprink.Infrastructure.Database; diff --git a/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs b/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs index 1c892bf..e97babf 100644 --- a/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs +++ b/src/Imprink.Infrastructure/Repositories/Products/ProductVariantRepository.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Domain.Repositories.Products; using Imprink.Infrastructure.Database; using Microsoft.EntityFrameworkCore; diff --git a/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs b/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs index bf64712..23ce386 100644 --- a/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs +++ b/src/Imprink.Infrastructure/Repositories/Users/RoleRepository.cs @@ -1,5 +1,6 @@ using Imprink.Domain.Entities.Users; using Imprink.Domain.Repositories; +using Imprink.Domain.Repositories.Users; using Imprink.Infrastructure.Database; using Microsoft.EntityFrameworkCore; diff --git a/src/Imprink.Infrastructure/Services/CurrentUserService.cs b/src/Imprink.Infrastructure/Services/CurrentUserService.cs index 89ffbe9..52102cc 100644 --- a/src/Imprink.Infrastructure/Services/CurrentUserService.cs +++ b/src/Imprink.Infrastructure/Services/CurrentUserService.cs @@ -1,5 +1,5 @@ using System.Security.Claims; -using Imprink.Application.Services; +using Imprink.Application.Users.Services; using Microsoft.AspNetCore.Http; namespace Imprink.Infrastructure.Services; diff --git a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs b/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs index ba087ae..04d9b32 100644 --- a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs +++ b/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs @@ -1,4 +1,5 @@ -using Imprink.Application.Domains.Categories; +using Imprink.Application.Categories.Commands; +using Imprink.Application.Categories.Dtos; using Imprink.Application.Products.Dtos; using MediatR; using Microsoft.AspNetCore.Authorization; diff --git a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs b/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs index 745de3e..7b065a2 100644 --- a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs +++ b/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs @@ -1,5 +1,6 @@ -using Imprink.Application.Domains.ProductVariants; using Imprink.Application.Products.Dtos; +using Imprink.Application.ProductVariants.Commands; +using Imprink.Application.ProductVariants.Dtos; using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/src/Imprink.WebApi/Controllers/Products/ProductsController.cs b/src/Imprink.WebApi/Controllers/Products/ProductsController.cs index e1f7fc5..be28cd5 100644 --- a/src/Imprink.WebApi/Controllers/Products/ProductsController.cs +++ b/src/Imprink.WebApi/Controllers/Products/ProductsController.cs @@ -1,5 +1,5 @@ -using Imprink.Application.Domains.Products; using Imprink.Application.Products; +using Imprink.Application.Products.Commands; using Imprink.Application.Products.Dtos; using Imprink.Domain.Models; using MediatR; diff --git a/src/Imprink.WebApi/Controllers/Users/UsersController.cs b/src/Imprink.WebApi/Controllers/Users/UsersController.cs index 6819114..42b43de 100644 --- a/src/Imprink.WebApi/Controllers/Users/UsersController.cs +++ b/src/Imprink.WebApi/Controllers/Users/UsersController.cs @@ -1,6 +1,6 @@ using System.Security.Claims; using AutoMapper; -using Imprink.Application.Domains.Users; +using Imprink.Application.Users.Commands; using Imprink.Application.Users.Dtos; using Imprink.Domain.Models; using MediatR; diff --git a/src/Imprink.WebApi/Seeder.cs b/src/Imprink.WebApi/Seeder.cs index 14f4016..fa66f6f 100644 --- a/src/Imprink.WebApi/Seeder.cs +++ b/src/Imprink.WebApi/Seeder.cs @@ -1,4 +1,4 @@ -using Imprink.Domain.Entities.Product; +using Imprink.Domain.Entities.Products; using Imprink.Infrastructure.Database; using Microsoft.EntityFrameworkCore; diff --git a/src/Imprink.WebApi/Startup.cs b/src/Imprink.WebApi/Startup.cs index eb5ead3..40b612b 100644 --- a/src/Imprink.WebApi/Startup.cs +++ b/src/Imprink.WebApi/Startup.cs @@ -1,11 +1,10 @@ using System.Security.Claims; using FluentValidation; using Imprink.Application; -using Imprink.Application.Domains.Products; -using Imprink.Application.Mappings; using Imprink.Application.Products; -using Imprink.Application.Services; -using Imprink.Application.Validation.Models; +using Imprink.Application.Products.Commands; +using Imprink.Application.Users.Services; +using Imprink.Application.Users.Validation; using Imprink.Domain.Repositories; using Imprink.Domain.Repositories.Orders; using Imprink.Domain.Repositories.Products;