Remove Entities project to keep clean the project structure

vanderlan · Oct 13, 2023 · 18430be · 18430be
1 parent 1699e0f
commit 18430be
Show file tree

Hide file tree

Showing 47 changed files with 83 additions and 99 deletions.
diff --git 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
@@ -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) <a href="https://codeclimate.com/github/vanderlan/Orion-Api/maintainability"><img src="https://api.codeclimate.com/v1/badges/692bddf02255681fe599/maintainability" /></a> 
+[![Coverage Status](https://coveralls.io/repos/github/vanderlan/Orion-Api/badge.svg)](https://coveralls.io/github/vanderlan/Orion-Api) <a href="https://codeclimate.com/github/vanderlan/Orion-Api/maintainability"><img src="https://api.codeclimate.com/v1/badges/76a30970ddd45c75129b/maintainability" /></a>
 [![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
+	dotnet ef database update -p Orion.Data -s Orion.Api --verbose
+
+
+Author: https://github.com/vanderlan
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -37,7 +37,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Orion.Domain\Orion.Domain.csproj" />
-    <ProjectReference Include="..\Orion.Entities\Orion.Entities.csproj" />
     <ProjectReference Include="..\Orion.Ioc\Orion.Ioc.csproj" />
     <ProjectReference Include="..\Orion.Resources\Orion.Resources.csproj" />
   </ItemGroup>

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs b/src/Orion.Data/Migrations/20210313163754_ChangeRefreshTokenSize.Designer.cs
diff --git 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<int>("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<string>("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<int>("UserId")
                         .ValueGeneratedOnAdd()

diff --git a/src/Orion.Data/Orion.Data.csproj b/src/Orion.Data/Orion.Data.csproj
@@ -21,7 +21,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Orion.Domain\Orion.Domain.csproj" />
-    <ProjectReference Include="..\Orion.Entities\Orion.Entities.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git 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
@@ -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
@@ -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
@@ -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 → src/Orion.Domain/Entities/BaseEntity.cs b/src/Orion.Entities/Domain/BaseEntity.cs → 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 → src/Orion.Domain/Entities/Customer.cs b/src/Orion.Entities/Domain/Customer.cs → 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 → ...rion.Domain/Entities/Enuns/UserProfile.cs b/src/Orion.Entities/Enuns/UserProfile.cs → ...rion.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 → ...rion.Domain/Entities/Filter/BaseFilter.cs b/src/Orion.Entities/Filter/BaseFilter.cs → ...rion.Domain/Entities/Filter/BaseFilter.cs
@@ -1,4 +1,4 @@
-namespace Orion.Entities.Filter
+namespace Orion.Domain.Entities.Filter
 {
     public class BaseFilter<T>
     {

diff --git a/src/Orion.Entities/Domain/RefreshToken.cs → src/Orion.Domain/Entities/RefreshToken.cs b/src/Orion.Entities/Domain/RefreshToken.cs → 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 → src/Orion.Domain/Entities/User.cs b/src/Orion.Entities/Domain/User.cs → 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/...ties/ValueObjects/Pagination/PagedList.cs → ...ties/ValueObjects/Pagination/PagedList.cs b/...ties/ValueObjects/Pagination/PagedList.cs → ...ties/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<T>
     {

diff --git a/src/Orion.Domain/Orion.Domain.csproj b/src/Orion.Domain/Orion.Domain.csproj
@@ -5,7 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Orion.Entities\Orion.Entities.csproj" />
     <ProjectReference Include="..\Orion.Resources\Orion.Resources.csproj" />
   </ItemGroup>
 

diff --git 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
@@ -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
@@ -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
 {