Remove redundant application layer

Typiqally · Oct 27, 2021 · a0bce73 · a0bce73
1 parent eaf58f3
commit a0bce73
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 170 deletions.
diff --git a/Typiqally.Application.Abstractions/Dtos/WeatherForecastDto.cs b/Typiqally.Application.Abstractions/Dtos/WeatherForecastDto.cs
diff --git a/Typiqally.Application.Abstractions/Services/IWeatherForecastService.cs b/Typiqally.Application.Abstractions/Services/IWeatherForecastService.cs
diff --git a/Typiqally.Application.Abstractions/Typiqally.Application.Abstractions.csproj b/Typiqally.Application.Abstractions/Typiqally.Application.Abstractions.csproj
diff --git a/Typiqally.Application.IoC/ApplicationServiceCollectionExtensions.cs b/Typiqally.Application.IoC/ApplicationServiceCollectionExtensions.cs
diff --git a/Typiqally.Application.IoC/Typiqally.Application.IoC.csproj b/Typiqally.Application.IoC/Typiqally.Application.IoC.csproj
diff --git a/Typiqally.Application/Profiles/WeatherForecastDtoMappingProfile.cs b/Typiqally.Application/Profiles/WeatherForecastDtoMappingProfile.cs
diff --git a/Typiqally.Application/Services/WeatherForecastService.cs b/Typiqally.Application/Services/WeatherForecastService.cs
diff --git a/Typiqally.Application/Typiqally.Application.csproj b/Typiqally.Application/Typiqally.Application.csproj
diff --git a/...Services/IWeatherForecastDomainService.cs → ...tions/Services/IWeatherForecastService.cs b/...Services/IWeatherForecastDomainService.cs → ...tions/Services/IWeatherForecastService.cs
@@ -4,7 +4,7 @@
 
 namespace Typiqally.Domain.Abstractions.Services
 {
-    public interface IWeatherForecastDomainService
+    public interface IWeatherForecastService
     {
         Task<IEnumerable<WeatherForecast>> GetLatestForecastsAsync();
     }

diff --git a/Typiqally.Domain.IoC/DomainServiceCollectionExtensions.cs b/Typiqally.Domain.IoC/DomainServiceCollectionExtensions.cs
@@ -13,7 +13,7 @@ public static IServiceCollection AddDomain(this IServiceCollection services, ICo
         {
             services.AddPersistence(configuration);
 
-            services.AddScoped<IWeatherForecastDomainService, WeatherForecastDomainService>();
+            services.AddScoped<IWeatherForecastService, WeatherForecastService>();
 
             // AutoMapper profiles
             services.AddAutoMapper(config =>

diff --git a/.../Services/WeatherForecastDomainService.cs → ...Domain/Services/WeatherForecastService.cs b/.../Services/WeatherForecastDomainService.cs → ...Domain/Services/WeatherForecastService.cs
@@ -8,12 +8,12 @@
 
 namespace Typiqally.Domain.Services
 {
-    public class WeatherForecastDomainService : IWeatherForecastDomainService
+    public class WeatherForecastService : IWeatherForecastService
     {
         private readonly IMapper _mapper;
         private readonly IWeatherForecastRepository _repository;
 
-        public WeatherForecastDomainService(IMapper mapper, IWeatherForecastRepository repository)
+        public WeatherForecastService(IMapper mapper, IWeatherForecastRepository repository)
         {
             _mapper = mapper;
             _repository = repository;

diff --git a/Typiqally.Presentation.WebApi/Controllers/WeatherForecastController.cs b/Typiqally.Presentation.WebApi/Controllers/WeatherForecastController.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using AutoMapper;
 using Microsoft.AspNetCore.Mvc;
-using Typiqally.Application.Abstractions.Services;
+using Typiqally.Domain.Abstractions.Services;
 using Typiqally.Presentation.WebApi.ViewModels;
 
 namespace Typiqally.Presentation.WebApi.Controllers

diff --git a/Typiqally.Presentation.WebApi/Profiles/WeatherForecastViewModelMappingProfile.cs b/Typiqally.Presentation.WebApi/Profiles/WeatherForecastViewModelMappingProfile.cs
@@ -1,5 +1,5 @@
 using AutoMapper;
-using Typiqally.Application.Abstractions.Dtos;
+using Typiqally.Domain.Abstractions.Models;
 using Typiqally.Presentation.WebApi.ViewModels;
 
 namespace Typiqally.Presentation.WebApi.Profiles
@@ -8,8 +8,8 @@ public class WeatherForecastViewModelMappingProfile : Profile
     {
         public WeatherForecastViewModelMappingProfile()
         {
-            CreateMap<WeatherForecastViewModel, WeatherForecastDto>();
-            CreateMap<WeatherForecastDto, WeatherForecastViewModel>();
+            CreateMap<WeatherForecastViewModel, WeatherForecast>();
+            CreateMap<WeatherForecast, WeatherForecastViewModel>();
         }
     }
 }
diff --git a/Typiqally.Presentation.WebApi/Startup.cs b/Typiqally.Presentation.WebApi/Startup.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
-using Typiqally.Application.IoC;
+using Typiqally.Domain.IoC;
 using Typiqally.Presentation.WebApi.Profiles;
 
 namespace Typiqally.Presentation.WebApi
@@ -21,15 +21,15 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
+            services.AddDomain(Configuration);
+
             services.AddControllers();
             services.AddSwaggerGen(c => { c.SwaggerDoc("v1", new OpenApiInfo {Title = "Typiqally.Presentation.WebApi", Version = "v1"}); });
 
             services.AddAutoMapper(config =>
             {
                 config.AddProfile<WeatherForecastViewModelMappingProfile>();
             });
-
-            services.AddApplication(Configuration);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

diff --git a/Typiqally.Presentation.WebApi/Typiqally.Presentation.WebApi.csproj b/Typiqally.Presentation.WebApi/Typiqally.Presentation.WebApi.csproj
@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Typiqally.Application.IoC\Typiqally.Application.IoC.csproj" />
+      <ProjectReference Include="..\Typiqally.Domain.IoC\Typiqally.Domain.IoC.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/Typiqally.sln b/Typiqally.sln
@@ -6,18 +6,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Domain", "Typiqal
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Persistence", "Typiqally.Persistence\Typiqally.Persistence.csproj", "{7045ECAC-477F-40CE-8EF4-819372427B9F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Application", "Typiqally.Application\Typiqally.Application.csproj", "{E53C04AE-27DF-4317-8CA0-053F58BF77A6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Persistence.Abstractions", "Typiqally.Persistence.Abstractions\Typiqally.Persistence.Abstractions.csproj", "{EC5CA443-31B6-4B11-A729-BD40DC8A363A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Domain.Abstractions", "Typiqally.Domain.Abstractions\Typiqally.Domain.Abstractions.csproj", "{47EDD859-9673-48DD-9FE5-5FD2D173AB62}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Application.Abstractions", "Typiqally.Application.Abstractions\Typiqally.Application.Abstractions.csproj", "{8DE7B876-0CEE-4BBF-A9E9-4A374D99C2CC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Domain.IoC", "Typiqally.Domain.IoC\Typiqally.Domain.IoC.csproj", "{D5DA7DF8-443D-4F10-834B-2BD7A9E7CE00}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Application.IoC", "Typiqally.Application.IoC\Typiqally.Application.IoC.csproj", "{DB258413-4703-4BBD-96EE-1403EFDE2993}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Typiqally.Persistence.IoC", "Typiqally.Persistence.IoC\Typiqally.Persistence.IoC.csproj", "{BC228A9C-23BF-4A87-8958-BB8BF9B1685C}"
 EndProject
 Global
@@ -38,10 +32,6 @@ Global
 		{7045ECAC-477F-40CE-8EF4-819372427B9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7045ECAC-477F-40CE-8EF4-819372427B9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7045ECAC-477F-40CE-8EF4-819372427B9F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E53C04AE-27DF-4317-8CA0-053F58BF77A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E53C04AE-27DF-4317-8CA0-053F58BF77A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E53C04AE-27DF-4317-8CA0-053F58BF77A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E53C04AE-27DF-4317-8CA0-053F58BF77A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC5CA443-31B6-4B11-A729-BD40DC8A363A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC5CA443-31B6-4B11-A729-BD40DC8A363A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC5CA443-31B6-4B11-A729-BD40DC8A363A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -50,18 +40,10 @@ Global
 		{47EDD859-9673-48DD-9FE5-5FD2D173AB62}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47EDD859-9673-48DD-9FE5-5FD2D173AB62}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47EDD859-9673-48DD-9FE5-5FD2D173AB62}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8DE7B876-0CEE-4BBF-A9E9-4A374D99C2CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8DE7B876-0CEE-4BBF-A9E9-4A374D99C2CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8DE7B876-0CEE-4BBF-A9E9-4A374D99C2CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8DE7B876-0CEE-4BBF-A9E9-4A374D99C2CC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D5DA7DF8-443D-4F10-834B-2BD7A9E7CE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D5DA7DF8-443D-4F10-834B-2BD7A9E7CE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5DA7DF8-443D-4F10-834B-2BD7A9E7CE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5DA7DF8-443D-4F10-834B-2BD7A9E7CE00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB258413-4703-4BBD-96EE-1403EFDE2993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB258413-4703-4BBD-96EE-1403EFDE2993}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB258413-4703-4BBD-96EE-1403EFDE2993}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB258413-4703-4BBD-96EE-1403EFDE2993}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC228A9C-23BF-4A87-8958-BB8BF9B1685C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC228A9C-23BF-4A87-8958-BB8BF9B1685C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC228A9C-23BF-4A87-8958-BB8BF9B1685C}.Release|Any CPU.ActiveCfg = Release|Any CPU