refactor DI

PSManagement.Api/DI/DependencyInjection.cs

@@ -14,24 +14,28 @@ namespace PSManagement.Api.DI
     {
         public static IServiceCollection AddAPI(this IServiceCollection services)
         {
-            services.AddControllers();
             
-            services.AddApiSwagger();
+            services
+                .AddApiSwagger()
+                .AddApiCors()
+                .AddMapper()
+                .AddMyControllers();
 
-            services.AddApiCors();
+            return services;
+        }
 
-            services.AddScoped<Mapper>();
-         
-            services.AddAutoMapper(cfg => {
+        #region Configure controllers 
+        private static IServiceCollection AddMyControllers(this IServiceCollection services) {
 
-                cfg.AddProfile<CustomerMapperConfiguration>();
-                cfg.AddProfile<ProjectMapperConfiguration>();
-                cfg.AddProfile<MappersConfigurations>();
-            });
+            services
+                .AddControllers()
+                .AddApplicationPart(Presentation.AssemblyReference.Assembly);
 
             return services;
         }
+        #endregion Configure controllers
 
+        #region Api Docs Swagger
         private static IServiceCollection AddApiSwagger(this IServiceCollection services)
         {
 
@@ -65,7 +69,9 @@ namespace PSManagement.Api.DI
 
             return services;
         }
+        #endregion  Api Docs Swagger
 
+        #region Cors
         private static IServiceCollection AddApiCors(this IServiceCollection services)
         {
             services.AddCors(options =>
@@ -83,6 +89,27 @@ namespace PSManagement.Api.DI
 
             return services;
         }
+        #endregion Cors
+
+        #region Mappers 
+        private static IServiceCollection AddMapper(this IServiceCollection services ) {
+
+            services.AddScoped<Mapper>();
+
+            services.AddAutoMapper(cfg => {
+
+                cfg.AddProfile<CustomerMapperConfiguration>();
+                cfg.AddProfile<ProjectMapperConfiguration>();
+                cfg.AddProfile<MappersConfigurations>();
+                cfg.AddProfile<EmployeeMapperConfiguration>();
+            });
+
+
+            return services;
+        
+        }
+
+        #endregion Mappers 
     }
 
 

PSManagement.Api/Mappers/CustomerMapperConfiguration.cs

@@ -4,22 +4,9 @@ using PSManagement.Application.Customers.Common;
 using PSManagement.Application.Customers.UseCases.Commands.AddContactInfo;
 using PSManagement.Application.Customers.UseCases.Commands.CreateCustomer;
 using PSManagement.Application.Customers.UseCases.Commands.UpdateCustomer;
-using PSManagement.Application.Employees.Common;
-using PSManagement.Application.Projects.Common;
-using PSManagement.Application.Projects.UseCases.Commands.AddParticipant;
-using PSManagement.Application.Projects.UseCases.Commands.AddProjectStep;
-using PSManagement.Application.Projects.UseCases.Commands.ApproveProject;
-using PSManagement.Application.Projects.UseCases.Commands.ChangeProjectTeamLeader;
-using PSManagement.Application.Projects.UseCases.Commands.CreateProject;
-using PSManagement.Application.Projects.UseCases.Commands.RemoveParticipant;
-using PSManagement.Application.Projects.UseCases.Queries.ListAllProject;
-using PSManagement.Application.Tracks.Common;
 using PSManagement.Contracts.Authentication;
 using PSManagement.Contracts.Customers.Requests;
 using PSManagement.Contracts.Customers.Responses;
-using PSManagement.Contracts.Projects.Requests;
-using PSManagement.Contracts.Projects.Response;
-using PSManagement.Contracts.Tracks.Response;
 using PSManagement.SharedKernel.Utilities;
 using System;
 using System.Collections.Generic;
@@ -47,28 +34,4 @@ namespace PSManagement.Api.Mappers
             CreateMap<AuthenticationResult,AuthenticationResponse>().ReverseMap();
         }
     }
-    public class ProjectMapperConfiguration : Profile
-    {
-        public ProjectMapperConfiguration()
-        {
-            CreateMap<CreateProjectRequest, CreateProjectCommand>().ReverseMap();
-            CreateMap<ListAllProjectsRequest, ListAllProjectsQuery>().ReverseMap();
-            CreateMap<ApproveProjectRequest, ApproveProjectCommand>().ReverseMap();
-            CreateMap<AddParticipantRequest, AddParticipantCommand>().ReverseMap();
-            CreateMap<AddProjectStepRequest, AddProjectStepCommand>().ReverseMap();
-            CreateMap<ChangeProjectTeamLeaderRequest, ChangeProjectTeamLeaderCommand>().ReverseMap();
-            CreateMap<RemoveParticipantRequest, RemoveParticipantCommand>().ReverseMap();
-            CreateMap<ProjectDTO,ProjectResponse>().ReverseMap();
-            CreateMap<GetProjectsByProjectManagerRequest,GetProjectsByFilterQuery>().ConstructUsing(
-                s => new GetProjectsByFilterQuery(null,null,null,null,s.ProjectManagerId,null,null,null)
-            );
-            
-            
-            CreateMap<EmployeeResponse, EmployeeDTO>().ReverseMap();
-            CreateMap<EmployeeParticipateResponse, EmployeeParticipateDTO>().ReverseMap();
-
-            CreateMap<TrackDTO, TrackResponse>().ReverseMap();
-
-        }
-    }
 }

PSManagement.Api/Mappers/EmployeeMapperConfiguration.cs

+using AutoMapper;
+using PSManagement.Application.Employees.Common;
+using PSManagement.Application.Projects.Common;
+using PSManagement.Contracts.Projects.Response;
+
+namespace PSManagement.Api.Mappers
+{
+    public class EmployeeMapperConfiguration : Profile
+    {
+        public EmployeeMapperConfiguration()
+        {
+
+            CreateMap<EmployeeResponse, EmployeeDTO>().ReverseMap();
+            CreateMap<EmployeeParticipateResponse, EmployeeParticipateDTO>().ReverseMap();
+
+        }
+    }
+}

PSManagement.Api/Mappers/ProjectMapperConfiguration.cs

+using AutoMapper;
+using PSManagement.Application.Projects.Common;
+using PSManagement.Application.Projects.UseCases.Commands.AddParticipant;
+using PSManagement.Application.Projects.UseCases.Commands.AddProjectStep;
+using PSManagement.Application.Projects.UseCases.Commands.ApproveProject;
+using PSManagement.Application.Projects.UseCases.Commands.ChangeProjectTeamLeader;
+using PSManagement.Application.Projects.UseCases.Commands.CreateProject;
+using PSManagement.Application.Projects.UseCases.Commands.RemoveParticipant;
+using PSManagement.Application.Projects.UseCases.Queries.ListAllProject;
+using PSManagement.Application.Tracks.Common;
+using PSManagement.Contracts.Projects.Requests;
+using PSManagement.Contracts.Projects.Response;
+using PSManagement.Contracts.Tracks.Response;
+
+namespace PSManagement.Api.Mappers
+{
+    public class ProjectMapperConfiguration : Profile
+    {
+        public ProjectMapperConfiguration()
+        {
+            CreateMap<CreateProjectRequest, CreateProjectCommand>().ReverseMap();
+            CreateMap<ListAllProjectsRequest, ListAllProjectsQuery>().ReverseMap();
+            CreateMap<ApproveProjectRequest, ApproveProjectCommand>().ReverseMap();
+            CreateMap<AddParticipantRequest, AddParticipantCommand>().ReverseMap();
+            CreateMap<AddProjectStepRequest, AddProjectStepCommand>().ReverseMap();
+            CreateMap<ChangeProjectTeamLeaderRequest, ChangeProjectTeamLeaderCommand>().ReverseMap();
+            CreateMap<RemoveParticipantRequest, RemoveParticipantCommand>().ReverseMap();
+            CreateMap<ProjectDTO,ProjectResponse>().ReverseMap();
+            CreateMap<GetProjectsByProjectManagerRequest,GetProjectsByFilterQuery>().ConstructUsing(
+                s => new GetProjectsByFilterQuery(null,null,null,null,s.ProjectManagerId,null,null,null)
+            );
+            
+            
+            CreateMap<TrackDTO, TrackResponse>().ReverseMap();
+
+        }
+    }
+}

PSManagement.Api/PSManagement.Api.csproj

@@ -26,4 +26,8 @@
     <ProjectReference Include="..\PSManagement.SharedKernel\PSManagement.SharedKernel.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Middleware\ExceptionHandling\" />
+  </ItemGroup>
+
 </Project>

PSManagement.Api/Startup.cs

@@ -31,16 +31,12 @@ namespace PSManagement.Api
         public void ConfigureServices(IServiceCollection services)
         {
             // adding dependency injection 
-
             services
                 .AddAPI()
                 .AddPresentation()
                 .AddApplication()
                 .AddPersistence(Configuration)
                 .AddInfrastructure(Configuration);
-            services
-                .AddControllers()
-                .AddApplicationPart(Presentation.AssemblyReference.Assembly);
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.