refactored code

Amitpnk · Amitpnk · commit f783b04f1a91 · 2020-07-05T15:35:15.000+05:30
diff --git a/OnionArchitecture/OA.Infrastructure/Extension/ConfigureContainer.cs b/OnionArchitecture/OA.Infrastructure/Extension/ConfigureContainer.cs
@@ -1,5 +1,7 @@
 ﻿using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.Logging;
 using OA.Infrastructure.Middleware;
+using Serilog;
 
 namespace OA.Infrastructure.Extension
 {
@@ -21,5 +23,10 @@ public static void ConfigureSwagger(this IApplicationBuilder app)
             });
         }
 
+        public static void ConfigureSwagger(this ILoggerFactory loggerFactory)
+        {
+            loggerFactory.AddSerilog();
+        }
+
     }
 }
diff --git a/OnionArchitecture/OA.Infrastructure/Extension/ConfigureServiceContainer.cs b/OnionArchitecture/OA.Infrastructure/Extension/ConfigureServiceContainer.cs
@@ -1,4 +1,5 @@
 ﻿using AutoMapper;
+using MediatR;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,7 +13,6 @@
 using System;
 using System.IO;
 using System.Reflection;
-using Microsoft.AspNetCore.Mvc.NewtonsoftJson;
 
 namespace OA.Infrastructure.Extension
 {
@@ -90,5 +90,10 @@ public static void AddController(this IServiceCollection serviceCollection)
             serviceCollection.AddControllers().AddNewtonsoftJson();
         }
 
+        public static void AddMediatorCQRS(this IServiceCollection services)
+        {
+            services.AddMediatR(Assembly.GetExecutingAssembly());
+        }
+
     }
 }
diff --git a/OnionArchitecture/OA.Service/DependencyInjection.cs b/OnionArchitecture/OA.Service/DependencyInjection.cs
diff --git a/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/CreateCustomerCommand.cs b/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/CreateCustomerCommand.cs
@@ -1,10 +1,6 @@
-﻿ 
-using MediatR;
+﻿using MediatR;
 using OA.Data;
 using OA.Domain.Entities;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -34,7 +30,7 @@ public async Task<int> Handle(CreateCustomerCommand request, CancellationToken c
                 var customer = new Customer();
                 customer.CustomerName = request.CustomerName;
                 customer.ContactName = request.ContactName;
-               
+
                 _context.Customers.Add(customer);
                 await _context.SaveChangesAsync();
                 return customer.Id;
diff --git a/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/DeleteCustomerByIdCommand.cs b/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/DeleteCustomerByIdCommand.cs
@@ -1,11 +1,7 @@
-﻿ 
-using MediatR;
+﻿using MediatR;
 using Microsoft.EntityFrameworkCore;
 using OA.Data;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/UpdateCustomerCommand.cs b/OnionArchitecture/OA.Service/Features/CustomerFeatures/Commands/UpdateCustomerCommand.cs
@@ -1,11 +1,7 @@
-﻿ 
-using MediatR;
+﻿using MediatR;
 using OA.Data;
 using OA.Domain.Entities;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/OnionArchitecture/OA.Service/Features/CustomerFeatures/Queries/GetAllCustomerQuery.cs b/OnionArchitecture/OA.Service/Features/CustomerFeatures/Queries/GetAllCustomerQuery.cs
@@ -1,11 +1,8 @@
-﻿ 
-using MediatR;
+﻿using MediatR;
 using Microsoft.EntityFrameworkCore;
 using OA.Data;
 using OA.Domain.Entities;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/OnionArchitecture/OA.Service/Features/CustomerFeatures/Queries/GetCustomerByIdQuery.cs b/OnionArchitecture/OA.Service/Features/CustomerFeatures/Queries/GetCustomerByIdQuery.cs
@@ -1,11 +1,7 @@
-﻿ 
-using MediatR;
+﻿using MediatR;
 using OA.Data;
 using OA.Domain.Entities;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/OnionArchitecture/OA.Test.Unit/Controller/CustomerControllerTest.cs b/OnionArchitecture/OA.Test.Unit/Controller/CustomerControllerTest.cs
@@ -6,7 +6,6 @@
 using OA.Domain.Entities;
 using OA.Infrastructure.ViewModel;
 using OA.Persistence.Contract;
-using OA.Service.Contract;
 using System.Threading.Tasks;
 
 namespace OA.Test.Unit.Controller
diff --git a/OnionArchitecture/OA.Test.Unit/Service/CustomerServiceTest.cs b/OnionArchitecture/OA.Test.Unit/Service/CustomerServiceTest.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using OA.Domain.Entities;
 using OA.Persistence.Contract;
-using OA.Service.Implementation;
 
 namespace OA.Test.Unit.Service
 {
diff --git a/OnionArchitecture/OA/Controllers/CustomerController.cs b/OnionArchitecture/OA/Controllers/CustomerController.cs
@@ -2,12 +2,8 @@
 using Application.Features.ProductFeatures.Queries;
 using MediatR;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
+using System.Threading.Tasks;
 
 namespace OA.Controllers
 {
@@ -23,26 +19,26 @@ public async Task<IActionResult> Create(CreateCustomerCommand command)
         {
             return Ok(await Mediator.Send(command));
         }
-        
+
         [HttpGet]
         public async Task<IActionResult> GetAll()
         {
             return Ok(await Mediator.Send(new GetAllCustomerQuery()));
         }
-       
+
         [HttpGet("{id}")]
         public async Task<IActionResult> GetById(int id)
         {
             return Ok(await Mediator.Send(new GetCustomerByIdQuery { Id = id }));
         }
-        
+
         [HttpDelete("{id}")]
         public async Task<IActionResult> Delete(int id)
         {
             return Ok(await Mediator.Send(new DeleteCustomerByIdCommand { Id = id }));
         }
 
-       
+
         [HttpPut("[action]")]
         public async Task<IActionResult> Update(int id, UpdateCustomerCommand command)
         {
diff --git a/OnionArchitecture/OA/OA.csproj b/OnionArchitecture/OA/OA.csproj
@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\OA.Infrastructure\OA.Infrastructure.csproj" />
+    <ProjectReference Include="..\OA.Service\OA.Service.csproj" />
   </ItemGroup>
 
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
diff --git a/OnionArchitecture/OA/Startup.cs b/OnionArchitecture/OA/Startup.cs
@@ -4,9 +4,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using OA.Data;
 using OA.Infrastructure.Extension;
-using OA.Service;
 using Serilog;
 using System.IO;
 
@@ -42,12 +40,12 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddMailSetting(Configuration);
 
-            services.AddApplication();
+            services.AddMediatorCQRS();
+
 
-            
         }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory log)
         {
             if (env.IsDevelopment())
             {
@@ -62,7 +60,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
 
             app.ConfigureSwagger();
 
-            loggerFactory.AddSerilog();
+            log.AddSerilog();
 
             app.UseEndpoints(endpoints =>
             {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`using Microsoft.AspNetCore.Builder;`
	`2`	`+using Microsoft.Extensions.Logging;`
`2`	`3`	`using OA.Infrastructure.Middleware;`
	`4`	`+using Serilog;`
`3`	`5`
`4`	`6`	`namespace OA.Infrastructure.Extension`
`5`	`7`	`{`
`@@ -21,5 +23,10 @@ public static void ConfigureSwagger(this IApplicationBuilder app)`
`21`	`23`	`});`
`22`	`24`	`}`
`23`	`25`
	`26`	`+ public static void ConfigureSwagger(this ILoggerFactory loggerFactory)`
	`27`	`+ {`
	`28`	`+ loggerFactory.AddSerilog();`
	`29`	`+ }`
	`30`	`+`
`24`	`31`	`}`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using AutoMapper;`
	`2`	`+using MediatR;`
`2`	`3`	`using Microsoft.EntityFrameworkCore;`
`3`	`4`	`using Microsoft.Extensions.Configuration;`
`4`	`5`	`using Microsoft.Extensions.DependencyInjection;`
`@@ -12,7 +13,6 @@`
`12`	`13`	`using System;`
`13`	`14`	`using System.IO;`
`14`	`15`	`using System.Reflection;`
`15`		`-using Microsoft.AspNetCore.Mvc.NewtonsoftJson;`
`16`	`16`
`17`	`17`	`namespace OA.Infrastructure.Extension`
`18`	`18`	`{`
`@@ -90,5 +90,10 @@ public static void AddController(this IServiceCollection serviceCollection)`
`90`	`90`	`serviceCollection.AddControllers().AddNewtonsoftJson();`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ public static void AddMediatorCQRS(this IServiceCollection services)`
	`94`	`+ {`
	`95`	`+ services.AddMediatR(Assembly.GetExecutingAssembly());`
	`96`	`+ }`
	`97`	`+`
`93`	`98`	`}`
`94`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using OA.Domain.Entities;`
`4`	`4`	`using OA.Persistence.Contract;`
`5`		`-using OA.Service.Implementation;`
`6`	`5`
`7`	`6`	`namespace OA.Test.Unit.Service`
`8`	`7`	`{`