Merge pull request #15 from Amitpnk/feature/CQRS

Feature/cqrs

Author: Amitpnk

OnionArchitecture/.template.config/template.vstemplate

@@ -4,7 +4,7 @@
     <Name>Onion Architecture</Name>
     <Description>WhiteApp or QuickApp API solution template which is built on Onion Architecture using .NET Core</Description>
     <TemplateID>OnionArchitecture.CSharp</TemplateID>
-    <DefaultName>OA</DefaultName>
+    <DefaultName>OnionArchitecture</DefaultName>
 
     <Icon>project-icon.png</Icon>
 

OnionArchitecture/OA.Data/ApplicationContext.cs renamed to OnionArchitecture/OA.Data/ApplicationDbContext.cs

@@ -4,14 +4,14 @@
 
 namespace OA.Data
 {
-    public class ApplicationContext : DbContext, IApplicationContext
+    public class ApplicationDbContext : DbContext, IApplicationDbContext
     {
         // This constructor is used of runit testing
-        public ApplicationContext()
+        public ApplicationDbContext()
         {
 
         }
-        public ApplicationContext(DbContextOptions options) : base(options)
+        public ApplicationDbContext(DbContextOptions options) : base(options)
         {
             ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
         }

OnionArchitecture/OA.Data/IApplicationContext.cs renamed to OnionArchitecture/OA.Data/IApplicationDbContext.cs

@@ -4,7 +4,7 @@
 
 namespace OA.Data
 {
-    public interface IApplicationContext
+    public interface IApplicationDbContext
     {
         DbSet<Category> Categories { get; set; }
         DbSet<Customer> Customers { get; set; }

OnionArchitecture/OA.Data/Migrations/20200627044955_Initial-setup.Designer.cs

@@ -8,7 +8,7 @@
 
 namespace OA.Data.Migrations
 {
-    [DbContext(typeof(ApplicationContext))]
+    [DbContext(typeof(ApplicationDbContext))]
     partial class CustomerContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)

OnionArchitecture/OA.Data/Migrations/CustomerContextModelSnapshot.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();
+        }
+
     }
 }

OnionArchitecture/OA.Infrastructure/Extension/ConfigureContainer.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
 {
@@ -21,7 +21,7 @@ public static class ConfigureServiceContainer
         public static void AddDbContext(this IServiceCollection serviceCollection,
              IConfiguration configuration, IConfigurationRoot configRoot)
         {
-            serviceCollection.AddDbContext<ApplicationContext>(options =>
+            serviceCollection.AddDbContext<ApplicationDbContext>(options =>
                    options.UseSqlServer(configuration.GetConnectionString("OnionArchConn") ?? configRoot["ConnectionStrings:OnionArchConn"])
                 );
         }
@@ -36,15 +36,15 @@ public static void AddAutoMapper(this IServiceCollection serviceCollection)
             serviceCollection.AddSingleton(mapper);
         }
 
-        public static void AddRepository(this IServiceCollection serviceCollection)
+        public static void AddAddScopedServices(this IServiceCollection serviceCollection)
         {
             serviceCollection.AddScoped(typeof(IGenericRepository<>), typeof(GenericRepository<>));
             serviceCollection.AddScoped<ICustomerRepository, CustomerRepository>();
+            serviceCollection.AddScoped<IApplicationDbContext>(provider => provider.GetService<ApplicationDbContext>());
         }
 
         public static void AddTransientServices(this IServiceCollection serviceCollection)
         {
-            serviceCollection.AddTransient<ICustomerService, CustomerService>();
             serviceCollection.AddTransient<IMailService, MailService>();
         }
 
@@ -90,5 +90,11 @@ public static void AddController(this IServiceCollection serviceCollection)
             serviceCollection.AddControllers().AddNewtonsoftJson();
         }
 
+        //public static void AddMediatorCQRS(this IServiceCollection services)
+        //{
+        //    //var assembly = AppDomain.CurrentDomain.Load("OA.Service");
+        //    services.AddMediatR(Assembly.GetExecutingAssembly());
+        //}
+
     }
 }

OnionArchitecture/OA.Infrastructure/Extension/ConfigureServiceContainer.cs

@@ -10,8 +10,8 @@ namespace OA.Persistence.Repository
 {
     public class CustomerRepository : ICustomerRepository
     {
-        private readonly ApplicationContext _context;
-        public CustomerRepository(ApplicationContext context)
+        private readonly ApplicationDbContext _context;
+        public CustomerRepository(ApplicationDbContext context)
         {
             _context = context;
         }

OnionArchitecture/OA.Persistence/Repository/CustomerRepository.cs

@@ -9,9 +9,9 @@ namespace OA.Persistence.Repository
     public class GenericRepository<T> : IGenericRepository<T> where T : class
     {
         private readonly DbSet<T> entities;
-        private readonly ApplicationContext _context;
+        private readonly ApplicationDbContext _context;
 
-        public GenericRepository(ApplicationContext context)
+        public GenericRepository(ApplicationDbContext context)
         {
             _context = context;
             entities = _context.Set<T>();