diff --git a/Orion.sln b/Orion.sln index 6fdbbde..a1ef27a 100644 --- a/Orion.sln +++ b/Orion.sln @@ -12,8 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4 - TEST", "4 - TEST", "{B3 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Test", "tests\Orion.Test\Orion.Test.csproj", "{AA8C7554-18FC-40D7-A318-123D2AAAB023}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Entities", "src\Orion.Entities\Orion.Entities.csproj", "{9500DFAF-83A8-4FFE-9564-DEC6601CD91E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Data", "src\Orion.Data\Orion.Data.csproj", "{7C877ABA-17F2-470A-99EB-5E172C6EA44B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orion.Resources", "src\Orion.Resources\Orion.Resources.csproj", "{105D1EB4-5091-493E-B75E-2131169CC9AC}" @@ -52,10 +50,6 @@ Global {AA8C7554-18FC-40D7-A318-123D2AAAB023}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA8C7554-18FC-40D7-A318-123D2AAAB023}.Release|Any CPU.ActiveCfg = Release|Any CPU {AA8C7554-18FC-40D7-A318-123D2AAAB023}.Release|Any CPU.Build.0 = Release|Any CPU - {9500DFAF-83A8-4FFE-9564-DEC6601CD91E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9500DFAF-83A8-4FFE-9564-DEC6601CD91E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9500DFAF-83A8-4FFE-9564-DEC6601CD91E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9500DFAF-83A8-4FFE-9564-DEC6601CD91E}.Release|Any CPU.Build.0 = Release|Any CPU {7C877ABA-17F2-470A-99EB-5E172C6EA44B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C877ABA-17F2-470A-99EB-5E172C6EA44B}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C877ABA-17F2-470A-99EB-5E172C6EA44B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -79,7 +73,6 @@ Global GlobalSection(NestedProjects) = preSolution {8C8470D6-0951-4B42-8935-779D8672F5B1} = {11C424D2-7519-493F-B4BB-A5901B33C56B} {AA8C7554-18FC-40D7-A318-123D2AAAB023} = {B333633B-8361-476B-A0A3-6B983D28904E} - {9500DFAF-83A8-4FFE-9564-DEC6601CD91E} = {67A0BEBC-35B1-436C-9F05-AC8F60AF1688} {7C877ABA-17F2-470A-99EB-5E172C6EA44B} = {434E301F-C36C-4203-B334-D3948130B660} {105D1EB4-5091-493E-B75E-2131169CC9AC} = {434E301F-C36C-4203-B334-D3948130B660} {8C70C31A-892F-4C8F-B7B0-A710C97A55FA} = {2D8CC498-597C-4415-95BF-48E623039F90} diff --git a/README.md b/README.md index d91091d..0a88747 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # **Orion Api** [![Build](https://github.com/vanderlan/Orion-Api/actions/workflows/sonar.yml/badge.svg)](https://github.com/vanderlan/Orion-Api/actions/workflows/sonar.yml) -[![Coverage Status](https://coveralls.io/repos/github/vanderlan/Orion-Api/badge.svg)](https://coveralls.io/github/vanderlan/Orion-Api) +[![Coverage Status](https://coveralls.io/repos/github/vanderlan/Orion-Api/badge.svg)](https://coveralls.io/github/vanderlan/Orion-Api) [![GitHub release](https://img.shields.io/github/release/vanderlan/Orion-Api.svg)](https://GitHub.com/vanderlan/Orion-Api/) [![GitHub repo size](https://img.shields.io/github/repo-size/vanderlan/Orion-Api)](https://github.com/vanderlan/Orion-Api) @@ -59,4 +59,7 @@ The main objective is to start projects with a clean and simple architecture, wi **Run database migrations** - dotnet ef database update -p Orion.Data -s Orion.Api --verbose \ No newline at end of file + dotnet ef database update -p Orion.Data -s Orion.Api --verbose + + +Author: https://github.com/vanderlan \ No newline at end of file diff --git a/src/Orion.Api/AutoMapper/Config/DomainToOutputProfile.cs b/src/Orion.Api/AutoMapper/Config/DomainToOutputProfile.cs index 4184317..10922d2 100644 --- a/src/Orion.Api/AutoMapper/Config/DomainToOutputProfile.cs +++ b/src/Orion.Api/AutoMapper/Config/DomainToOutputProfile.cs @@ -1,7 +1,7 @@ using AutoMapper; using Orion.Api.AutoMapper.Output; -using Orion.Entities.Domain; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities; +using Orion.Domain.Entities.ValueObjects.Pagination; namespace Orion.Api.AutoMapper.Config { diff --git a/src/Orion.Api/AutoMapper/Config/InputToDomainProfile.cs b/src/Orion.Api/AutoMapper/Config/InputToDomainProfile.cs index 3236222..b1c4d31 100644 --- a/src/Orion.Api/AutoMapper/Config/InputToDomainProfile.cs +++ b/src/Orion.Api/AutoMapper/Config/InputToDomainProfile.cs @@ -1,6 +1,6 @@ using AutoMapper; using Orion.Api.AutoMapper.Input; -using Orion.Entities.Domain; +using Orion.Domain.Entities; namespace Orion.Api.AutoMapper.Config { diff --git a/src/Orion.Api/AutoMapper/Input/UserInput.cs b/src/Orion.Api/AutoMapper/Input/UserInput.cs index 19060f9..b35d565 100644 --- a/src/Orion.Api/AutoMapper/Input/UserInput.cs +++ b/src/Orion.Api/AutoMapper/Input/UserInput.cs @@ -1,4 +1,4 @@ -using Orion.Entities.Enuns; +using Orion.Domain.Entities.Enuns; namespace Orion.Api.AutoMapper.Input { diff --git a/src/Orion.Api/AutoMapper/Output/UserOutput.cs b/src/Orion.Api/AutoMapper/Output/UserOutput.cs index f49ff6b..b6b4656 100644 --- a/src/Orion.Api/AutoMapper/Output/UserOutput.cs +++ b/src/Orion.Api/AutoMapper/Output/UserOutput.cs @@ -1,5 +1,5 @@ -using Orion.Entities.Enuns; +using Orion.Domain.Entities.Enuns; using Orion.Domain.Authentication; namespace Orion.Api.AutoMapper.Output diff --git a/src/Orion.Api/Controllers/AuthController.cs b/src/Orion.Api/Controllers/AuthController.cs index 606ccf8..8523633 100644 --- a/src/Orion.Api/Controllers/AuthController.cs +++ b/src/Orion.Api/Controllers/AuthController.cs @@ -6,7 +6,7 @@ using Orion.Api.Models; using Orion.Domain.Extensions; using Orion.Domain.Services.Interfaces; -using Orion.Entities.Domain; +using Orion.Domain.Entities; using System.IdentityModel.Tokens.Jwt; namespace Orion.Api.Controllers diff --git a/src/Orion.Api/Controllers/CustomersController.cs b/src/Orion.Api/Controllers/CustomersController.cs index 53dec04..2b73a06 100644 --- a/src/Orion.Api/Controllers/CustomersController.cs +++ b/src/Orion.Api/Controllers/CustomersController.cs @@ -4,11 +4,11 @@ using Orion.Api.Attributes; using Orion.Api.AutoMapper.Input; using Orion.Api.AutoMapper.Output; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces; using static Orion.Domain.Authentication.AuthorizationConfiguration; +using Orion.Domain.Entities; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; namespace Orion.Api.Controllers { diff --git a/src/Orion.Api/Controllers/UsersController.cs b/src/Orion.Api/Controllers/UsersController.cs index 09a07e4..185378f 100644 --- a/src/Orion.Api/Controllers/UsersController.cs +++ b/src/Orion.Api/Controllers/UsersController.cs @@ -4,11 +4,11 @@ using Orion.Api.Attributes; using Orion.Api.AutoMapper.Input; using Orion.Api.AutoMapper.Output; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces; using static Orion.Domain.Authentication.AuthorizationConfiguration; +using Orion.Domain.Entities; namespace Orion.Api.Controllers { diff --git a/src/Orion.Api/Orion.Api.csproj b/src/Orion.Api/Orion.Api.csproj index 411a86d..7b45c44 100644 --- a/src/Orion.Api/Orion.Api.csproj +++ b/src/Orion.Api/Orion.Api.csproj @@ -37,7 +37,6 @@ - diff --git a/src/Orion.Data/Context/DataContext.cs b/src/Orion.Data/Context/DataContext.cs index e48df35..3f4c6dc 100644 --- a/src/Orion.Data/Context/DataContext.cs +++ b/src/Orion.Data/Context/DataContext.cs @@ -3,8 +3,8 @@ using System.Linq; using System.Threading.Tasks; using Orion.Data.Mapping; -using Orion.Entities.Domain; using Microsoft.Extensions.Configuration; +using Orion.Domain.Entities; namespace Orion.Data.Context { diff --git a/src/Orion.Data/Mapping/CustomerMapping.cs b/src/Orion.Data/Mapping/CustomerMapping.cs index e95b8d0..e8ad500 100644 --- a/src/Orion.Data/Mapping/CustomerMapping.cs +++ b/src/Orion.Data/Mapping/CustomerMapping.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Orion.Entities.Domain; +using Orion.Domain.Entities; namespace Orion.Data.Mapping { diff --git a/src/Orion.Data/Mapping/RefreshTokenMapping.cs b/src/Orion.Data/Mapping/RefreshTokenMapping.cs index 9e73c37..13332d6 100644 --- a/src/Orion.Data/Mapping/RefreshTokenMapping.cs +++ b/src/Orion.Data/Mapping/RefreshTokenMapping.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; -using Orion.Entities.Domain; +using Orion.Domain.Entities; namespace Orion.Data.Mapping { diff --git a/src/Orion.Data/Mapping/UserMapping.cs b/src/Orion.Data/Mapping/UserMapping.cs index a93b8c7..b15b06e 100644 --- a/src/Orion.Data/Mapping/UserMapping.cs +++ b/src/Orion.Data/Mapping/UserMapping.cs @@ -1,8 +1,8 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Builders; using System; -using Orion.Entities.Domain; -using Orion.Entities.Enuns; +using Orion.Domain.Entities.Enuns; +using Orion.Domain.Entities; namespace Orion.Data.Mapping { diff --git a/src/Orion.Data/Migrations/20210311124539_Initial.Designer.cs b/src/Orion.Data/Migrations/20210311124539_Initial.Designer.cs index 18ebd60..38d5b8e 100644 --- a/src/Orion.Data/Migrations/20210311124539_Initial.Designer.cs +++ b/src/Orion.Data/Migrations/20210311124539_Initial.Designer.cs @@ -21,7 +21,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasAnnotation("ProductVersion", "5.0.3") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Orion.Entities.Domain.Customer", b => + modelBuilder.Entity("Orion.Domain.Entities.Customer", b => { b.Property("CustomerId") .ValueGeneratedOnAdd() @@ -52,7 +52,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Customer"); }); - modelBuilder.Entity("Orion.Entities.Domain.RefreshToken", b => + modelBuilder.Entity("Orion.Domain.Entities.RefreshToken", b => { b.Property("Refreshtoken") .HasMaxLength(50) @@ -82,7 +82,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("RefreshToken"); }); - modelBuilder.Entity("Orion.Entities.Domain.User", b => + modelBuilder.Entity("Orion.Domain.Entities.User", b => { b.Property("UserId") .ValueGeneratedOnAdd() diff --git a/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs b/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs index 3b12c3b..73d2437 100644 --- a/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs +++ b/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs @@ -21,7 +21,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasAnnotation("ProductVersion", "5.0.3") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Orion.Entities.Domain.Customer", b => + modelBuilder.Entity("Orion.Domain.Entities.Domain.Customer", b => { b.Property("CustomerId") .ValueGeneratedOnAdd() @@ -52,7 +52,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("Customer"); }); - modelBuilder.Entity("Orion.Entities.Domain.RefreshToken", b => + modelBuilder.Entity("Orion.Domain.Entities.RefreshToken", b => { b.Property("Refreshtoken") .HasMaxLength(300) @@ -82,7 +82,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.ToTable("RefreshToken"); }); - modelBuilder.Entity("Orion.Entities.Domain.User", b => + modelBuilder.Entity("Orion.Domain.Entities.User", b => { b.Property("UserId") .ValueGeneratedOnAdd() diff --git a/src/Orion.Data/Migrations/DataContextModelSnapshot.cs b/src/Orion.Data/Migrations/DataContextModelSnapshot.cs index 84ee82d..8ba03f6 100644 --- a/src/Orion.Data/Migrations/DataContextModelSnapshot.cs +++ b/src/Orion.Data/Migrations/DataContextModelSnapshot.cs @@ -20,7 +20,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasAnnotation("ProductVersion", "5.0.3") .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn); - modelBuilder.Entity("Orion.Entities.Domain.Customer", b => + modelBuilder.Entity("Orion.Domain.Entities.Customer", b => { b.Property("CustomerId") .ValueGeneratedOnAdd() @@ -51,7 +51,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("Customer"); }); - modelBuilder.Entity("Orion.Entities.Domain.RefreshToken", b => + modelBuilder.Entity("Orion.Domain.Entities.RefreshToken", b => { b.Property("Refreshtoken") .HasMaxLength(300) @@ -81,7 +81,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.ToTable("RefreshToken"); }); - modelBuilder.Entity("Orion.Entities.Domain.User", b => + modelBuilder.Entity("Orion.Domain.Entities.User", b => { b.Property("UserId") .ValueGeneratedOnAdd() diff --git a/src/Orion.Data/Orion.Data.csproj b/src/Orion.Data/Orion.Data.csproj index 388adb8..37c8c65 100644 --- a/src/Orion.Data/Orion.Data.csproj +++ b/src/Orion.Data/Orion.Data.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Orion.Data/Repository/Generic/BaseEntityRepository.cs b/src/Orion.Data/Repository/Generic/BaseEntityRepository.cs index 00f1bac..0877d30 100644 --- a/src/Orion.Data/Repository/Generic/BaseEntityRepository.cs +++ b/src/Orion.Data/Repository/Generic/BaseEntityRepository.cs @@ -5,9 +5,9 @@ using System.Linq.Expressions; using System.Threading.Tasks; using Orion.Data.Context; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities; namespace Orion.Data.Repository.Generic { diff --git a/src/Orion.Data/Repository/Implementations/CustomerRepository.cs b/src/Orion.Data/Repository/Implementations/CustomerRepository.cs index fd437af..a800900 100644 --- a/src/Orion.Data/Repository/Implementations/CustomerRepository.cs +++ b/src/Orion.Data/Repository/Implementations/CustomerRepository.cs @@ -1,8 +1,8 @@ using Orion.Data.Context; using Orion.Data.Repository.Generic; +using Orion.Domain.Entities; using Orion.Domain.Repositories; -using Orion.Entities.Domain; -using Orion.Entities.Filter; +using Orion.Domain.Entities.Filter; using System.Linq; namespace Orion.Data.Repository.Implementations diff --git a/src/Orion.Data/Repository/Implementations/RefreshTokenRepository.cs b/src/Orion.Data/Repository/Implementations/RefreshTokenRepository.cs index 28f0d81..59dad81 100644 --- a/src/Orion.Data/Repository/Implementations/RefreshTokenRepository.cs +++ b/src/Orion.Data/Repository/Implementations/RefreshTokenRepository.cs @@ -1,7 +1,7 @@ using Orion.Data.Context; using Orion.Data.Repository.Generic; +using Orion.Domain.Entities; using Orion.Domain.Repositories; -using Orion.Entities.Domain; namespace Orion.Data.Repository.Implementations { diff --git a/src/Orion.Data/Repository/Implementations/UserRepository.cs b/src/Orion.Data/Repository/Implementations/UserRepository.cs index d65d968..0e4f68f 100644 --- a/src/Orion.Data/Repository/Implementations/UserRepository.cs +++ b/src/Orion.Data/Repository/Implementations/UserRepository.cs @@ -1,9 +1,9 @@ using Microsoft.EntityFrameworkCore; using Orion.Data.Context; using Orion.Data.Repository.Generic; +using Orion.Domain.Entities; using Orion.Domain.Repositories; -using Orion.Entities.Domain; -using Orion.Entities.Filter; +using Orion.Domain.Entities.Filter; using System.Linq; using System.Threading.Tasks; diff --git a/src/Orion.Entities/Domain/BaseEntity.cs b/src/Orion.Domain/Entities/BaseEntity.cs similarity index 86% rename from src/Orion.Entities/Domain/BaseEntity.cs rename to src/Orion.Domain/Entities/BaseEntity.cs index d77dacf..edb6508 100644 --- a/src/Orion.Entities/Domain/BaseEntity.cs +++ b/src/Orion.Domain/Entities/BaseEntity.cs @@ -1,6 +1,6 @@ using System; -namespace Orion.Entities.Domain +namespace Orion.Domain.Entities { public abstract class BaseEntity { diff --git a/src/Orion.Entities/Domain/Customer.cs b/src/Orion.Domain/Entities/Customer.cs similarity index 81% rename from src/Orion.Entities/Domain/Customer.cs rename to src/Orion.Domain/Entities/Customer.cs index 10cdd5d..95bddb4 100644 --- a/src/Orion.Entities/Domain/Customer.cs +++ b/src/Orion.Domain/Entities/Customer.cs @@ -1,4 +1,4 @@ -namespace Orion.Entities.Domain +namespace Orion.Domain.Entities { public class Customer : BaseEntity { diff --git a/src/Orion.Entities/Enuns/UserProfile.cs b/src/Orion.Domain/Entities/Enuns/UserProfile.cs similarity index 82% rename from src/Orion.Entities/Enuns/UserProfile.cs rename to src/Orion.Domain/Entities/Enuns/UserProfile.cs index 3a86d20..992649c 100644 --- a/src/Orion.Entities/Enuns/UserProfile.cs +++ b/src/Orion.Domain/Entities/Enuns/UserProfile.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace Orion.Entities.Enuns +namespace Orion.Domain.Entities.Enuns { public enum UserProfile { diff --git a/src/Orion.Entities/Filter/BaseFilter.cs b/src/Orion.Domain/Entities/Filter/BaseFilter.cs similarity index 84% rename from src/Orion.Entities/Filter/BaseFilter.cs rename to src/Orion.Domain/Entities/Filter/BaseFilter.cs index 257b5b4..e204fb2 100644 --- a/src/Orion.Entities/Filter/BaseFilter.cs +++ b/src/Orion.Domain/Entities/Filter/BaseFilter.cs @@ -1,4 +1,4 @@ -namespace Orion.Entities.Filter +namespace Orion.Domain.Entities.Filter { public class BaseFilter { diff --git a/src/Orion.Entities/Domain/RefreshToken.cs b/src/Orion.Domain/Entities/RefreshToken.cs similarity index 82% rename from src/Orion.Entities/Domain/RefreshToken.cs rename to src/Orion.Domain/Entities/RefreshToken.cs index 23f8a74..94e1566 100644 --- a/src/Orion.Entities/Domain/RefreshToken.cs +++ b/src/Orion.Domain/Entities/RefreshToken.cs @@ -1,4 +1,4 @@ -namespace Orion.Entities.Domain +namespace Orion.Domain.Entities { public class RefreshToken : BaseEntity { diff --git a/src/Orion.Entities/Domain/User.cs b/src/Orion.Domain/Entities/User.cs similarity index 80% rename from src/Orion.Entities/Domain/User.cs rename to src/Orion.Domain/Entities/User.cs index 6a1bc72..4ed4386 100644 --- a/src/Orion.Entities/Domain/User.cs +++ b/src/Orion.Domain/Entities/User.cs @@ -1,6 +1,6 @@ -using Orion.Entities.Enuns; +using Orion.Domain.Entities.Enuns; -namespace Orion.Entities.Domain +namespace Orion.Domain.Entities { public class User : BaseEntity { diff --git a/src/Orion.Entities/ValueObjects/Pagination/PagedList.cs b/src/Orion.Domain/Entities/ValueObjects/Pagination/PagedList.cs similarity index 84% rename from src/Orion.Entities/ValueObjects/Pagination/PagedList.cs rename to src/Orion.Domain/Entities/ValueObjects/Pagination/PagedList.cs index 45bf8db..752a277 100644 --- a/src/Orion.Entities/ValueObjects/Pagination/PagedList.cs +++ b/src/Orion.Domain/Entities/ValueObjects/Pagination/PagedList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Orion.Entities.ValueObjects.Pagination +namespace Orion.Domain.Entities.ValueObjects.Pagination { public class PagedList { diff --git a/src/Orion.Domain/Orion.Domain.csproj b/src/Orion.Domain/Orion.Domain.csproj index c7133d2..97a9918 100644 --- a/src/Orion.Domain/Orion.Domain.csproj +++ b/src/Orion.Domain/Orion.Domain.csproj @@ -5,7 +5,6 @@ - diff --git a/src/Orion.Domain/Repositories/ICustomerRepository.cs b/src/Orion.Domain/Repositories/ICustomerRepository.cs index bb84688..16928cb 100644 --- a/src/Orion.Domain/Repositories/ICustomerRepository.cs +++ b/src/Orion.Domain/Repositories/ICustomerRepository.cs @@ -1,8 +1,8 @@ -using System.Threading.Tasks; +using Orion.Domain.Entities; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Repositories.Base; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using System.Threading.Tasks; namespace Orion.Domain.Repositories { diff --git a/src/Orion.Domain/Repositories/IRefreshTokenRepository.cs b/src/Orion.Domain/Repositories/IRefreshTokenRepository.cs index 4829e2d..05a1657 100644 --- a/src/Orion.Domain/Repositories/IRefreshTokenRepository.cs +++ b/src/Orion.Domain/Repositories/IRefreshTokenRepository.cs @@ -1,5 +1,5 @@ +using Orion.Domain.Entities; using Orion.Domain.Repositories.Base; -using Orion.Entities.Domain; namespace Orion.Domain.Repositories { diff --git a/src/Orion.Domain/Repositories/IUserRepository.cs b/src/Orion.Domain/Repositories/IUserRepository.cs index a159d80..9fb5a43 100644 --- a/src/Orion.Domain/Repositories/IUserRepository.cs +++ b/src/Orion.Domain/Repositories/IUserRepository.cs @@ -1,8 +1,8 @@ -using System.Threading.Tasks; +using Orion.Domain.Entities; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Repositories.Base; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using System.Threading.Tasks; namespace Orion.Domain.Repositories { diff --git a/src/Orion.Domain/Services/CustomerService.cs b/src/Orion.Domain/Services/CustomerService.cs index 25d1625..d3d6abd 100644 --- a/src/Orion.Domain/Services/CustomerService.cs +++ b/src/Orion.Domain/Services/CustomerService.cs @@ -2,9 +2,9 @@ using Orion.Domain.Exceptions; using Orion.Domain.Services.Interfaces; using Orion.Domain.Repositories.UnitOfWork; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities; +using Orion.Domain.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; namespace Orion.Domain.Services { diff --git a/src/Orion.Domain/Services/Interfaces/ICustomerService.cs b/src/Orion.Domain/Services/Interfaces/ICustomerService.cs index edd9b86..80cfb3b 100644 --- a/src/Orion.Domain/Services/Interfaces/ICustomerService.cs +++ b/src/Orion.Domain/Services/Interfaces/ICustomerService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces.Base; +using Orion.Domain.Entities; namespace Orion.Domain.Services.Interfaces { diff --git a/src/Orion.Domain/Services/Interfaces/IUserService.cs b/src/Orion.Domain/Services/Interfaces/IUserService.cs index c163cee..1505287 100644 --- a/src/Orion.Domain/Services/Interfaces/IUserService.cs +++ b/src/Orion.Domain/Services/Interfaces/IUserService.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces.Base; +using Orion.Domain.Entities; namespace Orion.Domain.Services.Interfaces { diff --git a/src/Orion.Domain/Services/UserService.cs b/src/Orion.Domain/Services/UserService.cs index 49d666f..9984608 100644 --- a/src/Orion.Domain/Services/UserService.cs +++ b/src/Orion.Domain/Services/UserService.cs @@ -5,11 +5,11 @@ using Orion.Domain.Extensions; using Orion.Domain.Services.Interfaces; using Orion.Domain.Repositories.UnitOfWork; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Resources; using static Orion.Resources.Messages.MessagesKeys; +using Orion.Domain.Entities; namespace Orion.Domain.Services { diff --git a/src/Orion.Entities/Orion.Entities.csproj b/src/Orion.Entities/Orion.Entities.csproj deleted file mode 100644 index 082dac9..0000000 --- a/src/Orion.Entities/Orion.Entities.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - net7.0 - - - diff --git a/tests/Orion.Test/Api/Controllers/AuthControllerTest.cs b/tests/Orion.Test/Api/Controllers/AuthControllerTest.cs index c07a852..9f2ac99 100644 --- a/tests/Orion.Test/Api/Controllers/AuthControllerTest.cs +++ b/tests/Orion.Test/Api/Controllers/AuthControllerTest.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using Orion.Api.Controllers; using Orion.Api.Models; -using Orion.Entities.Domain; using Orion.Domain.Services.Interfaces; using Orion.Test.MotherObjects; using Xunit; using Microsoft.Extensions.Configuration; using System.Collections.Generic; using Orion.Test.Api.Controllers.BaseController; +using Orion.Domain.Entities; namespace Orion.Test.Api.Controllers { diff --git a/tests/Orion.Test/Api/Controllers/CustomersControllerTest.cs b/tests/Orion.Test/Api/Controllers/CustomersControllerTest.cs index c3027a6..f753062 100644 --- a/tests/Orion.Test/Api/Controllers/CustomersControllerTest.cs +++ b/tests/Orion.Test/Api/Controllers/CustomersControllerTest.cs @@ -4,9 +4,9 @@ using System.Threading.Tasks; using Orion.Api.AutoMapper.Output; using Orion.Api.Controllers; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces; using Orion.Test.MotherObjects; using Xunit; diff --git a/tests/Orion.Test/Api/Controllers/UsersControllerTest.cs b/tests/Orion.Test/Api/Controllers/UsersControllerTest.cs index 9ac650a..6a7c5b5 100644 --- a/tests/Orion.Test/Api/Controllers/UsersControllerTest.cs +++ b/tests/Orion.Test/Api/Controllers/UsersControllerTest.cs @@ -4,13 +4,13 @@ using System.Threading.Tasks; using Orion.Api.AutoMapper.Output; using Orion.Api.Controllers; -using Orion.Entities.Domain; -using Orion.Entities.Filter; -using Orion.Entities.ValueObjects.Pagination; +using Orion.Domain.Entities.Filter; +using Orion.Domain.Entities.ValueObjects.Pagination; using Orion.Domain.Services.Interfaces; using Orion.Test.MotherObjects; using Xunit; using Orion.Test.Api.Controllers.BaseController; +using Orion.Domain.Entities; namespace Orion.Test.Api.Controllers { diff --git a/tests/Orion.Test/Domain/Services/CustomerServiceTest.cs b/tests/Orion.Test/Domain/Services/CustomerServiceTest.cs index ab0ae42..5689fe7 100644 --- a/tests/Orion.Test/Domain/Services/CustomerServiceTest.cs +++ b/tests/Orion.Test/Domain/Services/CustomerServiceTest.cs @@ -1,14 +1,14 @@ using Microsoft.Extensions.DependencyInjection; using System.Linq; using System.Threading.Tasks; -using Orion.Entities.Filter; +using Orion.Domain.Entities.Filter; using Orion.Domain.Exceptions; using Orion.Domain.Services.Interfaces; using Orion.Test.Configuration; using Orion.Test.MotherObjects; using Xunit; using Orion.Test.Domain.Services.BaseService; -using Orion.Entities.Domain; +using Orion.Domain.Entities; namespace Orion.Test.Domain.Services { diff --git a/tests/Orion.Test/Domain/Services/UserServiceTest.cs b/tests/Orion.Test/Domain/Services/UserServiceTest.cs index 3be2b90..42200ca 100644 --- a/tests/Orion.Test/Domain/Services/UserServiceTest.cs +++ b/tests/Orion.Test/Domain/Services/UserServiceTest.cs @@ -2,8 +2,7 @@ using Microsoft.Extensions.Localization; using System; using System.Threading.Tasks; -using Orion.Entities.Domain; -using Orion.Entities.Filter; +using Orion.Domain.Entities.Filter; using Orion.Resources; using Orion.Domain.Exceptions; using Orion.Domain.Extensions; @@ -13,6 +12,7 @@ using Xunit; using static Orion.Resources.Messages.MessagesKeys; using Orion.Test.Domain.Services.BaseService; +using Orion.Domain.Entities; namespace Orion.Test.Domain.Services { diff --git a/tests/Orion.Test/Faker/CustomerFaker.cs b/tests/Orion.Test/Faker/CustomerFaker.cs index 2be8c10..e5b28d7 100644 --- a/tests/Orion.Test/Faker/CustomerFaker.cs +++ b/tests/Orion.Test/Faker/CustomerFaker.cs @@ -1,6 +1,6 @@ using Bogus; using Orion.Api.AutoMapper.Input; -using Orion.Entities.Domain; +using Orion.Domain.Entities; namespace Orion.Test.MotherObjects { diff --git a/tests/Orion.Test/Faker/RefreshTokenFaker.cs b/tests/Orion.Test/Faker/RefreshTokenFaker.cs index a4f51c3..08864bf 100644 --- a/tests/Orion.Test/Faker/RefreshTokenFaker.cs +++ b/tests/Orion.Test/Faker/RefreshTokenFaker.cs @@ -1,5 +1,5 @@ using Bogus; -using Orion.Entities.Domain; +using Orion.Domain.Entities; using System; namespace Orion.Test.MotherObjects diff --git a/tests/Orion.Test/Faker/UserFaker.cs b/tests/Orion.Test/Faker/UserFaker.cs index e4a57d8..156625a 100644 --- a/tests/Orion.Test/Faker/UserFaker.cs +++ b/tests/Orion.Test/Faker/UserFaker.cs @@ -1,7 +1,7 @@ using Bogus; using Orion.Api.AutoMapper.Input; -using Orion.Entities.Domain; -using Orion.Entities.Enuns; +using Orion.Domain.Entities; +using Orion.Domain.Entities.Enuns; using System; namespace Orion.Test.MotherObjects @@ -19,7 +19,6 @@ public static User Get() .Generate(); } - public static UserInput GetInput() { return new Faker() diff --git a/tests/Orion.Test/Orion.Test.csproj b/tests/Orion.Test/Orion.Test.csproj index 72a8d31..439dc4c 100644 --- a/tests/Orion.Test/Orion.Test.csproj +++ b/tests/Orion.Test/Orion.Test.csproj @@ -35,7 +35,6 @@ -