diff --git a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs b/src/Imprink.Application/Commands/Categories/CreateCategoryHandler.cs similarity index 91% rename from src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs rename to src/Imprink.Application/Commands/Categories/CreateCategoryHandler.cs index dfc5a1b..0d088ca 100644 --- a/src/Imprink.Application/Categories/Commands/CreateCategoryHandler.cs +++ b/src/Imprink.Application/Commands/Categories/CreateCategoryHandler.cs @@ -1,9 +1,8 @@ -using Imprink.Application.Categories.Dtos; -using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using MediatR; -namespace Imprink.Application.Categories.Commands; +namespace Imprink.Application.Commands.Categories; public class CreateCategoryCommand : IRequest { diff --git a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs b/src/Imprink.Application/Commands/Categories/DeleteCategoryHandler.cs similarity index 95% rename from src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs rename to src/Imprink.Application/Commands/Categories/DeleteCategoryHandler.cs index 7220027..7101db7 100644 --- a/src/Imprink.Application/Categories/Commands/DeleteCategoryHandler.cs +++ b/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 { diff --git a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs b/src/Imprink.Application/Commands/Categories/GetCategoriesHandler.cs similarity index 88% rename from src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs rename to src/Imprink.Application/Commands/Categories/GetCategoriesHandler.cs index 5c4b3e3..b606dbe 100644 --- a/src/Imprink.Application/Categories/Commands/GetCategoriesHandler.cs +++ b/src/Imprink.Application/Commands/Categories/GetCategoriesHandler.cs @@ -1,9 +1,8 @@ -using Imprink.Application.Categories.Dtos; -using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using MediatR; -namespace Imprink.Application.Categories.Commands; +namespace Imprink.Application.Commands.Categories; public class GetCategoriesQuery : IRequest> { diff --git a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs b/src/Imprink.Application/Commands/Categories/UpdateCategoryHandler.cs similarity index 94% rename from src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs rename to src/Imprink.Application/Commands/Categories/UpdateCategoryHandler.cs index c236880..f9f5f23 100644 --- a/src/Imprink.Application/Categories/Commands/UpdateCategoryHandler.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs b/src/Imprink.Application/Commands/ProductVariants/CreateProductVariantHandler.cs similarity index 90% rename from src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs rename to src/Imprink.Application/Commands/ProductVariants/CreateProductVariantHandler.cs index fbb3f1a..0ab7aa7 100644 --- a/src/Imprink.Application/ProductVariants/Commands/CreateProductVariantHandler.cs +++ b/src/Imprink.Application/Commands/ProductVariants/CreateProductVariantHandler.cs @@ -1,9 +1,9 @@ using AutoMapper; -using Imprink.Application.ProductVariants.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using MediatR; -namespace Imprink.Application.ProductVariants.Commands; +namespace Imprink.Application.Commands.ProductVariants; public class CreateProductVariantCommand : IRequest { diff --git a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs b/src/Imprink.Application/Commands/ProductVariants/DeleteProductVariantHandler.cs similarity index 95% rename from src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs rename to src/Imprink.Application/Commands/ProductVariants/DeleteProductVariantHandler.cs index 3c6609f..8e6a2ea 100644 --- a/src/Imprink.Application/ProductVariants/Commands/DeleteProductVariantHandler.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs b/src/Imprink.Application/Commands/ProductVariants/GetProductVariantsHandler.cs similarity index 91% rename from src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs rename to src/Imprink.Application/Commands/ProductVariants/GetProductVariantsHandler.cs index 92deb03..5e76ae2 100644 --- a/src/Imprink.Application/ProductVariants/Commands/GetProductVariantsHandler.cs +++ b/src/Imprink.Application/Commands/ProductVariants/GetProductVariantsHandler.cs @@ -1,10 +1,10 @@ using AutoMapper; -using Imprink.Application.ProductVariants.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using MediatR; using Microsoft.Extensions.Logging; -namespace Imprink.Application.ProductVariants.Commands; +namespace Imprink.Application.Commands.ProductVariants; public class GetProductVariantsQuery : IRequest> { diff --git a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs b/src/Imprink.Application/Commands/ProductVariants/UpdateProductVariantHandler.cs similarity index 94% rename from src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs rename to src/Imprink.Application/Commands/ProductVariants/UpdateProductVariantHandler.cs index 53eefc2..0c88be3 100644 --- a/src/Imprink.Application/ProductVariants/Commands/UpdateProductVariantHandler.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs b/src/Imprink.Application/Commands/Products/CreateProductHandler.cs similarity index 89% rename from src/Imprink.Application/Products/Commands/CreateProductHandler.cs rename to src/Imprink.Application/Commands/Products/CreateProductHandler.cs index a36e606..af436bb 100644 --- a/src/Imprink.Application/Products/Commands/CreateProductHandler.cs +++ b/src/Imprink.Application/Commands/Products/CreateProductHandler.cs @@ -1,9 +1,9 @@ using AutoMapper; -using Imprink.Application.Products.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using MediatR; -namespace Imprink.Application.Products.Commands; +namespace Imprink.Application.Commands.Products; public class CreateProductCommand : IRequest { @@ -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(createdProduct); diff --git a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs b/src/Imprink.Application/Commands/Products/DeleteProductHandler.cs similarity index 95% rename from src/Imprink.Application/Products/Commands/DeleteProductHandler.cs rename to src/Imprink.Application/Commands/Products/DeleteProductHandler.cs index 2983496..c4b65ce 100644 --- a/src/Imprink.Application/Products/Commands/DeleteProductHandler.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs b/src/Imprink.Application/Commands/Products/GetProductsHandler.cs similarity index 93% rename from src/Imprink.Application/Products/Commands/GetProductsHandler.cs rename to src/Imprink.Application/Commands/Products/GetProductsHandler.cs index ea83640..4e65018 100644 --- a/src/Imprink.Application/Products/Commands/GetProductsHandler.cs +++ b/src/Imprink.Application/Commands/Products/GetProductsHandler.cs @@ -1,9 +1,8 @@ -using Imprink.Application.Categories.Dtos; -using Imprink.Application.Products.Dtos; +using Imprink.Application.Dtos; using Imprink.Domain.Models; using MediatR; -namespace Imprink.Application.Products.Commands; +namespace Imprink.Application.Commands.Products; public class GetProductsQuery : IRequest> { diff --git a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs b/src/Imprink.Application/Commands/Products/UpdateProductCommand.cs similarity index 95% rename from src/Imprink.Application/Products/Commands/UpdateProductCommand.cs rename to src/Imprink.Application/Commands/Products/UpdateProductCommand.cs index f6c3e8c..06f1313 100644 --- a/src/Imprink.Application/Products/Commands/UpdateProductCommand.cs +++ b/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 { diff --git a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs b/src/Imprink.Application/Commands/Users/DeleteUserRoleHandler.cs similarity index 94% rename from src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs rename to src/Imprink.Application/Commands/Users/DeleteUserRoleHandler.cs index 6d1888a..2ad6291 100644 --- a/src/Imprink.Application/Users/Commands/DeleteUserRoleHandler.cs +++ b/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; diff --git a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs b/src/Imprink.Application/Commands/Users/GetAllRolesHandler.cs similarity index 85% rename from src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs rename to src/Imprink.Application/Commands/Users/GetAllRolesHandler.cs index 4d9ab5e..ec1661b 100644 --- a/src/Imprink.Application/Users/Commands/GetAllRolesHandler.cs +++ b/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>; diff --git a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs b/src/Imprink.Application/Commands/Users/GetUserRolesHandler.cs similarity index 90% rename from src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs rename to src/Imprink.Application/Commands/Users/GetUserRolesHandler.cs index 9c39568..ea3f8d8 100644 --- a/src/Imprink.Application/Users/Commands/GetUserRolesHandler.cs +++ b/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>; diff --git a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs b/src/Imprink.Application/Commands/Users/SetUserFullNameHandler.cs similarity index 91% rename from src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs rename to src/Imprink.Application/Commands/Users/SetUserFullNameHandler.cs index d7865d8..11c9597 100644 --- a/src/Imprink.Application/Users/Commands/SetUserFullNameHandler.cs +++ b/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.Users.Services; +using Imprink.Application.Services; using MediatR; -namespace Imprink.Application.Users.Commands; +namespace Imprink.Application.Commands.Users; public record SetUserFullNameCommand(string FirstName, string LastName) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs b/src/Imprink.Application/Commands/Users/SetUserPhoneHandler.cs similarity index 90% rename from src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs rename to src/Imprink.Application/Commands/Users/SetUserPhoneHandler.cs index d1e3ca7..ac7bc68 100644 --- a/src/Imprink.Application/Users/Commands/SetUserPhoneHandler.cs +++ b/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.Users.Services; +using Imprink.Application.Services; using MediatR; -namespace Imprink.Application.Users.Commands; +namespace Imprink.Application.Commands.Users; public record SetUserPhoneCommand(string PhoneNumber) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs b/src/Imprink.Application/Commands/Users/SetUserRoleHandler.cs similarity index 90% rename from src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs rename to src/Imprink.Application/Commands/Users/SetUserRoleHandler.cs index bb9d892..7c265f0 100644 --- a/src/Imprink.Application/Users/Commands/SetUserRoleHandler.cs +++ b/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.Users; +using Imprink.Domain.Entities; using MediatR; -namespace Imprink.Application.Users.Commands; +namespace Imprink.Application.Commands.Users; public record SetUserRoleCommand(string Sub, Guid RoleId) : IRequest; diff --git a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs b/src/Imprink.Application/Commands/Users/SyncUserHandler.cs similarity index 92% rename from src/Imprink.Application/Users/Commands/SyncUserHandler.cs rename to src/Imprink.Application/Commands/Users/SyncUserHandler.cs index 99bdc9f..a304b27 100644 --- a/src/Imprink.Application/Users/Commands/SyncUserHandler.cs +++ b/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; diff --git a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs b/src/Imprink.Application/Dtos/CategoryDto.cs similarity index 89% rename from src/Imprink.Application/Categories/Dtos/CategoryDto.cs rename to src/Imprink.Application/Dtos/CategoryDto.cs index 64b9e19..6c848b2 100644 --- a/src/Imprink.Application/Categories/Dtos/CategoryDto.cs +++ b/src/Imprink.Application/Dtos/CategoryDto.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Categories.Dtos; +namespace Imprink.Application.Dtos; public class CategoryDto { diff --git a/src/Imprink.Application/Products/Dtos/PagedResultDto.cs b/src/Imprink.Application/Dtos/PagedResultDto.cs similarity index 89% rename from src/Imprink.Application/Products/Dtos/PagedResultDto.cs rename to src/Imprink.Application/Dtos/PagedResultDto.cs index f654054..8d36ba7 100644 --- a/src/Imprink.Application/Products/Dtos/PagedResultDto.cs +++ b/src/Imprink.Application/Dtos/PagedResultDto.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Products.Dtos; +namespace Imprink.Application.Dtos; public class PagedResultDto { diff --git a/src/Imprink.Application/Products/Dtos/ProductDto.cs b/src/Imprink.Application/Dtos/ProductDto.cs similarity index 84% rename from src/Imprink.Application/Products/Dtos/ProductDto.cs rename to src/Imprink.Application/Dtos/ProductDto.cs index cc71be2..d24391c 100644 --- a/src/Imprink.Application/Products/Dtos/ProductDto.cs +++ b/src/Imprink.Application/Dtos/ProductDto.cs @@ -1,6 +1,4 @@ -using Imprink.Application.Categories.Dtos; - -namespace Imprink.Application.Products.Dtos; +namespace Imprink.Application.Dtos; public class ProductDto { diff --git a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs b/src/Imprink.Application/Dtos/ProductVariantDto.cs similarity index 85% rename from src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs rename to src/Imprink.Application/Dtos/ProductVariantDto.cs index 0afec2c..98424dc 100644 --- a/src/Imprink.Application/ProductVariants/Dtos/ProductVariantDto.cs +++ b/src/Imprink.Application/Dtos/ProductVariantDto.cs @@ -1,6 +1,4 @@ -using Imprink.Application.Products.Dtos; - -namespace Imprink.Application.ProductVariants.Dtos; +namespace Imprink.Application.Dtos; public class ProductVariantDto { diff --git a/src/Imprink.Application/Users/Dtos/RoleDto.cs b/src/Imprink.Application/Dtos/RoleDto.cs similarity index 74% rename from src/Imprink.Application/Users/Dtos/RoleDto.cs rename to src/Imprink.Application/Dtos/RoleDto.cs index ac90f6f..c821611 100644 --- a/src/Imprink.Application/Users/Dtos/RoleDto.cs +++ b/src/Imprink.Application/Dtos/RoleDto.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Users.Dtos; +namespace Imprink.Application.Dtos; public class RoleDto { diff --git a/src/Imprink.Application/Users/Dtos/UserDto.cs b/src/Imprink.Application/Dtos/UserDto.cs similarity index 88% rename from src/Imprink.Application/Users/Dtos/UserDto.cs rename to src/Imprink.Application/Dtos/UserDto.cs index 9eb46f6..221da57 100644 --- a/src/Imprink.Application/Users/Dtos/UserDto.cs +++ b/src/Imprink.Application/Dtos/UserDto.cs @@ -1,7 +1,6 @@ -using Imprink.Domain.Entities.Orders; -using Imprink.Domain.Entities.Users; +using Imprink.Domain.Entities; -namespace Imprink.Application.Users.Dtos; +namespace Imprink.Application.Dtos; public class UserDto { diff --git a/src/Imprink.Application/Users/Dtos/UserRoleDto.cs b/src/Imprink.Application/Dtos/UserRoleDto.cs similarity index 74% rename from src/Imprink.Application/Users/Dtos/UserRoleDto.cs rename to src/Imprink.Application/Dtos/UserRoleDto.cs index cb53e64..3c53cf9 100644 --- a/src/Imprink.Application/Users/Dtos/UserRoleDto.cs +++ b/src/Imprink.Application/Dtos/UserRoleDto.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Users.Dtos; +namespace Imprink.Application.Dtos; public class UserRoleDto { diff --git a/src/Imprink.Application/IUnitOfWork.cs b/src/Imprink.Application/IUnitOfWork.cs index 82d3fad..4e63857 100644 --- a/src/Imprink.Application/IUnitOfWork.cs +++ b/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; diff --git a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs b/src/Imprink.Application/Mappings/ProductMappingProfile.cs similarity index 84% rename from src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs rename to src/Imprink.Application/Mappings/ProductMappingProfile.cs index 97d1fd7..389651f 100644 --- a/src/Imprink.Application/Products/Mappings/ProductMappingProfile.cs +++ b/src/Imprink.Application/Mappings/ProductMappingProfile.cs @@ -1,12 +1,10 @@ using AutoMapper; -using Imprink.Application.Categories.Dtos; -using Imprink.Application.Products.Commands; -using Imprink.Application.Products.Dtos; -using Imprink.Application.ProductVariants.Commands; -using Imprink.Application.ProductVariants.Dtos; -using Imprink.Domain.Entities.Products; +using Imprink.Application.Commands.Products; +using Imprink.Application.Commands.ProductVariants; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; -namespace Imprink.Application.Products.Mappings; +namespace Imprink.Application.Mappings; public class ProductMappingProfile: Profile { diff --git a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs b/src/Imprink.Application/Mappings/UserMappingProfile.cs similarity index 93% rename from src/Imprink.Application/Users/Mappings/UserMappingProfile.cs rename to src/Imprink.Application/Mappings/UserMappingProfile.cs index 16a8a43..b9483c1 100644 --- a/src/Imprink.Application/Users/Mappings/UserMappingProfile.cs +++ b/src/Imprink.Application/Mappings/UserMappingProfile.cs @@ -1,10 +1,10 @@ using System.Security.Claims; using AutoMapper; -using Imprink.Application.Users.Dtos; -using Imprink.Domain.Entities.Users; +using Imprink.Application.Dtos; +using Imprink.Domain.Entities; using Imprink.Domain.Models; -namespace Imprink.Application.Users.Mappings; +namespace Imprink.Application.Mappings; public class UserMappingProfile: Profile { diff --git a/src/Imprink.Application/Users/Services/ICurrentUserService.cs b/src/Imprink.Application/Services/ICurrentUserService.cs similarity index 61% rename from src/Imprink.Application/Users/Services/ICurrentUserService.cs rename to src/Imprink.Application/Services/ICurrentUserService.cs index 86b15a4..83bbe41 100644 --- a/src/Imprink.Application/Users/Services/ICurrentUserService.cs +++ b/src/Imprink.Application/Services/ICurrentUserService.cs @@ -1,4 +1,4 @@ -namespace Imprink.Application.Users.Services; +namespace Imprink.Application.Services; public interface ICurrentUserService { diff --git a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs b/src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs similarity index 91% rename from src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs rename to src/Imprink.Application/Validation/Categories/CreateCategoryCommandValidator.cs index 88e9f22..5dac6bf 100644 --- a/src/Imprink.Application/Categories/Validation/CreateCategoryCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs b/src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs similarity index 76% rename from src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs rename to src/Imprink.Application/Validation/Categories/DeleteCategoryCommandValidator.cs index 89c8c7e..169b09a 100644 --- a/src/Imprink.Application/Categories/Validation/DeleteCategoryCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs b/src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs similarity index 93% rename from src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs rename to src/Imprink.Application/Validation/Categories/UpdateCategoryCommandValidator.cs index dfb0af8..92990e5 100644 --- a/src/Imprink.Application/Categories/Validation/UpdateCategoryCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs b/src/Imprink.Application/Validation/Orders/OrderFilterParametersValidator.cs similarity index 98% rename from src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs rename to src/Imprink.Application/Validation/Orders/OrderFilterParametersValidator.cs index 243f5e8..6055f1b 100644 --- a/src/Imprink.Application/Orders/Validation/OrderFilterParametersValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs b/src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs similarity index 92% rename from src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs rename to src/Imprink.Application/Validation/ProductVariants/CreateProducVariantCommandValidator.cs index 8897c47..aff1134 100644 --- a/src/Imprink.Application/ProductVariants/Validation/CreateProducVariantCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs b/src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs similarity index 75% rename from src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs rename to src/Imprink.Application/Validation/ProductVariants/DeleteProductVariantCommandValidator.cs index 419aa93..e9b550e 100644 --- a/src/Imprink.Application/ProductVariants/Validation/DeleteProductVariantCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs b/src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs similarity index 76% rename from src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs rename to src/Imprink.Application/Validation/ProductVariants/GetProductVariantsQueryValidator.cs index 9aa11b1..ddb3341 100644 --- a/src/Imprink.Application/ProductVariants/Validation/GetProductVariantsQueryValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs b/src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs similarity index 93% rename from src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs rename to src/Imprink.Application/Validation/ProductVariants/UpdateProductVariantCommandValidator.cs index d01b1b2..1565abb 100644 --- a/src/Imprink.Application/ProductVariants/Validation/UpdateProductVariantCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs b/src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs similarity index 92% rename from src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs rename to src/Imprink.Application/Validation/Products/CreateProductCommandValidator.cs index d79875a..7258db0 100644 --- a/src/Imprink.Application/Products/Validation/CreateProductCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs b/src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs similarity index 77% rename from src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs rename to src/Imprink.Application/Validation/Products/DeleteProductCommandValidator.cs index 53903ab..205cfec 100644 --- a/src/Imprink.Application/Products/Validation/DeleteProductCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs b/src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs similarity index 75% rename from src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs rename to src/Imprink.Application/Validation/Products/GetProductsQueryValidator.cs index 1194b72..fb2a120 100644 --- a/src/Imprink.Application/Products/Validation/GetProductsQueryValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs b/src/Imprink.Application/Validation/Products/ProductFilterParametersValidator.cs similarity index 97% rename from src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs rename to src/Imprink.Application/Validation/Products/ProductFilterParametersValidator.cs index 55cd4d0..177615d 100644 --- a/src/Imprink.Application/Products/Validation/ProductFilterParametersValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs b/src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs similarity index 92% rename from src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs rename to src/Imprink.Application/Validation/Products/UpdateProductCommandValidator.cs index 3c49ebe..3607612 100644 --- a/src/Imprink.Application/Products/Validation/UpdateProductCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs b/src/Imprink.Application/Validation/Users/Auth0UserValidator.cs similarity index 90% rename from src/Imprink.Application/Users/Validation/Auth0UserValidator.cs rename to src/Imprink.Application/Validation/Users/Auth0UserValidator.cs index 309558b..61e096b 100644 --- a/src/Imprink.Application/Users/Validation/Auth0UserValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs b/src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs similarity index 85% rename from src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs rename to src/Imprink.Application/Validation/Users/SetUserFullNameCommandValidator.cs index cadda16..f18228d 100644 --- a/src/Imprink.Application/Users/Validation/SetUserFullNameCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs b/src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs similarity index 80% rename from src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs rename to src/Imprink.Application/Validation/Users/SetUserPhoneCommandValidator.cs index b0c0508..d392ac4 100644 --- a/src/Imprink.Application/Users/Validation/SetUserPhoneCommandValidator.cs +++ b/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 { diff --git a/src/Imprink.Domain/Entities/Users/Address.cs b/src/Imprink.Domain/Entities/Address.cs similarity index 92% rename from src/Imprink.Domain/Entities/Users/Address.cs rename to src/Imprink.Domain/Entities/Address.cs index 144b8c0..857f331 100644 --- a/src/Imprink.Domain/Entities/Users/Address.cs +++ b/src/Imprink.Domain/Entities/Address.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Users; +namespace Imprink.Domain.Entities; public class Address : EntityBase { diff --git a/src/Imprink.Domain/Entities/Products/Category.cs b/src/Imprink.Domain/Entities/Category.cs similarity index 92% rename from src/Imprink.Domain/Entities/Products/Category.cs rename to src/Imprink.Domain/Entities/Category.cs index 19d4299..bf58e05 100644 --- a/src/Imprink.Domain/Entities/Products/Category.cs +++ b/src/Imprink.Domain/Entities/Category.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Products; +namespace Imprink.Domain.Entities; public class Category : EntityBase { diff --git a/src/Imprink.Domain/Entities/Orders/Order.cs b/src/Imprink.Domain/Entities/Order.cs similarity index 89% rename from src/Imprink.Domain/Entities/Orders/Order.cs rename to src/Imprink.Domain/Entities/Order.cs index 629b623..66d5e68 100644 --- a/src/Imprink.Domain/Entities/Orders/Order.cs +++ b/src/Imprink.Domain/Entities/Order.cs @@ -1,6 +1,4 @@ -using Imprink.Domain.Entities.Users; - -namespace Imprink.Domain.Entities.Orders; +namespace Imprink.Domain.Entities; public class Order : EntityBase { diff --git a/src/Imprink.Domain/Entities/Orders/OrderAddress.cs b/src/Imprink.Domain/Entities/OrderAddress.cs similarity index 90% rename from src/Imprink.Domain/Entities/Orders/OrderAddress.cs rename to src/Imprink.Domain/Entities/OrderAddress.cs index 1eb44aa..1505f65 100644 --- a/src/Imprink.Domain/Entities/Orders/OrderAddress.cs +++ b/src/Imprink.Domain/Entities/OrderAddress.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Orders; +namespace Imprink.Domain.Entities; public class OrderAddress : EntityBase { diff --git a/src/Imprink.Domain/Entities/Orders/OrderItem.cs b/src/Imprink.Domain/Entities/OrderItem.cs similarity index 87% rename from src/Imprink.Domain/Entities/Orders/OrderItem.cs rename to src/Imprink.Domain/Entities/OrderItem.cs index 7f63ce2..6d8b769 100644 --- a/src/Imprink.Domain/Entities/Orders/OrderItem.cs +++ b/src/Imprink.Domain/Entities/OrderItem.cs @@ -1,6 +1,4 @@ -using Imprink.Domain.Entities.Products; - -namespace Imprink.Domain.Entities.Orders; +namespace Imprink.Domain.Entities; public class OrderItem : EntityBase { diff --git a/src/Imprink.Domain/Entities/Orders/OrderStatus.cs b/src/Imprink.Domain/Entities/OrderStatus.cs similarity index 82% rename from src/Imprink.Domain/Entities/Orders/OrderStatus.cs rename to src/Imprink.Domain/Entities/OrderStatus.cs index 597a0a9..0408618 100644 --- a/src/Imprink.Domain/Entities/Orders/OrderStatus.cs +++ b/src/Imprink.Domain/Entities/OrderStatus.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Orders; +namespace Imprink.Domain.Entities; public class OrderStatus { diff --git a/src/Imprink.Domain/Entities/Products/Product.cs b/src/Imprink.Domain/Entities/Product.cs similarity index 88% rename from src/Imprink.Domain/Entities/Products/Product.cs rename to src/Imprink.Domain/Entities/Product.cs index e551681..d640552 100644 --- a/src/Imprink.Domain/Entities/Products/Product.cs +++ b/src/Imprink.Domain/Entities/Product.cs @@ -1,6 +1,4 @@ -using Imprink.Domain.Entities.Orders; - -namespace Imprink.Domain.Entities.Products; +namespace Imprink.Domain.Entities; public class Product : EntityBase { diff --git a/src/Imprink.Domain/Entities/Products/ProductVariant.cs b/src/Imprink.Domain/Entities/ProductVariant.cs similarity index 86% rename from src/Imprink.Domain/Entities/Products/ProductVariant.cs rename to src/Imprink.Domain/Entities/ProductVariant.cs index a802569..e9fee5b 100644 --- a/src/Imprink.Domain/Entities/Products/ProductVariant.cs +++ b/src/Imprink.Domain/Entities/ProductVariant.cs @@ -1,6 +1,4 @@ -using Imprink.Domain.Entities.Orders; - -namespace Imprink.Domain.Entities.Products; +namespace Imprink.Domain.Entities; public class ProductVariant : EntityBase { diff --git a/src/Imprink.Domain/Entities/Users/Role.cs b/src/Imprink.Domain/Entities/Role.cs similarity index 83% rename from src/Imprink.Domain/Entities/Users/Role.cs rename to src/Imprink.Domain/Entities/Role.cs index 7732966..bf117fa 100644 --- a/src/Imprink.Domain/Entities/Users/Role.cs +++ b/src/Imprink.Domain/Entities/Role.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Users; +namespace Imprink.Domain.Entities; public class Role { diff --git a/src/Imprink.Domain/Entities/Orders/ShippingStatus.cs b/src/Imprink.Domain/Entities/ShippingStatus.cs similarity index 82% rename from src/Imprink.Domain/Entities/Orders/ShippingStatus.cs rename to src/Imprink.Domain/Entities/ShippingStatus.cs index eb07c63..d2384bf 100644 --- a/src/Imprink.Domain/Entities/Orders/ShippingStatus.cs +++ b/src/Imprink.Domain/Entities/ShippingStatus.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Orders; +namespace Imprink.Domain.Entities; public class ShippingStatus { diff --git a/src/Imprink.Domain/Entities/Users/User.cs b/src/Imprink.Domain/Entities/User.cs similarity index 91% rename from src/Imprink.Domain/Entities/Users/User.cs rename to src/Imprink.Domain/Entities/User.cs index f6d7713..59edbfa 100644 --- a/src/Imprink.Domain/Entities/Users/User.cs +++ b/src/Imprink.Domain/Entities/User.cs @@ -1,6 +1,4 @@ -using Imprink.Domain.Entities.Orders; - -namespace Imprink.Domain.Entities.Users; +namespace Imprink.Domain.Entities; public class User { diff --git a/src/Imprink.Domain/Entities/Users/UserRole.cs b/src/Imprink.Domain/Entities/UserRole.cs similarity index 84% rename from src/Imprink.Domain/Entities/Users/UserRole.cs rename to src/Imprink.Domain/Entities/UserRole.cs index de4c4b1..28a6ec2 100644 --- a/src/Imprink.Domain/Entities/Users/UserRole.cs +++ b/src/Imprink.Domain/Entities/UserRole.cs @@ -1,4 +1,4 @@ -namespace Imprink.Domain.Entities.Users; +namespace Imprink.Domain.Entities; public class UserRole { diff --git a/src/Imprink.Domain/Models/BaseFilterParameters.cs b/src/Imprink.Domain/Models/BaseFilterParameters.cs new file mode 100644 index 0000000..5dfc8cb --- /dev/null +++ b/src/Imprink.Domain/Models/BaseFilterParameters.cs @@ -0,0 +1,6 @@ +namespace Imprink.Domain.Models; + +public class BaseFilterParameters +{ + // ToDo +} \ No newline at end of file diff --git a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs b/src/Imprink.Domain/Repositories/ICategoryRepository.cs similarity index 93% rename from src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs rename to src/Imprink.Domain/Repositories/ICategoryRepository.cs index ba41959..6ff6b41 100644 --- a/src/Imprink.Domain/Repositories/Products/ICategoryRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Orders/IOrderItemRepository.cs b/src/Imprink.Domain/Repositories/IOrderItemRepository.cs similarity index 96% rename from src/Imprink.Domain/Repositories/Orders/IOrderItemRepository.cs rename to src/Imprink.Domain/Repositories/IOrderItemRepository.cs index d3699d9..7f8d123 100644 --- a/src/Imprink.Domain/Repositories/Orders/IOrderItemRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Orders/IOrderRepository.cs b/src/Imprink.Domain/Repositories/IOrderRepository.cs similarity index 96% rename from src/Imprink.Domain/Repositories/Orders/IOrderRepository.cs rename to src/Imprink.Domain/Repositories/IOrderRepository.cs index c45ae48..0f53fba 100644 --- a/src/Imprink.Domain/Repositories/Orders/IOrderRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs b/src/Imprink.Domain/Repositories/IProductRepository.cs similarity index 92% rename from src/Imprink.Domain/Repositories/Products/IProductRepository.cs rename to src/Imprink.Domain/Repositories/IProductRepository.cs index a4dd90a..42ef79b 100644 --- a/src/Imprink.Domain/Repositories/Products/IProductRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs b/src/Imprink.Domain/Repositories/IProductVariantRepository.cs similarity index 93% rename from src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs rename to src/Imprink.Domain/Repositories/IProductVariantRepository.cs index 8f01e7e..966c2fb 100644 --- a/src/Imprink.Domain/Repositories/Products/IProductVariantRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs b/src/Imprink.Domain/Repositories/IRoleRepository.cs similarity index 83% rename from src/Imprink.Domain/Repositories/Users/IRoleRepository.cs rename to src/Imprink.Domain/Repositories/IRoleRepository.cs index f2dfee2..cc9831a 100644 --- a/src/Imprink.Domain/Repositories/Users/IRoleRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Users/IUserRepository.cs b/src/Imprink.Domain/Repositories/IUserRepository.cs similarity index 93% rename from src/Imprink.Domain/Repositories/Users/IUserRepository.cs rename to src/Imprink.Domain/Repositories/IUserRepository.cs index ad16875..b08ac09 100644 --- a/src/Imprink.Domain/Repositories/Users/IUserRepository.cs +++ b/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 { diff --git a/src/Imprink.Domain/Repositories/Users/IUserRoleRepository.cs b/src/Imprink.Domain/Repositories/IUserRoleRepository.cs similarity index 87% rename from src/Imprink.Domain/Repositories/Users/IUserRoleRepository.cs rename to src/Imprink.Domain/Repositories/IUserRoleRepository.cs index 6c36eda..3d04102 100644 --- a/src/Imprink.Domain/Repositories/Users/IUserRoleRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Configuration/AddressConfiguration.cs b/src/Imprink.Infrastructure/Configuration/AddressConfiguration.cs similarity index 94% rename from src/Imprink.Infrastructure/Users/Configuration/AddressConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/AddressConfiguration.cs index b14348d..d1e4bbd 100644 --- a/src/Imprink.Infrastructure/Users/Configuration/AddressConfiguration.cs +++ b/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
{ diff --git a/src/Imprink.Infrastructure/Categories/Configuration/CategoryConfiguration.cs b/src/Imprink.Infrastructure/Configuration/CategoryConfiguration.cs similarity index 97% rename from src/Imprink.Infrastructure/Categories/Configuration/CategoryConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/CategoryConfiguration.cs index c463d27..1902f35 100644 --- a/src/Imprink.Infrastructure/Categories/Configuration/CategoryConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Configuration/OrderAddressConfiguration.cs b/src/Imprink.Infrastructure/Configuration/OrderAddressConfiguration.cs similarity index 91% rename from src/Imprink.Infrastructure/Orders/Configuration/OrderAddressConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/OrderAddressConfiguration.cs index f792ab1..0fe6e64 100644 --- a/src/Imprink.Infrastructure/Orders/Configuration/OrderAddressConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Configuration/OrderConfiguration.cs b/src/Imprink.Infrastructure/Configuration/OrderConfiguration.cs similarity index 96% rename from src/Imprink.Infrastructure/Orders/Configuration/OrderConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/OrderConfiguration.cs index 3b60287..e4a827b 100644 --- a/src/Imprink.Infrastructure/Orders/Configuration/OrderConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Configuration/OrderItemConfiguration.cs b/src/Imprink.Infrastructure/Configuration/OrderItemConfiguration.cs similarity index 96% rename from src/Imprink.Infrastructure/Orders/Configuration/OrderItemConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/OrderItemConfiguration.cs index 2c3d577..e95654e 100644 --- a/src/Imprink.Infrastructure/Orders/Configuration/OrderItemConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Configuration/OrderStatusConfiguration.cs b/src/Imprink.Infrastructure/Configuration/OrderStatusConfiguration.cs similarity index 90% rename from src/Imprink.Infrastructure/Orders/Configuration/OrderStatusConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/OrderStatusConfiguration.cs index 445b68b..917d343 100644 --- a/src/Imprink.Infrastructure/Orders/Configuration/OrderStatusConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Products/Configuration/ProductConfiguration.cs b/src/Imprink.Infrastructure/Configuration/ProductConfiguration.cs similarity index 95% rename from src/Imprink.Infrastructure/Products/Configuration/ProductConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/ProductConfiguration.cs index 3bb0dbc..c0ef17f 100644 --- a/src/Imprink.Infrastructure/Products/Configuration/ProductConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/ProductVariants/Configuration/ProductVariantConfiguration.cs b/src/Imprink.Infrastructure/Configuration/ProductVariantConfiguration.cs similarity index 95% rename from src/Imprink.Infrastructure/ProductVariants/Configuration/ProductVariantConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/ProductVariantConfiguration.cs index eb42c93..2d323a1 100644 --- a/src/Imprink.Infrastructure/ProductVariants/Configuration/ProductVariantConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Configuration/RoleConfiguration.cs b/src/Imprink.Infrastructure/Configuration/RoleConfiguration.cs similarity index 90% rename from src/Imprink.Infrastructure/Users/Configuration/RoleConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/RoleConfiguration.cs index aa2b95d..a6db4a8 100644 --- a/src/Imprink.Infrastructure/Users/Configuration/RoleConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Configuration/ShippingStatusConfiguration.cs b/src/Imprink.Infrastructure/Configuration/ShippingStatusConfiguration.cs similarity index 90% rename from src/Imprink.Infrastructure/Orders/Configuration/ShippingStatusConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/ShippingStatusConfiguration.cs index 829eb07..1dcf9b5 100644 --- a/src/Imprink.Infrastructure/Orders/Configuration/ShippingStatusConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Configuration/UserConfiguration.cs b/src/Imprink.Infrastructure/Configuration/UserConfiguration.cs similarity index 94% rename from src/Imprink.Infrastructure/Users/Configuration/UserConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/UserConfiguration.cs index 418cccf..15b71bc 100644 --- a/src/Imprink.Infrastructure/Users/Configuration/UserConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Configuration/UserRoleConfiguration.cs b/src/Imprink.Infrastructure/Configuration/UserRoleConfiguration.cs similarity index 91% rename from src/Imprink.Infrastructure/Users/Configuration/UserRoleConfiguration.cs rename to src/Imprink.Infrastructure/Configuration/UserRoleConfiguration.cs index 309698f..d5b00fd 100644 --- a/src/Imprink.Infrastructure/Users/Configuration/UserRoleConfiguration.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs b/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs index f8171cc..844fe62 100644 --- a/src/Imprink.Infrastructure/Database/ApplicationDbContext.cs +++ b/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; diff --git a/src/Imprink.Infrastructure/Imprink.Infrastructure.csproj b/src/Imprink.Infrastructure/Imprink.Infrastructure.csproj index b1a1413..8650de1 100644 --- a/src/Imprink.Infrastructure/Imprink.Infrastructure.csproj +++ b/src/Imprink.Infrastructure/Imprink.Infrastructure.csproj @@ -25,7 +25,6 @@ - diff --git a/src/Imprink.Infrastructure/Categories/Repositories/CategoryRepository.cs b/src/Imprink.Infrastructure/Repositories/CategoryRepository.cs similarity index 96% rename from src/Imprink.Infrastructure/Categories/Repositories/CategoryRepository.cs rename to src/Imprink.Infrastructure/Repositories/CategoryRepository.cs index 91e151a..42f6f34 100644 --- a/src/Imprink.Infrastructure/Categories/Repositories/CategoryRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Repositories/OrderItemRepository.cs b/src/Imprink.Infrastructure/Repositories/OrderItemRepository.cs similarity index 98% rename from src/Imprink.Infrastructure/Orders/Repositories/OrderItemRepository.cs rename to src/Imprink.Infrastructure/Repositories/OrderItemRepository.cs index 8e555f4..916e457 100644 --- a/src/Imprink.Infrastructure/Orders/Repositories/OrderItemRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Orders/Repositories/OrderRepository.cs b/src/Imprink.Infrastructure/Repositories/OrderRepository.cs similarity index 98% rename from src/Imprink.Infrastructure/Orders/Repositories/OrderRepository.cs rename to src/Imprink.Infrastructure/Repositories/OrderRepository.cs index 491ddeb..39a7655 100644 --- a/src/Imprink.Infrastructure/Orders/Repositories/OrderRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Products/Repositories/ProductRepository.cs b/src/Imprink.Infrastructure/Repositories/ProductRepository.cs similarity index 97% rename from src/Imprink.Infrastructure/Products/Repositories/ProductRepository.cs rename to src/Imprink.Infrastructure/Repositories/ProductRepository.cs index 6632a13..b5f1423 100644 --- a/src/Imprink.Infrastructure/Products/Repositories/ProductRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/ProductVariants/Repositories/ProductVariantRepository.cs b/src/Imprink.Infrastructure/Repositories/ProductVariantRepository.cs similarity index 96% rename from src/Imprink.Infrastructure/ProductVariants/Repositories/ProductVariantRepository.cs rename to src/Imprink.Infrastructure/Repositories/ProductVariantRepository.cs index d3ff0f0..01e8efa 100644 --- a/src/Imprink.Infrastructure/ProductVariants/Repositories/ProductVariantRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Repositories/RoleRepository.cs b/src/Imprink.Infrastructure/Repositories/RoleRepository.cs similarity index 89% rename from src/Imprink.Infrastructure/Users/Repositories/RoleRepository.cs rename to src/Imprink.Infrastructure/Repositories/RoleRepository.cs index eecfb08..138b74a 100644 --- a/src/Imprink.Infrastructure/Users/Repositories/RoleRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Repositories/UserRepository.cs b/src/Imprink.Infrastructure/Repositories/UserRepository.cs similarity index 96% rename from src/Imprink.Infrastructure/Users/Repositories/UserRepository.cs rename to src/Imprink.Infrastructure/Repositories/UserRepository.cs index ca9a656..4e300aa 100644 --- a/src/Imprink.Infrastructure/Users/Repositories/UserRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Users/Repositories/UserRoleRepository.cs b/src/Imprink.Infrastructure/Repositories/UserRoleRepository.cs similarity index 92% rename from src/Imprink.Infrastructure/Users/Repositories/UserRoleRepository.cs rename to src/Imprink.Infrastructure/Repositories/UserRoleRepository.cs index 474b78d..49d6e47 100644 --- a/src/Imprink.Infrastructure/Users/Repositories/UserRoleRepository.cs +++ b/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 { diff --git a/src/Imprink.Infrastructure/Services/CurrentUserService.cs b/src/Imprink.Infrastructure/Services/CurrentUserService.cs index 52102cc..89ffbe9 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.Users.Services; +using Imprink.Application.Services; using Microsoft.AspNetCore.Http; namespace Imprink.Infrastructure.Services; diff --git a/src/Imprink.Infrastructure/UnitOfWork.cs b/src/Imprink.Infrastructure/UnitOfWork.cs index 8f214f4..1ed1ec9 100644 --- a/src/Imprink.Infrastructure/UnitOfWork.cs +++ b/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; diff --git a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs b/src/Imprink.WebApi/Controllers/CategoriesController.cs similarity index 91% rename from src/Imprink.WebApi/Controllers/Products/CategoriesController.cs rename to src/Imprink.WebApi/Controllers/CategoriesController.cs index 04d9b32..73a3710 100644 --- a/src/Imprink.WebApi/Controllers/Products/CategoriesController.cs +++ b/src/Imprink.WebApi/Controllers/CategoriesController.cs @@ -1,6 +1,5 @@ -using Imprink.Application.Categories.Commands; -using Imprink.Application.Categories.Dtos; -using Imprink.Application.Products.Dtos; +using Imprink.Application.Commands.Categories; +using Imprink.Application.Dtos; using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; diff --git a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs b/src/Imprink.WebApi/Controllers/ProductVariantsController.cs similarity index 91% rename from src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs rename to src/Imprink.WebApi/Controllers/ProductVariantsController.cs index 7b065a2..a1c8636 100644 --- a/src/Imprink.WebApi/Controllers/Products/ProductVariantsController.cs +++ b/src/Imprink.WebApi/Controllers/ProductVariantsController.cs @@ -1,6 +1,5 @@ -using Imprink.Application.Products.Dtos; -using Imprink.Application.ProductVariants.Commands; -using Imprink.Application.ProductVariants.Dtos; +using Imprink.Application.Commands.ProductVariants; +using Imprink.Application.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/ProductsController.cs similarity index 85% rename from src/Imprink.WebApi/Controllers/Products/ProductsController.cs rename to src/Imprink.WebApi/Controllers/ProductsController.cs index be28cd5..9c08e74 100644 --- a/src/Imprink.WebApi/Controllers/Products/ProductsController.cs +++ b/src/Imprink.WebApi/Controllers/ProductsController.cs @@ -1,6 +1,5 @@ -using Imprink.Application.Products; -using Imprink.Application.Products.Commands; -using Imprink.Application.Products.Dtos; +using Imprink.Application.Commands.Products; +using Imprink.Application.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>> 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); } diff --git a/src/Imprink.WebApi/Controllers/Products/SeedingController.cs b/src/Imprink.WebApi/Controllers/SeedingController.cs similarity index 100% rename from src/Imprink.WebApi/Controllers/Products/SeedingController.cs rename to src/Imprink.WebApi/Controllers/SeedingController.cs diff --git a/src/Imprink.WebApi/Controllers/Users/UsersController.cs b/src/Imprink.WebApi/Controllers/UsersController.cs similarity index 94% rename from src/Imprink.WebApi/Controllers/Users/UsersController.cs rename to src/Imprink.WebApi/Controllers/UsersController.cs index 42b43de..981a8a9 100644 --- a/src/Imprink.WebApi/Controllers/Users/UsersController.cs +++ b/src/Imprink.WebApi/Controllers/UsersController.cs @@ -1,13 +1,13 @@ using System.Security.Claims; using AutoMapper; -using Imprink.Application.Users.Commands; -using Imprink.Application.Users.Dtos; +using Imprink.Application.Commands.Users; +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")] diff --git a/src/Imprink.WebApi/Imprink.WebApi.csproj b/src/Imprink.WebApi/Imprink.WebApi.csproj index f880fdd..eb637c0 100644 --- a/src/Imprink.WebApi/Imprink.WebApi.csproj +++ b/src/Imprink.WebApi/Imprink.WebApi.csproj @@ -32,4 +32,8 @@ + + + + diff --git a/src/Imprink.WebApi/Program.cs b/src/Imprink.WebApi/Program.cs index 3992d18..120a9d8 100644 --- a/src/Imprink.WebApi/Program.cs +++ b/src/Imprink.WebApi/Program.cs @@ -13,5 +13,3 @@ var app = builder.Build(); Startup.Configure(app, app.Environment); app.Run(); - -public partial class Program { } \ No newline at end of file diff --git a/src/Imprink.WebApi/Seeder.cs b/src/Imprink.WebApi/Seeder.cs index fa66f6f..45f84f0 100644 --- a/src/Imprink.WebApi/Seeder.cs +++ b/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; diff --git a/src/Imprink.WebApi/Startup.cs b/src/Imprink.WebApi/Startup.cs index 49ec802..6620633 100644 --- a/src/Imprink.WebApi/Startup.cs +++ b/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.Products.Commands; -using Imprink.Application.Users.Services; -using Imprink.Application.Users.Validation; +using Imprink.Application.Commands.Products; +using Imprink.Application.Services; +using Imprink.Application.Validation.Users; 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.Products.Repositories; -using Imprink.Infrastructure.ProductVariants.Repositories; +using Imprink.Infrastructure.Repositories; using Imprink.Infrastructure.Services; -using Imprink.Infrastructure.Users.Repositories; using Imprink.WebApi.Filters; using Imprink.WebApi.Middleware; using Microsoft.AspNetCore.Authentication.JwtBearer;