Merge pull request #142 from AntonioFalcao/release

AntonioFalcaoJr · web-flow · commit 8884f7deb474 · 2021-02-11T11:55:37.000-03:00
updating
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,15 +10,15 @@
         <Microsoft_DependencyInjection_Version>5.0.0</Microsoft_DependencyInjection_Version>
 
         <!--EF Core-->
-        <Microsoft_EntityFrameworkCore_Version>5.0.2</Microsoft_EntityFrameworkCore_Version>
+        <Microsoft_EntityFrameworkCore_Version>5.0.3</Microsoft_EntityFrameworkCore_Version>
 
         <!--GraphQL-->
         <GraphQL_Server_Version>4.4.1</GraphQL_Server_Version>
         <GraphQL_Client_Version>3.2.1</GraphQL_Client_Version>
         <GraphQL_Version>3.3.2</GraphQL_Version>
 
         <!--AutoMapper-->
-        <AutoMapper_DependencyInjection_Version>8.1.0</AutoMapper_DependencyInjection_Version>
+        <AutoMapper_DependencyInjection_Version>8.1.1</AutoMapper_DependencyInjection_Version>
         <AutoMapper_Version>10.1.1</AutoMapper_Version>
 
         <!--Others-->
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Dotnet5.GraphQL3.WebApplication
 
-This project exemplify the implementation and **Dockerization** of a simple Razor Web MVC Core consuming a full **GraphQL 3** Web API, build in a **.NET 5** multi-layer project, considering development best practices, like **SOLID** and **DRY**, applying **Domain-Driven** concepts in a **Hexagonal Architecture**.
+This project exemplify the implementation and **dockerization** of a simple Razor Web MVC Core consuming a full **GraphQL 3** Web API, build in a **.NET 5** multi-layer project, considering development best practices, like **SOLID**, **KISS** and **DRY**, applying **Domain-Driven** concepts in a **Hexagonal Architecture**.
          
 |WebAPI|
 |:----:| 
diff --git a/src/Dotnet5.GraphQL3.Domain.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Dotnet5.GraphQL3.Domain.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -13,7 +13,7 @@ public static IServiceCollection AddBuilders(this IServiceCollection services)
                     .FromApplicationDependencies(assembly
                         => assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
                     .AddClasses(filter
-                        => filter.AssignableToAny(typeof(IBuilder<,>)))
+                        => filter.AssignableTo(typeof(IBuilder<,>)))
                     .UsingRegistrationStrategy(RegistrationStrategy.Skip)
                     .AsImplementedInterfaces()
                     .WithScopedLifetime());
diff --git a/src/Dotnet5.GraphQL3.Repositories.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Dotnet5.GraphQL3.Repositories.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,24 +1,24 @@
-﻿using Dotnet5.GraphQL3.CrossCutting.Extensions;
-using Dotnet5.GraphQL3.Repositories.Abstractions.UnitsOfWork;
-using Microsoft.Extensions.DependencyInjection;
-using Scrutor;
-
-namespace Dotnet5.GraphQL3.Repositories.Abstractions.Extensions.DependencyInjection
-{
-    public static class ServiceCollectionExtensions
-    {
-        public static IServiceCollection AddRepositories(this IServiceCollection services)
-            => services.Scan(selector
-                => selector
-                    .FromApplicationDependencies(assembly
-                        => assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
-                    .AddClasses(filter
-                        => filter.AssignableToAny(typeof(IRepository<,>)))
-                    .UsingRegistrationStrategy(RegistrationStrategy.Skip)
-                    .AsImplementedInterfaces()
-                    .WithScopedLifetime());
-
-        public static IServiceCollection AddUnitOfWork(this IServiceCollection services)
-            => services.AddScoped<IUnitOfWork, UnitOfWork>();
-    }
+﻿using Dotnet5.GraphQL3.CrossCutting.Extensions;
+using Dotnet5.GraphQL3.Repositories.Abstractions.UnitsOfWork;
+using Microsoft.Extensions.DependencyInjection;
+using Scrutor;
+
+namespace Dotnet5.GraphQL3.Repositories.Abstractions.Extensions.DependencyInjection
+{
+    public static class ServiceCollectionExtensions
+    {
+        public static IServiceCollection AddRepositories(this IServiceCollection services)
+            => services.Scan(selector
+                => selector
+                    .FromApplicationDependencies(assembly
+                        => assembly.FullName?.StartsWith(assembly.GetEntryAssemblySuffix()) ?? default)
+                    .AddClasses(filter
+                        => filter.AssignableTo(typeof(IRepository<,>)))
+                    .UsingRegistrationStrategy(RegistrationStrategy.Skip)
+                    .AsImplementedInterfaces()
+                    .WithScopedLifetime());
+
+        public static IServiceCollection AddUnitOfWork(this IServiceCollection services)
+            => services.AddScoped<IUnitOfWork, UnitOfWork>();
+    }
 }
diff --git a/src/Dotnet5.GraphQL3.Services.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Dotnet5.GraphQL3.Services.Abstractions/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -12,35 +12,31 @@ namespace Dotnet5.GraphQL3.Services.Abstractions.Extensions.DependencyInjection
     public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddApplicationServices(this IServiceCollection services)
-            => services.Scan(selector
-                => selector
-                    .FromApplicationDependencies(assembly
-                        => assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
-                    .AddClasses(filter
-                        => filter.AssignableToAny(typeof(IService<,,>)))
-                    .UsingRegistrationStrategy(RegistrationStrategy.Skip)
-                    .AsImplementedInterfaces()
-                    .WithScopedLifetime());
+            => services.Scan(selector 
+                => selector.FromApplicationDependencies(assembly 
+                    => assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
+                .AddClasses(filter 
+                    => filter.AssignableTo(typeof(IService<,,>)))
+                .UsingRegistrationStrategy(RegistrationStrategy.Skip)
+                .AsImplementedInterfaces()
+                .WithScopedLifetime());
 
         public static IServiceCollection AddMessageServices(this IServiceCollection services)
-            => services.Scan(selector
-                => selector
-                    .FromApplicationDependencies(assembly
-                        => assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
-                    .AddClasses(filter
-                        => filter.AssignableToAny(typeof(IMessageService<,,>)))
-                    .UsingRegistrationStrategy(RegistrationStrategy.Skip)
-                    .AsImplementedInterfaces()
-                    .WithSingletonLifetime());
+            => services.Scan(selector 
+                => selector.FromApplicationDependencies(assembly 
+                    => assembly.FullName?.StartsWith(GetAssemblySuffix()) ?? default)
+                .AddClasses(filter 
+                    => filter.AssignableTo(typeof(IMessageService<,,>)))
+                .UsingRegistrationStrategy(RegistrationStrategy.Skip)
+                .AsImplementedInterfaces()
+                .WithSingletonLifetime());
 
         public static IServiceCollection AddSubjects(this IServiceCollection services)
             => services.AddSingleton(typeof(ISubject<>), typeof(ReplaySubject<>));
 
         public static IServiceCollection AddAutoMapper(this IServiceCollection services)
-            => services.AddAutoMapper(
-                AppDomain.CurrentDomain.GetAssemblies()
-                    .Where(x => x.FullName?
-                        .Contains(GetAssemblySuffix()) ?? false));
+            => services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies().Where(x 
+                => x.FullName?.Contains(GetAssemblySuffix()) ?? default));
 
         private static string GetAssemblySuffix()
             => Assembly.GetEntryAssembly()?.FullName?.Substring(0, 16);
diff --git a/src/Dotnet5.GraphQL3.Store.Repositories/Dotnet5.GraphQL3.Store.Repositories.csproj b/src/Dotnet5.GraphQL3.Store.Repositories/Dotnet5.GraphQL3.Store.Repositories.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <ItemGroup>
-        <PackageReference Include="Bogus" Version="32.1.1" />
+        <PackageReference Include="Bogus" Version="33.0.1" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(Microsoft_EntityFrameworkCore_Version)" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="$(Microsoft_EntityFrameworkCore_Version)" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(Microsoft_EntityFrameworkCore_Version)" />
diff --git a/src/Dotnet5.GraphQL3.Store.Repositories/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/src/Dotnet5.GraphQL3.Store.Repositories/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,70 +1,70 @@
-using System;
-using Dotnet5.GraphQL3.Store.Repositories.Contexts;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Dotnet5.GraphQL3.Store.Repositories.Extensions.DependencyInjection
-{
-    public static class ServiceCollectionExtensions
-    {
-        private static readonly RepositoryOptions Options = new();
-
-        public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoryOptions> optionsAction)
-        {
-            optionsAction(Options);
-
-            return services
-                .AddScoped<DbContext, StoreDbContext>()
-                .AddDbContext<StoreDbContext>(DbContextOptionsBuilderAction);
-        }
-
-        private static void DbContextOptionsBuilderAction(DbContextOptionsBuilder optionsBuilder)
-            => optionsBuilder
-                .EnableDetailedErrors()
-                .EnableSensitiveDataLogging()
-                .UseSqlServer(
-                    connectionString: Options.ConnectionString,
-                    sqlServerOptionsAction: SqlServerOptionsAction);
-
-        private static void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder optionsBuilder)
-            => optionsBuilder
-                .EnableRetryOnFailure(
-                    maxRetryCount: Options.ResilientConnection.MaxRetryCount, 
-                    maxRetryDelay: Options.ResilientConnection.MaxRetryDelay, 
-                    errorNumbersToAdd: Options.ResilientConnection.ErrorNumbersToAdd)
-                .MigrationsAssembly(typeof(StoreDbContext).Assembly.GetName().Name);
-    }
-
-    public class DatabaseResilientConnection
-    {
-        private const int DefaultMaxRetryCount = 5;
-        private const int DefaultMaxRetryDelay = 5;
-
-        private int _maxRetryCount;
-        private int _maxSecondsRetryDelay;
-
-        public int MaxRetryCount
-        {
-            get => _maxRetryCount;
-            set => _maxRetryCount = value is default(int) ? DefaultMaxRetryCount : value;
-        }
-
-        public int MaxSecondsRetryDelay
-        {
-            get => _maxSecondsRetryDelay;
-            set => _maxSecondsRetryDelay = value is default(int) ? DefaultMaxRetryDelay : value;
-        }
-
-        public int[] ErrorNumbersToAdd { get; set; }
-        
-        internal TimeSpan MaxRetryDelay 
-            => TimeSpan.FromSeconds(MaxSecondsRetryDelay);
-    }
-    
-    public class RepositoryOptions
-    {
-        public string ConnectionString { get; set; }
-        public DatabaseResilientConnection ResilientConnection { get; set; } = new();
-    }
+using System;
+using Dotnet5.GraphQL3.Store.Repositories.Contexts;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Dotnet5.GraphQL3.Store.Repositories.Extensions.DependencyInjection
+{
+    public static class ServiceCollectionExtensions
+    {
+        private static readonly RepositoryOptions Options = new();
+
+        public static IServiceCollection AddApplicationDbContext(this IServiceCollection services, Action<RepositoryOptions> optionsAction)
+        {
+            optionsAction(Options);
+
+            return services
+                .AddScoped<DbContext, StoreDbContext>()
+                .AddDbContext<StoreDbContext>(DbContextOptionsBuilderAction);
+        }
+
+        private static void DbContextOptionsBuilderAction(DbContextOptionsBuilder optionsBuilder)
+            => optionsBuilder
+                .EnableDetailedErrors()
+                .EnableSensitiveDataLogging()
+                .UseSqlServer(
+                    connectionString: Options.DefaultConnection,
+                    sqlServerOptionsAction: SqlServerOptionsAction);
+
+        private static void SqlServerOptionsAction(SqlServerDbContextOptionsBuilder optionsBuilder)
+            => optionsBuilder
+                .EnableRetryOnFailure(
+                    maxRetryCount: Options.ConnectionResiliency.MaxRetryCount, 
+                    maxRetryDelay: Options.ConnectionResiliency.MaxRetryDelay, 
+                    errorNumbersToAdd: Options.ConnectionResiliency.ErrorNumbersToAdd)
+                .MigrationsAssembly(typeof(StoreDbContext).Assembly.GetName().Name);
+    }
+
+    public class ConnectionResiliency
+    {
+        private const int DefaultMaxRetryCount = 5;
+        private const int DefaultMaxRetryDelay = 5;
+
+        private int _maxRetryCount;
+        private int _maxSecondsRetryDelay;
+
+        public int MaxRetryCount
+        {
+            get => _maxRetryCount;
+            set => _maxRetryCount = value is default(int) ? DefaultMaxRetryCount : value;
+        }
+
+        public int MaxSecondsRetryDelay
+        {
+            get => _maxSecondsRetryDelay;
+            set => _maxSecondsRetryDelay = value is default(int) ? DefaultMaxRetryDelay : value;
+        }
+
+        public int[] ErrorNumbersToAdd { get; set; }
+        
+        internal TimeSpan MaxRetryDelay 
+            => TimeSpan.FromSeconds(MaxSecondsRetryDelay);
+    }
+    
+    public class RepositoryOptions
+    {
+        public string DefaultConnection { get; set; }
+        public ConnectionResiliency ConnectionResiliency { get; set; } = new();
+    }
 }
diff --git a/src/Dotnet5.GraphQL3.Store.WebAPI/Program.cs b/src/Dotnet5.GraphQL3.Store.WebAPI/Program.cs
@@ -1,4 +1,7 @@
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
 namespace Dotnet5.GraphQL3.Store.WebAPI
@@ -7,10 +10,20 @@ public static class Program
     {
         private static IHostBuilder CreateHostBuilder(string[] args)
             => Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder
-                    => webBuilder.UseStartup<Startup>());
+                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>())
+                .UseDefaultServiceProvider((context, options) =>
+                    {
+                        options.ValidateScopes = context.HostingEnvironment.IsDevelopment();
+                        options.ValidateOnBuild = true;
+                    });
 
-        public static void Main(string[] args)
-            => CreateHostBuilder(args).Build().Run();
+        public static async Task Main(string[] args)
+        {
+            var host = CreateHostBuilder(args).Build();
+            using var scope = host.Services.CreateScope();
+            var dbContext = scope.ServiceProvider.GetRequiredService<DbContext>();
+            await dbContext.Database.MigrateAsync();
+            await host.RunAsync();
+        }
     }
 }
diff --git a/src/Dotnet5.GraphQL3.Store.WebAPI/Startup.cs b/src/Dotnet5.GraphQL3.Store.WebAPI/Startup.cs
@@ -28,7 +28,7 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)
             _configuration = configuration;
         }
 
-        public void Configure(IApplicationBuilder app, DbContext dbContext)
+        public void Configure(IApplicationBuilder app)
         {
             if (_env.IsDevelopment())
                 app.UseDeveloperExceptionPage();
@@ -42,8 +42,6 @@ public void Configure(IApplicationBuilder app, DbContext dbContext)
                 });
 
             app.UseApplicationGraphQL<StoreSchema>();
-
-            dbContext.Database.Migrate();
         }
 
         public void ConfigureServices(IServiceCollection services)
@@ -62,8 +60,8 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddApplicationDbContext(options =>
                 {
-                    options.ConnectionString = _configuration.GetConnectionString("DefaultConnection");
-                    _configuration.Bind("DatabaseResilientConnection", options.ResilientConnection);
+                    options.DefaultConnection = _configuration.GetConnectionString(nameof(options.DefaultConnection));
+                    _configuration.Bind(nameof(options.ConnectionResiliency), options.ConnectionResiliency);
                 });
 
             services.AddApplicationGraphQL(options
diff --git a/src/Dotnet5.GraphQL3.Store.WebAPI/appsettings.json b/src/Dotnet5.GraphQL3.Store.WebAPI/appsettings.json
@@ -2,9 +2,9 @@
   "ConnectionStrings": {
     "DefaultConnection": "Server=mssql;Database=Store;User=sa;Password=!MyComplexPassword"
   },
-  "DatabaseResilientConnection": {
-    "MaxRetryCount": 5,
-    "MaxRetryDelay": 5,
+  "ConnectionResiliency": {
+    "MaxRetryCount": 10,
+    "MaxSecondsRetryDelay": 10,
     "ErrorNumbersToAdd": []
   },
   "Logging": {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public Startup(IConfiguration configuration, IWebHostEnvironment env)`
`28`	`28`	`_configuration = configuration;`
`29`	`29`	`}`
`30`	`30`
`31`		`- public void Configure(IApplicationBuilder app, DbContext dbContext)`
	`31`	`+ public void Configure(IApplicationBuilder app)`
`32`	`32`	`{`
`33`	`33`	`if (_env.IsDevelopment())`
`34`	`34`	`app.UseDeveloperExceptionPage();`
`@@ -42,8 +42,6 @@ public void Configure(IApplicationBuilder app, DbContext dbContext)`
`42`	`42`	`});`
`43`	`43`
`44`	`44`	`app.UseApplicationGraphQL<StoreSchema>();`
`45`		`-`
`46`		`- dbContext.Database.Migrate();`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`public void ConfigureServices(IServiceCollection services)`
`@@ -62,8 +60,8 @@ public void ConfigureServices(IServiceCollection services)`
`62`	`60`
`63`	`61`	`services.AddApplicationDbContext(options =>`
`64`	`62`	`{`
`65`		`- options.ConnectionString = _configuration.GetConnectionString("DefaultConnection");`
`66`		`- _configuration.Bind("DatabaseResilientConnection", options.ResilientConnection);`
	`63`	`+ options.DefaultConnection = _configuration.GetConnectionString(nameof(options.DefaultConnection));`
	`64`	`+ _configuration.Bind(nameof(options.ConnectionResiliency), options.ConnectionResiliency);`
`67`	`65`	`});`
`68`	`66`
`69`	`67`	`services.AddApplicationGraphQL(options`