[ASP.NET Core] Code quality fixes

NikolayIT · NikolayIT · commit eccac2b6a442 · 2019-12-24T10:50:43.000+02:00
diff --git a/ASP.NET Core/Data/AspNetCoreTemplate.Data/IdentityOptionsProvider.cs b/ASP.NET Core/Data/AspNetCoreTemplate.Data/IdentityOptionsProvider.cs
@@ -0,0 +1,16 @@
+﻿namespace AspNetCoreTemplate.Data
+{
+    using Microsoft.AspNetCore.Identity;
+
+    public static class IdentityOptionsProvider
+    {
+        public static void GetIdentityOptions(IdentityOptions options)
+        {
+            options.Password.RequireDigit = false;
+            options.Password.RequireLowercase = false;
+            options.Password.RequireUppercase = false;
+            options.Password.RequireNonAlphanumeric = false;
+            options.Password.RequiredLength = 6;
+        }
+    }
+}
diff --git a/ASP.NET Core/Services/AspNetCoreTemplate.Services.Data/ISettingsService.cs b/ASP.NET Core/Services/AspNetCoreTemplate.Services.Data/ISettingsService.cs
@@ -1,10 +1,11 @@
 ﻿namespace AspNetCoreTemplate.Services.Data
 {
     using System.Collections.Generic;
+    using System.Threading.Tasks;
 
     public interface ISettingsService
     {
-        int GetCount();
+        Task<int> GetCountAsync();
 
         IEnumerable<T> GetAll<T>();
     }
diff --git a/ASP.NET Core/Services/AspNetCoreTemplate.Services.Data/SettingsService.cs b/ASP.NET Core/Services/AspNetCoreTemplate.Services.Data/SettingsService.cs
@@ -2,11 +2,14 @@
 {
     using System.Collections.Generic;
     using System.Linq;
+    using System.Threading.Tasks;
 
     using AspNetCoreTemplate.Data.Common.Repositories;
     using AspNetCoreTemplate.Data.Models;
     using AspNetCoreTemplate.Services.Mapping;
 
+    using Microsoft.EntityFrameworkCore;
+
     public class SettingsService : ISettingsService
     {
         private readonly IDeletableEntityRepository<Setting> settingsRepository;
@@ -16,9 +19,9 @@ public SettingsService(IDeletableEntityRepository<Setting> settingsRepository)
             this.settingsRepository = settingsRepository;
         }
 
-        public int GetCount()
+        public async Task<int> GetCountAsync()
         {
-            return this.settingsRepository.All().Count();
+            return await this.settingsRepository.All().CountAsync();
         }
 
         public IEnumerable<T> GetAll<T>()
diff --git a/ASP.NET Core/Tests/AspNetCoreTemplate.Services.Data.Tests/SettingsServiceTests.cs b/ASP.NET Core/Tests/AspNetCoreTemplate.Services.Data.Tests/SettingsServiceTests.cs
@@ -18,7 +18,7 @@
     public class SettingsServiceTests
     {
         [Fact]
-        public void GetCountShouldReturnCorrectNumber()
+        public async Task GetCountShouldReturnCorrectNumber()
         {
             var repository = new Mock<IDeletableEntityRepository<Setting>>();
             repository.Setup(r => r.All()).Returns(new List<Setting>
@@ -28,16 +28,15 @@ public void GetCountShouldReturnCorrectNumber()
                                                             new Setting(),
                                                         }.AsQueryable());
             var service = new SettingsService(repository.Object);
-            Assert.Equal(3, service.GetCount());
+            Assert.Equal(3, await service.GetCountAsync());
             repository.Verify(x => x.All(), Times.Once);
         }
 
         [Fact]
         public async Task GetCountShouldReturnCorrectNumberUsingDbContext()
         {
             var options = new DbContextOptionsBuilder<ApplicationDbContext>()
-                .UseInMemoryDatabase(databaseName: "Find_User_Database") // Give a Unique name to the DB
-                .Options;
+                .UseInMemoryDatabase(databaseName: "SettingsTestDb").Options;
             var dbContext = new ApplicationDbContext(options);
             dbContext.Settings.Add(new Setting());
             dbContext.Settings.Add(new Setting());
@@ -46,8 +45,7 @@ public async Task GetCountShouldReturnCorrectNumberUsingDbContext()
 
             var repository = new EfDeletableEntityRepository<Setting>(dbContext);
             var service = new SettingsService(repository);
-            var count = service.GetCount();
-            Assert.Equal(3, count);
+            Assert.Equal(3, await service.GetCountAsync());
         }
     }
 }
diff --git a/ASP.NET Core/Tests/Sandbox/Program.cs b/ASP.NET Core/Tests/Sandbox/Program.cs
@@ -3,6 +3,7 @@
     using System;
     using System.Diagnostics;
     using System.IO;
+    using System.Threading.Tasks;
 
     using AspNetCoreTemplate.Data;
     using AspNetCoreTemplate.Data.Common;
@@ -42,18 +43,20 @@ public static int Main(string[] args)
                 serviceProvider = serviceScope.ServiceProvider;
 
                 return Parser.Default.ParseArguments<SandboxOptions>(args).MapResult(
-                    opts => SandboxCode(opts, serviceProvider),
+                    opts => SandboxCode(opts, serviceProvider).GetAwaiter().GetResult(),
                     _ => 255);
             }
         }
 
-        private static int SandboxCode(SandboxOptions options, IServiceProvider serviceProvider)
+        private static async Task<int> SandboxCode(SandboxOptions options, IServiceProvider serviceProvider)
         {
             var sw = Stopwatch.StartNew();
+
             var settingsService = serviceProvider.GetService<ISettingsService>();
-            Console.WriteLine($"Count of settings: {settingsService.GetCount()}");
+            Console.WriteLine($"Count of settings: {await settingsService.GetCountAsync()}");
+
             Console.WriteLine(sw.Elapsed);
-            return 0;
+            return await Task.FromResult(0);
         }
 
         private static void ConfigureServices(ServiceCollection services)
@@ -64,19 +67,13 @@ private static void ConfigureServices(ServiceCollection services)
                 .Build();
 
             services.AddSingleton<IConfiguration>(configuration);
+
             services.AddDbContext<ApplicationDbContext>(
                 options => options.UseSqlServer(configuration.GetConnectionString("DefaultConnection"))
                     .UseLoggerFactory(new LoggerFactory()));
 
-            services.AddDefaultIdentity<ApplicationUser>(
-                options =>
-                    {
-                        options.Password.RequireDigit = false;
-                        options.Password.RequireLowercase = false;
-                        options.Password.RequireUppercase = false;
-                        options.Password.RequireNonAlphanumeric = false;
-                        options.Password.RequiredLength = 6;
-                    }).AddRoles<ApplicationRole>().AddEntityFrameworkStores<ApplicationDbContext>();
+            services.AddDefaultIdentity<ApplicationUser>(IdentityOptionsProvider.GetIdentityOptions)
+                .AddRoles<ApplicationRole>().AddEntityFrameworkStores<ApplicationDbContext>();
 
             services.AddScoped(typeof(IDeletableEntityRepository<>), typeof(EfDeletableEntityRepository<>));
             services.AddScoped(typeof(IRepository<>), typeof(EfRepository<>));
diff --git a/ASP.NET Core/Web/AspNetCoreTemplate.Web/Areas/Administration/Controllers/DashboardController.cs b/ASP.NET Core/Web/AspNetCoreTemplate.Web/Areas/Administration/Controllers/DashboardController.cs
@@ -1,5 +1,7 @@
 ﻿namespace AspNetCoreTemplate.Web.Areas.Administration.Controllers
 {
+    using System.Threading.Tasks;
+
     using AspNetCoreTemplate.Services.Data;
     using AspNetCoreTemplate.Web.Areas.Administration.ViewModels.Dashboard;
 
@@ -14,9 +16,9 @@ public DashboardController(ISettingsService settingsService)
             this.settingsService = settingsService;
         }
 
-        public IActionResult Index()
+        public async Task<IActionResult> Index()
         {
-            var viewModel = new IndexViewModel { SettingsCount = this.settingsService.GetCount(), };
+            var viewModel = new IndexViewModel { SettingsCount = await this.settingsService.GetCountAsync(), };
             return this.View(viewModel);
         }
     }
diff --git a/ASP.NET Core/Web/AspNetCoreTemplate.Web/Controllers/SettingsController.cs b/ASP.NET Core/Web/AspNetCoreTemplate.Web/Controllers/SettingsController.cs
@@ -1,13 +1,11 @@
 ﻿namespace AspNetCoreTemplate.Web.Controllers
 {
     using System;
-    using System.Linq;
     using System.Threading.Tasks;
 
     using AspNetCoreTemplate.Data.Common.Repositories;
     using AspNetCoreTemplate.Data.Models;
     using AspNetCoreTemplate.Services.Data;
-    using AspNetCoreTemplate.Services.Mapping;
     using AspNetCoreTemplate.Web.ViewModels.Settings;
 
     using Microsoft.AspNetCore.Mvc;
diff --git a/ASP.NET Core/Web/AspNetCoreTemplate.Web/Startup.cs b/ASP.NET Core/Web/AspNetCoreTemplate.Web/Startup.cs
@@ -36,16 +36,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddDbContext<ApplicationDbContext>(
                 options => options.UseSqlServer(this.configuration.GetConnectionString("DefaultConnection")));
 
-            services.AddDefaultIdentity<ApplicationUser>(
-                    options =>
-                        {
-                            options.Password.RequireDigit = false;
-                            options.Password.RequireLowercase = false;
-                            options.Password.RequireUppercase = false;
-                            options.Password.RequireNonAlphanumeric = false;
-                            options.Password.RequiredLength = 6;
-                        }).AddRoles<ApplicationRole>().AddEntityFrameworkStores<ApplicationDbContext>();
-
+            services.AddDefaultIdentity<ApplicationUser>(IdentityOptionsProvider.GetIdentityOptions)
+                .AddRoles<ApplicationRole>().AddEntityFrameworkStores<ApplicationDbContext>();
 
             services.Configure<CookiePolicyOptions>(
                 options =>
diff --git a/ASP.NET Core/Web/AspNetCoreTemplate.Web/Views/Shared/_CookieConsentPartial.cshtml b/ASP.NET Core/Web/AspNetCoreTemplate.Web/Views/Shared/_CookieConsentPartial.cshtml
@@ -17,7 +17,7 @@
     <script>
         (function () {
             var button = document.querySelector("#cookieConsent button[data-cookie-string]");
-            button.addEventListener("click", function (event) {
+            button.addEventListener("click", function () {
                 document.cookie = button.dataset.cookieString;
             }, false);
         })();
diff --git a/ASP.NET Core/Web/AspNetCoreTemplate.Web/Views/Shared/_Layout.cshtml b/ASP.NET Core/Web/AspNetCoreTemplate.Web/Views/Shared/_Layout.cshtml
@@ -16,7 +16,7 @@
 </head>
 <body>
     <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
+        <nav class="navbar navbar-expand-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container">
                 <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">AspNetCoreTemplate</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`namespace AspNetCoreTemplate.Services.Data`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
	`4`	`+ using System.Threading.Tasks;`
`4`	`5`
`5`	`6`	`public interface ISettingsService`
`6`	`7`	`{`
`7`		`- int GetCount();`
	`8`	`+ Task<int> GetCountAsync();`
`8`	`9`
`9`	`10`	`IEnumerable<T> GetAll<T>();`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,14 @@`
`2`	`2`	`{`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
	`5`	`+ using System.Threading.Tasks;`
`5`	`6`
`6`	`7`	`using AspNetCoreTemplate.Data.Common.Repositories;`
`7`	`8`	`using AspNetCoreTemplate.Data.Models;`
`8`	`9`	`using AspNetCoreTemplate.Services.Mapping;`
`9`	`10`
	`11`	`+ using Microsoft.EntityFrameworkCore;`
	`12`	`+`
`10`	`13`	`public class SettingsService : ISettingsService`
`11`	`14`	`{`
`12`	`15`	`private readonly IDeletableEntityRepository<Setting> settingsRepository;`
`@@ -16,9 +19,9 @@ public SettingsService(IDeletableEntityRepository<Setting> settingsRepository)`
`16`	`19`	`this.settingsRepository = settingsRepository;`
`17`	`20`	`}`
`18`	`21`
`19`		`- public int GetCount()`
	`22`	`+ public async Task<int> GetCountAsync()`
`20`	`23`	`{`
`21`		`- return this.settingsRepository.All().Count();`
	`24`	`+ return await this.settingsRepository.All().CountAsync();`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public IEnumerable<T> GetAll<T>()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`public class SettingsServiceTests`
`19`	`19`	`{`
`20`	`20`	`[Fact]`
`21`		`- public void GetCountShouldReturnCorrectNumber()`
	`21`	`+ public async Task GetCountShouldReturnCorrectNumber()`
`22`	`22`	`{`
`23`	`23`	`var repository = new Mock<IDeletableEntityRepository<Setting>>();`
`24`	`24`	`repository.Setup(r => r.All()).Returns(new List<Setting>`
`@@ -28,16 +28,15 @@ public void GetCountShouldReturnCorrectNumber()`
`28`	`28`	`new Setting(),`
`29`	`29`	`}.AsQueryable());`
`30`	`30`	`var service = new SettingsService(repository.Object);`
`31`		`- Assert.Equal(3, service.GetCount());`
	`31`	`+ Assert.Equal(3, await service.GetCountAsync());`
`32`	`32`	`repository.Verify(x => x.All(), Times.Once);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`[Fact]`
`36`	`36`	`public async Task GetCountShouldReturnCorrectNumberUsingDbContext()`
`37`	`37`	`{`
`38`	`38`	`var options = new DbContextOptionsBuilder<ApplicationDbContext>()`
`39`		`- .UseInMemoryDatabase(databaseName: "Find_User_Database") // Give a Unique name to the DB`
`40`		`- .Options;`
	`39`	`+ .UseInMemoryDatabase(databaseName: "SettingsTestDb").Options;`
`41`	`40`	`var dbContext = new ApplicationDbContext(options);`
`42`	`41`	`dbContext.Settings.Add(new Setting());`
`43`	`42`	`dbContext.Settings.Add(new Setting());`
`@@ -46,8 +45,7 @@ public async Task GetCountShouldReturnCorrectNumberUsingDbContext()`
`46`	`45`
`47`	`46`	`var repository = new EfDeletableEntityRepository<Setting>(dbContext);`
`48`	`47`	`var service = new SettingsService(repository);`
`49`		`- var count = service.GetCount();`
`50`		`- Assert.Equal(3, count);`
	`48`	`+ Assert.Equal(3, await service.GetCountAsync());`
`51`	`49`	`}`
`52`	`50`	`}`
`53`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`namespace AspNetCoreTemplate.Web.Areas.Administration.Controllers`
`2`	`2`	`{`
	`3`	`+ using System.Threading.Tasks;`
	`4`	`+`
`3`	`5`	`using AspNetCoreTemplate.Services.Data;`
`4`	`6`	`using AspNetCoreTemplate.Web.Areas.Administration.ViewModels.Dashboard;`
`5`	`7`
`@@ -14,9 +16,9 @@ public DashboardController(ISettingsService settingsService)`
`14`	`16`	`this.settingsService = settingsService;`
`15`	`17`	`}`
`16`	`18`
`17`		`- public IActionResult Index()`
	`19`	`+ public async Task<IActionResult> Index()`
`18`	`20`	`{`
`19`		`- var viewModel = new IndexViewModel { SettingsCount = this.settingsService.GetCount(), };`
	`21`	`+ var viewModel = new IndexViewModel { SettingsCount = await this.settingsService.GetCountAsync(), };`
`20`	`22`	`return this.View(viewModel);`
`21`	`23`	`}`
`22`	`24`	`}`