From 4b7dd3b3f8af0e45fd780e9985516c23c4454f09 Mon Sep 17 00:00:00 2001 From: Vanderlan Gomes da Silva Date: Thu, 1 Aug 2024 10:16:17 -0300 Subject: [PATCH] Update UseCases folder structure --- src/Company.Orion.Api/Bootstrapper.cs | 2 +- .../Configuration/AuthenticationConfiguration.cs | 2 +- src/Company.Orion.Api/Controllers/V1/AuthController.cs | 4 ++-- .../Controllers/V1/UsersController.cs | 10 +++++----- .../LoginWithCredentialsRequest.cs | 10 ---------- .../LoginWithRefreshTokenRequest.cs | 10 ---------- .../LoginWithRefreshTokenResponse.cs | 5 ----- .../Company.Orion.Application.Core.csproj | 2 +- .../UserGetPaginated/UserGetPaginatedRequest.cs | 7 ------- .../LoginWithCredentialsRequest.cs | 10 ++++++++++ .../LoginWithCredentialsRequestHandler.cs | 2 +- .../LoginWithCredentialsResponse.cs | 2 +- .../LoginWithRefreshTokenRequest.cs | 10 ++++++++++ .../LoginWithRefreshTokenRequestHandler.cs | 2 +- .../LoginWithRefreshTokenResponse.cs | 5 +++++ .../ChangePassword}/UserChangePasswordRequest.cs | 2 +- .../UserUpdatePasswordRequestHandler.cs | 2 +- .../ChangePassword}/UserUpdateRequestValidator.cs | 2 +- .../User/Commands/Create}/UserCreateRequest.cs | 6 +++--- .../User/Commands/Create}/UserCreateRequestHandler.cs | 2 +- .../Commands/Create}/UserCreateRequestValidator.cs | 6 +++--- .../User/Commands/Create}/UserCreateResponse.cs | 2 +- .../User/Commands/Delete}/UserDeleteRequest.cs | 2 +- .../User/Commands/Delete}/UserDeleteRequestHandler.cs | 2 +- .../User/Commands/Update}/UserUpdateRequest.cs | 6 +++--- .../User/Commands/Update}/UserUpdateRequestHandler.cs | 2 +- .../Commands/Update}/UserUpdateRequestValidator.cs | 6 +++--- .../UserCreated/UserCreatedNotification.cs | 2 +- .../UserCreated/UserCreatedNotificationHandler.cs | 4 ++-- .../UserPasswordChangedNotification.cs | 2 +- .../UserPasswordChangedNotificationHandler.cs | 4 ++-- .../User/Queries/GetById}/UserGetByIdRequest.cs | 2 +- .../User/Queries/GetById}/UserGetByIdRequestHandler.cs | 4 ++-- .../User/Queries/GetById}/UserGetByIdResponse.cs | 2 +- .../Queries/GetPaginated/UserGetPaginatedRequest.cs | 7 +++++++ .../GetPaginated}/UserGetPaginatedRequestHandler.cs | 2 +- .../Queries/GetPaginated}/UserGetPaginatedResponse.cs | 4 ++-- tests/Company.Orion.Test/Api/V1/AuthApiTest.cs | 6 +++--- tests/Company.Orion.Test/Api/V1/UsersApiTest.cs | 6 +++--- tests/Company.Orion.Test/Shared/Faker/UserFaker.cs | 4 ++-- .../Unit/Controllers/AuthControllerTest.cs | 2 ++ .../Unit/Controllers/UsersControllerTest.cs | 4 ++-- 42 files changed, 90 insertions(+), 88 deletions(-) delete mode 100644 src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs delete mode 100644 src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs delete mode 100644 src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs delete mode 100644 src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequest.cs create mode 100644 src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs rename src/Company.Orion.Application.Core/{ => UseCases/Auth}/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs (89%) rename src/Company.Orion.Application.Core/{ => UseCases/Auth}/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs (77%) create mode 100644 src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs rename src/Company.Orion.Application.Core/{ => UseCases/Auth}/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs (89%) create mode 100644 src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs rename src/Company.Orion.Application.Core/{Commands/UserChangePassword => UseCases/User/Commands/ChangePassword}/UserChangePasswordRequest.cs (75%) rename src/Company.Orion.Application.Core/{Commands/UserChangePassword => UseCases/User/Commands/ChangePassword}/UserUpdatePasswordRequestHandler.cs (90%) rename src/Company.Orion.Application.Core/{Commands/UserChangePassword => UseCases/User/Commands/ChangePassword}/UserUpdateRequestValidator.cs (92%) rename src/Company.Orion.Application.Core/{Commands/UserCreate => UseCases/User/Commands/Create}/UserCreateRequest.cs (81%) rename src/Company.Orion.Application.Core/{Commands/UserCreate => UseCases/User/Commands/Create}/UserCreateRequestHandler.cs (89%) rename src/Company.Orion.Application.Core/{Commands/UserCreate => UseCases/User/Commands/Create}/UserCreateRequestValidator.cs (91%) rename src/Company.Orion.Application.Core/{Commands/UserCreate => UseCases/User/Commands/Create}/UserCreateResponse.cs (91%) rename src/Company.Orion.Application.Core/{Commands/UserDelete => UseCases/User/Commands/Delete}/UserDeleteRequest.cs (52%) rename src/Company.Orion.Application.Core/{Commands/UserDelete => UseCases/User/Commands/Delete}/UserDeleteRequestHandler.cs (82%) rename src/Company.Orion.Application.Core/{Commands/UserUpdate => UseCases/User/Commands/Update}/UserUpdateRequest.cs (89%) rename src/Company.Orion.Application.Core/{Commands/UserUpdate => UseCases/User/Commands/Update}/UserUpdateRequestHandler.cs (82%) rename src/Company.Orion.Application.Core/{Commands/UserUpdate => UseCases/User/Commands/Update}/UserUpdateRequestValidator.cs (91%) rename src/Company.Orion.Application.Core/{ => UseCases/User}/Notifications/UserCreated/UserCreatedNotification.cs (70%) rename src/Company.Orion.Application.Core/{ => UseCases/User}/Notifications/UserCreated/UserCreatedNotificationHandler.cs (86%) rename src/Company.Orion.Application.Core/{ => UseCases/User}/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs (50%) rename src/Company.Orion.Application.Core/{ => UseCases/User}/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs (86%) rename src/Company.Orion.Application.Core/{Queries/UserGetById => UseCases/User/Queries/GetById}/UserGetByIdRequest.cs (58%) rename src/Company.Orion.Application.Core/{Queries/UserGetById => UseCases/User/Queries/GetById}/UserGetByIdRequestHandler.cs (66%) rename src/Company.Orion.Application.Core/{Queries/UserGetById => UseCases/User/Queries/GetById}/UserGetByIdResponse.cs (91%) create mode 100644 src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequest.cs rename src/Company.Orion.Application.Core/{Queries/UserGetPaginated => UseCases/User/Queries/GetPaginated}/UserGetPaginatedRequestHandler.cs (89%) rename src/Company.Orion.Application.Core/{Queries/UserGetPaginated => UseCases/User/Queries/GetPaginated}/UserGetPaginatedResponse.cs (91%) diff --git a/src/Company.Orion.Api/Bootstrapper.cs b/src/Company.Orion.Api/Bootstrapper.cs index ef38445..f518a4d 100644 --- a/src/Company.Orion.Api/Bootstrapper.cs +++ b/src/Company.Orion.Api/Bootstrapper.cs @@ -5,9 +5,9 @@ using Microsoft.AspNetCore.Mvc.Razor; using Company.Orion.Api.Configuration; using Company.Orion.Application.Core; -using Company.Orion.Application.Core.Commands.UserCreate; using Company.Orion.Crosscutting.Ioc.Dependencies; using Company.Orion.Domain.Core.Authentication; +using Company.Orion.Application.Core.UseCases.User.Commands.Create; namespace Company.Orion.Api; diff --git a/src/Company.Orion.Api/Configuration/AuthenticationConfiguration.cs b/src/Company.Orion.Api/Configuration/AuthenticationConfiguration.cs index d866764..b9228f0 100644 --- a/src/Company.Orion.Api/Configuration/AuthenticationConfiguration.cs +++ b/src/Company.Orion.Api/Configuration/AuthenticationConfiguration.cs @@ -3,8 +3,8 @@ using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Text; -using Company.Orion.Application.Core.Commands.LoginWithCredentials; using Company.Orion.Domain.Core.Extensions; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; namespace Company.Orion.Api.Configuration; diff --git a/src/Company.Orion.Api/Controllers/V1/AuthController.cs b/src/Company.Orion.Api/Controllers/V1/AuthController.cs index 8bba8bf..90fcda7 100644 --- a/src/Company.Orion.Api/Controllers/V1/AuthController.cs +++ b/src/Company.Orion.Api/Controllers/V1/AuthController.cs @@ -2,14 +2,14 @@ using MediatR; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Company.Orion.Application.Core.Commands.LoginWithCredentials; -using Company.Orion.Application.Core.Commands.LoginWithRefreshToken; using Company.Orion.Domain.Core.Exceptions; using Swashbuckle.AspNetCore.Annotations; using System.Net; using Company.Orion.Api.Configuration; using Company.Orion.Api.Controllers.Base; using Company.Orion.Api.Models; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; namespace Company.Orion.Api.Controllers.V1; diff --git a/src/Company.Orion.Api/Controllers/V1/UsersController.cs b/src/Company.Orion.Api/Controllers/V1/UsersController.cs index 4b95424..3a7442b 100644 --- a/src/Company.Orion.Api/Controllers/V1/UsersController.cs +++ b/src/Company.Orion.Api/Controllers/V1/UsersController.cs @@ -1,12 +1,7 @@ using Asp.Versioning; using MediatR; using Microsoft.AspNetCore.Mvc; -using Company.Orion.Application.Core.Commands.UserChangePassword; -using Company.Orion.Application.Core.Commands.UserCreate; using Company.Orion.Application.Core.Commands.UserDelete; -using Company.Orion.Application.Core.Commands.UserUpdate; -using Company.Orion.Application.Core.Queries.UserGetById; -using Company.Orion.Application.Core.Queries.UserGetPaginated; using Company.Orion.Domain.Core.Exceptions; using Company.Orion.Domain.Core.ValueObjects.Pagination; using Swashbuckle.AspNetCore.Annotations; @@ -14,6 +9,11 @@ using Company.Orion.Api.Attributes; using Company.Orion.Api.Controllers.Base; using static Company.Orion.Domain.Core.Authentication.AuthorizationConfiguration; +using Company.Orion.Application.Core.UseCases.User.Commands.Update; +using Company.Orion.Application.Core.UseCases.User.Commands.Create; +using Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; +using Company.Orion.Application.Core.UseCases.User.Commands.ChangePassword; +using Company.Orion.Application.Core.UseCases.User.Queries.GetById; namespace Company.Orion.Api.Controllers.V1; diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs b/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs deleted file mode 100644 index a0c099f..0000000 --- a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MediatR; - -namespace Company.Orion.Application.Core.Commands.LoginWithCredentials; - -public class LoginWithCredentialsRequest : IRequest -{ - public string Email { get; set; } - public string Password { get; set; } -} - diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs b/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs deleted file mode 100644 index 7df47f3..0000000 --- a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs +++ /dev/null @@ -1,10 +0,0 @@ -using MediatR; - -namespace Company.Orion.Application.Core.Commands.LoginWithRefreshToken; - -public class LoginWithRefreshTokenRequest : IRequest -{ - public string Token { get; set; } - public string RefreshToken { get; set; } -} - diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs b/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs deleted file mode 100644 index 5bd12c8..0000000 --- a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Company.Orion.Application.Core.Commands.LoginWithCredentials; - -namespace Company.Orion.Application.Core.Commands.LoginWithRefreshToken; - -public class LoginWithRefreshTokenResponse : LoginWithCredentialsResponse; \ No newline at end of file diff --git a/src/Company.Orion.Application.Core/Company.Orion.Application.Core.csproj b/src/Company.Orion.Application.Core/Company.Orion.Application.Core.csproj index 032e1ea..a36656d 100644 --- a/src/Company.Orion.Application.Core/Company.Orion.Application.Core.csproj +++ b/src/Company.Orion.Application.Core/Company.Orion.Application.Core.csproj @@ -1,4 +1,4 @@ - + net8.0 diff --git a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequest.cs b/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequest.cs deleted file mode 100644 index 459726a..0000000 --- a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequest.cs +++ /dev/null @@ -1,7 +0,0 @@ -using MediatR; -using Company.Orion.Domain.Core.Filters; -using Company.Orion.Domain.Core.ValueObjects.Pagination; - -namespace Company.Orion.Application.Core.Queries.UserGetPaginated; - -public class UserGetPaginatedRequest : UserFilter, IRequest>; \ No newline at end of file diff --git a/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs new file mode 100644 index 0000000..170f874 --- /dev/null +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequest.cs @@ -0,0 +1,10 @@ +using MediatR; + +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; + +public class LoginWithCredentialsRequest : IRequest +{ + public string Email { get; set; } + public string Password { get; set; } +} + diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs similarity index 89% rename from src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs index 9db2dab..ac49cc8 100644 --- a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsRequestHandler.cs @@ -1,7 +1,7 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.LoginWithCredentials; +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; public class LoginWithCredentialsRequestHandler(IUserService userService) : IRequestHandler { diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs similarity index 77% rename from src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs rename to src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs index 56e1ca4..34084c4 100644 --- a/src/Company.Orion.Application.Core/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithCredentials/LoginWithCredentialsResponse.cs @@ -1,6 +1,6 @@ using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Commands.LoginWithCredentials; +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; public class LoginWithCredentialsResponse { diff --git a/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs new file mode 100644 index 0000000..dbbc617 --- /dev/null +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequest.cs @@ -0,0 +1,10 @@ +using MediatR; + +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; + +public class LoginWithRefreshTokenRequest : IRequest +{ + public string Token { get; set; } + public string RefreshToken { get; set; } +} + diff --git a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs similarity index 89% rename from src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs index 1223053..02199eb 100644 --- a/src/Company.Orion.Application.Core/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenRequestHandler.cs @@ -1,7 +1,7 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.LoginWithRefreshToken; +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; public class LoginWithRefreshTokenRequestHandler(IUserService userService) : IRequestHandler diff --git a/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs new file mode 100644 index 0000000..ca5895e --- /dev/null +++ b/src/Company.Orion.Application.Core/UseCases/Auth/Commands/LoginWithRefreshToken/LoginWithRefreshTokenResponse.cs @@ -0,0 +1,5 @@ +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; + +namespace Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; + +public class LoginWithRefreshTokenResponse : LoginWithCredentialsResponse; \ No newline at end of file diff --git a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserChangePasswordRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserChangePasswordRequest.cs similarity index 75% rename from src/Company.Orion.Application.Core/Commands/UserChangePassword/UserChangePasswordRequest.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserChangePasswordRequest.cs index 6b957ce..ba3141f 100644 --- a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserChangePasswordRequest.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserChangePasswordRequest.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Company.Orion.Application.Core.Commands.UserChangePassword +namespace Company.Orion.Application.Core.UseCases.User.Commands.ChangePassword { public class UserChangePasswordRequest : IRequest { diff --git a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdatePasswordRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdatePasswordRequestHandler.cs similarity index 90% rename from src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdatePasswordRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdatePasswordRequestHandler.cs index 1df7144..b850927 100644 --- a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdatePasswordRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdatePasswordRequestHandler.cs @@ -3,7 +3,7 @@ using Company.Orion.Domain.Core.Authentication; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.UserChangePassword +namespace Company.Orion.Application.Core.UseCases.User.Commands.ChangePassword { public class UserUpdatePasswordRequestHandler( IUserService userService, diff --git a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdateRequestValidator.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdateRequestValidator.cs similarity index 92% rename from src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdateRequestValidator.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdateRequestValidator.cs index 3cb1b76..272c0a9 100644 --- a/src/Company.Orion.Application.Core/Commands/UserChangePassword/UserUpdateRequestValidator.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/ChangePassword/UserUpdateRequestValidator.cs @@ -3,7 +3,7 @@ using Company.Orion.Crosscutting.Resources; using Company.Orion.Crosscutting.Resources.Messages; -namespace Company.Orion.Application.Core.Commands.UserChangePassword; +namespace Company.Orion.Application.Core.UseCases.User.Commands.ChangePassword; public class UserChangePasswordRequestValidator : AbstractValidator { diff --git a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequest.cs similarity index 81% rename from src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequest.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequest.cs index 357e4db..2530179 100644 --- a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequest.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequest.cs @@ -2,9 +2,9 @@ using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Commands.UserCreate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Create; -public class UserCreateRequest : IRequest +public class UserCreateRequest : IRequest { public string Name { get; set; } public string Password { get; set; } @@ -15,7 +15,7 @@ public static implicit operator User(UserCreateRequest request) { if (request is null) return default; - + return new User { Name = request.Name, diff --git a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestHandler.cs similarity index 89% rename from src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestHandler.cs index f7bbc05..c5744dc 100644 --- a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestHandler.cs @@ -2,7 +2,7 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.UserCreate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Create; public class UserCreateRequestHandler(IUserService userService, IMediator mediator) : IRequestHandler diff --git a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestValidator.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestValidator.cs similarity index 91% rename from src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestValidator.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestValidator.cs index 01d1b0f..da3ad4d 100644 --- a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateRequestValidator.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateRequestValidator.cs @@ -3,7 +3,7 @@ using Company.Orion.Crosscutting.Resources; using Company.Orion.Crosscutting.Resources.Messages; -namespace Company.Orion.Application.Core.Commands.UserCreate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Create; public class UserCreateRequestValidator : AbstractValidator { @@ -15,10 +15,10 @@ public UserCreateRequestValidator(IStringLocalizer stringLocaliz RuleFor(c => c.Name) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyName]); - + RuleFor(c => c.Email) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyEmail]); - + RuleFor(c => c.Password) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyPassword]); } diff --git a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateResponse.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateResponse.cs similarity index 91% rename from src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateResponse.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateResponse.cs index e1736f4..6a91054 100644 --- a/src/Company.Orion.Application.Core/Commands/UserCreate/UserCreateResponse.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Create/UserCreateResponse.cs @@ -1,7 +1,7 @@ using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Commands.UserCreate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Create; public class UserCreateResponse { diff --git a/src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequest.cs similarity index 52% rename from src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequest.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequest.cs index 508c7dd..f99f7ab 100644 --- a/src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequest.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequest.cs @@ -1,5 +1,5 @@ using MediatR; -namespace Company.Orion.Application.Core.Commands.UserDelete; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Delete; public record UserDeleteRequest(string PublicId) : IRequest; diff --git a/src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequestHandler.cs similarity index 82% rename from src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequestHandler.cs index 09e3c7a..075fa86 100644 --- a/src/Company.Orion.Application.Core/Commands/UserDelete/UserDeleteRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Delete/UserDeleteRequestHandler.cs @@ -1,7 +1,7 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.UserDelete; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Delete; public class UserDeleteRequestHandler(IUserService userService) : IRequestHandler { diff --git a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequest.cs similarity index 89% rename from src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequest.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequest.cs index f9f9e8f..4bd8a32 100644 --- a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequest.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequest.cs @@ -2,7 +2,7 @@ using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Commands.UserUpdate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Update; public class UserUpdateRequest : IRequest { @@ -10,12 +10,12 @@ public class UserUpdateRequest : IRequest public string Name { get; set; } public string Email { get; set; } public UserProfile Profile { get; set; } - + public static implicit operator User(UserUpdateRequest request) { if (request is null) return default; - + return new User { PublicId = request.PublicId, diff --git a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestHandler.cs similarity index 82% rename from src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestHandler.cs index c1fc2c9..c28b787 100644 --- a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestHandler.cs @@ -1,7 +1,7 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Commands.UserUpdate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Update; public class UserUpdateRequestHandler(IUserService userService) : IRequestHandler { diff --git a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestValidator.cs b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestValidator.cs similarity index 91% rename from src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestValidator.cs rename to src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestValidator.cs index d7565d0..9f3f71a 100644 --- a/src/Company.Orion.Application.Core/Commands/UserUpdate/UserUpdateRequestValidator.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Commands/Update/UserUpdateRequestValidator.cs @@ -3,7 +3,7 @@ using Company.Orion.Crosscutting.Resources; using Company.Orion.Crosscutting.Resources.Messages; -namespace Company.Orion.Application.Core.Commands.UserUpdate; +namespace Company.Orion.Application.Core.UseCases.User.Commands.Update; public class UserUpdateRequestValidator : AbstractValidator { @@ -15,10 +15,10 @@ public UserUpdateRequestValidator(IStringLocalizer stringLocaliz RuleFor(c => c.Name) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyName]); - + RuleFor(c => c.Email) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyEmail]); - + RuleFor(c => c.PublicId) .NotEmpty().WithMessage(stringLocalizer[MessagesKeys.UserMessages.EmptyId]); } diff --git a/src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotification.cs b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotification.cs similarity index 70% rename from src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotification.cs rename to src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotification.cs index d0b4846..e357533 100644 --- a/src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotification.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotification.cs @@ -1,7 +1,7 @@ using MediatR; using Company.Orion.Domain.Core.Entities; -namespace Company.Orion.Application.Core.Notifications.UserCreated +namespace Company.Orion.Application.Core.UseCases.User.Notifications.UserCreated { public class UserCreatedNotification(User user) : INotification { diff --git a/src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotificationHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotificationHandler.cs similarity index 86% rename from src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotificationHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotificationHandler.cs index 7f5d43e..14d33a5 100644 --- a/src/Company.Orion.Application.Core/Notifications/UserCreated/UserCreatedNotificationHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserCreated/UserCreatedNotificationHandler.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Company.Orion.Domain.Core.Authentication; -namespace Company.Orion.Application.Core.Notifications.UserCreated +namespace Company.Orion.Application.Core.UseCases.User.Notifications.UserCreated { public class UserCreatedNotificationHandler( ILogger logger, @@ -12,7 +12,7 @@ public class UserCreatedNotificationHandler( { public async Task Handle(UserCreatedNotification notification, CancellationToken cancellationToken) { - logger.LogInformation("A notification {notificationType} has been received. Notification details: {notification}. Action performed by: {currentUserName}", + logger.LogInformation("A notification {notificationType} has been received. Notification details: {notification}. Action performed by: {currentUserName}", nameof(UserCreatedNotification), JsonConvert.SerializeObject(notification, Formatting.Indented), currentUser.ToString()); diff --git a/src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs similarity index 50% rename from src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs rename to src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs index 28caae1..ebe0e50 100644 --- a/src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotification.cs @@ -1,6 +1,6 @@ using MediatR; -namespace Company.Orion.Application.Core.Notifications.UserPasswordChanged +namespace Company.Orion.Application.Core.UseCases.User.Notifications.UserPasswordChanged { public class UserPasswordChangedNotification : INotification; } diff --git a/src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs similarity index 86% rename from src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs index c28f8e4..f402324 100644 --- a/src/Company.Orion.Application.Core/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Notifications/UserPasswordChanged/UserPasswordChangedNotificationHandler.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; using Company.Orion.Domain.Core.Authentication; -namespace Company.Orion.Application.Core.Notifications.UserPasswordChanged +namespace Company.Orion.Application.Core.UseCases.User.Notifications.UserPasswordChanged { public class UserPasswordChangedNotificationHandler( ILogger logger, @@ -12,7 +12,7 @@ public class UserPasswordChangedNotificationHandler( { public async Task Handle(UserPasswordChangedNotification notification, CancellationToken cancellationToken) { - logger.LogInformation("A notification {notificationType} has been received. Notification details: {notification}. Action performed by: {currentUserName}", + logger.LogInformation("A notification {notificationType} has been received. Notification details: {notification}. Action performed by: {currentUserName}", nameof(UserPasswordChangedNotification), JsonConvert.SerializeObject(notification, Formatting.Indented), currentUser.ToString()); diff --git a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequest.cs similarity index 58% rename from src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequest.cs rename to src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequest.cs index 5bc8205..249abd0 100644 --- a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequest.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequest.cs @@ -1,5 +1,5 @@ using MediatR; -namespace Company.Orion.Application.Core.Queries.UserGetById; +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetById; public record UserGetByIdRequest(string PublicId) : IRequest; diff --git a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequestHandler.cs similarity index 66% rename from src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequestHandler.cs index 7fd01c0..314323d 100644 --- a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdRequestHandler.cs @@ -1,12 +1,12 @@ using MediatR; using Company.Orion.Domain.Core.Services.Interfaces; -namespace Company.Orion.Application.Core.Queries.UserGetById; +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetById; public class UserGetByIdHandler(IUserService userService) : IRequestHandler { public async Task Handle(UserGetByIdRequest request, CancellationToken cancellationToken) { - return (UserGetByIdResponse) await userService.FindByIdAsync(request.PublicId); + return (UserGetByIdResponse)await userService.FindByIdAsync(request.PublicId); } } \ No newline at end of file diff --git a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdResponse.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdResponse.cs similarity index 91% rename from src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdResponse.cs rename to src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdResponse.cs index 3312dd6..edb3656 100644 --- a/src/Company.Orion.Application.Core/Queries/UserGetById/UserGetByIdResponse.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetById/UserGetByIdResponse.cs @@ -1,7 +1,7 @@ using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Queries.UserGetById; +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetById; public class UserGetByIdResponse { diff --git a/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequest.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequest.cs new file mode 100644 index 0000000..e860670 --- /dev/null +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequest.cs @@ -0,0 +1,7 @@ +using MediatR; +using Company.Orion.Domain.Core.Filters; +using Company.Orion.Domain.Core.ValueObjects.Pagination; + +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; + +public class UserGetPaginatedRequest : UserFilter, IRequest>; \ No newline at end of file diff --git a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequestHandler.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequestHandler.cs similarity index 89% rename from src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequestHandler.cs rename to src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequestHandler.cs index c7a7131..3e12b3f 100644 --- a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedRequestHandler.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedRequestHandler.cs @@ -2,7 +2,7 @@ using Company.Orion.Domain.Core.Services.Interfaces; using Company.Orion.Domain.Core.ValueObjects.Pagination; -namespace Company.Orion.Application.Core.Queries.UserGetPaginated; +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; public class UserGetPaginatedRequestHandler(IUserService userService) : IRequestHandler> diff --git a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedResponse.cs b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedResponse.cs similarity index 91% rename from src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedResponse.cs rename to src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedResponse.cs index aa49a33..56d89a9 100644 --- a/src/Company.Orion.Application.Core/Queries/UserGetPaginated/UserGetPaginatedResponse.cs +++ b/src/Company.Orion.Application.Core/UseCases/User/Queries/GetPaginated/UserGetPaginatedResponse.cs @@ -1,7 +1,7 @@ using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; -namespace Company.Orion.Application.Core.Queries.UserGetPaginated; +namespace Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; public class UserGetPaginatedResponse { @@ -11,7 +11,7 @@ public class UserGetPaginatedResponse public UserProfile Profile { get; set; } public DateTime LastUpdated { get; set; } public DateTime CreatedAt { get; set; } - + public static implicit operator UserGetPaginatedResponse(User user) { if (user is null) diff --git a/tests/Company.Orion.Test/Api/V1/AuthApiTest.cs b/tests/Company.Orion.Test/Api/V1/AuthApiTest.cs index 1e12cce..f777b25 100644 --- a/tests/Company.Orion.Test/Api/V1/AuthApiTest.cs +++ b/tests/Company.Orion.Test/Api/V1/AuthApiTest.cs @@ -1,11 +1,11 @@ -using Company.Orion.Application.Core.Commands.UserCreate; -using System.Net; +using System.Net; using System.Threading.Tasks; using Company.Orion.Test.Integration.Setup; using Company.Orion.Test.Shared.Faker; using Company.Orion.Application.Core.Commands.LoginWithCredentials; -using Company.Orion.Application.Core.Commands.LoginWithRefreshToken; using Xunit; +using Company.Orion.Application.Core.UseCases.User.Commands.Create; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; namespace Company.Orion.Test.Api.V1 { diff --git a/tests/Company.Orion.Test/Api/V1/UsersApiTest.cs b/tests/Company.Orion.Test/Api/V1/UsersApiTest.cs index 480d864..45313e9 100644 --- a/tests/Company.Orion.Test/Api/V1/UsersApiTest.cs +++ b/tests/Company.Orion.Test/Api/V1/UsersApiTest.cs @@ -1,14 +1,14 @@ -using Company.Orion.Application.Core.Commands.UserCreate; -using System; +using System; using System.Net; using System.Net.Http.Headers; using System.Threading.Tasks; using Company.Orion.Application.Core.Commands.UserChangePassword; -using Company.Orion.Application.Core.Queries.UserGetPaginated; using Company.Orion.Domain.Core.ValueObjects.Pagination; using Company.Orion.Test.Integration.Setup; using Company.Orion.Test.Shared.Faker; using Xunit; +using Company.Orion.Application.Core.UseCases.User.Commands.Create; +using Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; namespace Company.Orion.Test.Api.V1 { diff --git a/tests/Company.Orion.Test/Shared/Faker/UserFaker.cs b/tests/Company.Orion.Test/Shared/Faker/UserFaker.cs index a5e1fd7..2927717 100644 --- a/tests/Company.Orion.Test/Shared/Faker/UserFaker.cs +++ b/tests/Company.Orion.Test/Shared/Faker/UserFaker.cs @@ -1,7 +1,7 @@ using System; using Bogus; -using Company.Orion.Application.Core.Commands.UserCreate; -using Company.Orion.Application.Core.Commands.UserUpdate; +using Company.Orion.Application.Core.UseCases.User.Commands.Create; +using Company.Orion.Application.Core.UseCases.User.Commands.Update; using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.Entities.Enuns; using Company.Orion.Domain.Core.Extensions; diff --git a/tests/Company.Orion.Test/Unit/Controllers/AuthControllerTest.cs b/tests/Company.Orion.Test/Unit/Controllers/AuthControllerTest.cs index d630b59..b1d3580 100644 --- a/tests/Company.Orion.Test/Unit/Controllers/AuthControllerTest.cs +++ b/tests/Company.Orion.Test/Unit/Controllers/AuthControllerTest.cs @@ -16,6 +16,8 @@ using Company.Orion.Test.Shared.Faker; using Company.Orion.Test.Unit.Controllers.BaseController; using Xunit; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithCredentials; +using Company.Orion.Application.Core.UseCases.Auth.Commands.LoginWithRefreshToken; namespace Company.Orion.Test.Unit.Controllers; diff --git a/tests/Company.Orion.Test/Unit/Controllers/UsersControllerTest.cs b/tests/Company.Orion.Test/Unit/Controllers/UsersControllerTest.cs index 4100e3e..b86f608 100644 --- a/tests/Company.Orion.Test/Unit/Controllers/UsersControllerTest.cs +++ b/tests/Company.Orion.Test/Unit/Controllers/UsersControllerTest.cs @@ -2,8 +2,6 @@ using Microsoft.AspNetCore.Mvc; using Moq; using Company.Orion.Api.Controllers.V1; -using Company.Orion.Application.Core.Queries.UserGetById; -using Company.Orion.Application.Core.Queries.UserGetPaginated; using Company.Orion.Domain.Core.Entities; using Company.Orion.Domain.Core.ValueObjects.Pagination; using System.Collections.Generic; @@ -12,6 +10,8 @@ using Company.Orion.Test.Shared.Faker; using Company.Orion.Test.Unit.Controllers.BaseController; using Xunit; +using Company.Orion.Application.Core.UseCases.User.Queries.GetById; +using Company.Orion.Application.Core.UseCases.User.Queries.GetPaginated; namespace Company.Orion.Test.Unit.Controllers;