[ASP.NET Core] Code improvements

Author: NikolayIT

ASP.NET Core/Data/AspNetCoreTemplate.Data/DesignTimeDbContextFactory.cs

@@ -4,7 +4,6 @@
 
     using Microsoft.EntityFrameworkCore;
     using Microsoft.EntityFrameworkCore.Design;
-    using Microsoft.EntityFrameworkCore.Diagnostics;
     using Microsoft.Extensions.Configuration;
 
     public class DesignTimeDbContextFactory : IDesignTimeDbContextFactory<ApplicationDbContext>
@@ -17,9 +16,7 @@ public ApplicationDbContext CreateDbContext(string[] args)
                 .Build();
 
             var builder = new DbContextOptionsBuilder<ApplicationDbContext>();
-
             var connectionString = configuration.GetConnectionString("DefaultConnection");
-
             builder.UseSqlServer(connectionString);
 
             return new ApplicationDbContext(builder.Options);

ASP.NET Core/Data/AspNetCoreTemplate.Data/EfExpressionHelper.cs

@@ -31,11 +31,8 @@ public static Expression<Func<TEntity, bool>> BuildByIdPredicate<TEntity>(
             }
 
             var entityType = typeof(TEntity);
-
             var entityParameter = Expression.Parameter(entityType, "e");
-
             var keyProperties = dbContext.Model.FindEntityType(entityType).FindPrimaryKey().Properties;
-
             var predicate = BuildPredicate(keyProperties, new ValueBuffer(id), entityParameter);
 
             return Expression.Lambda<Func<TEntity, bool>>(predicate, entityParameter);
@@ -52,18 +49,14 @@ private static BinaryExpression BuildPredicate(
             for (var i = 0; i < keyProperties.Count; i++)
             {
                 var property = keyProperties[i];
-                var equalsExpression =
-                    Expression.Equal(
-                        Expression.Call(
-                            EfPropertyMethod.MakeGenericMethod(property.ClrType),
-                            entityParameter,
-                            Expression.Constant(property.Name, StringType)),
-                        Expression.Convert(
-                            Expression.Call(
-                                keyValuesConstant,
-                                ValueBufferGetValueMethod,
-                                Expression.Constant(i)),
-                            property.ClrType));
+                var equalsExpression = Expression.Equal(
+                    Expression.Call(
+                        EfPropertyMethod.MakeGenericMethod(property.ClrType),
+                        entityParameter,
+                        Expression.Constant(property.Name, StringType)),
+                    Expression.Convert(
+                        Expression.Call(keyValuesConstant, ValueBufferGetValueMethod, Expression.Constant(i)),
+                        property.ClrType));
 
                 predicate = predicate == null ? equalsExpression : Expression.AndAlso(predicate, equalsExpression);
             }

ASP.NET Core/Data/AspNetCoreTemplate.Data/Repositories/EfDeletableEntityRepository.cs

@@ -27,9 +27,8 @@ public EfDeletableEntityRepository(ApplicationDbContext context)
 
         public Task<TEntity> GetByIdWithDeletedAsync(params object[] id)
         {
-            var byIdPredicate = EfExpressionHelper.BuildByIdPredicate<TEntity>(this.Context, id);
-
-            return this.AllWithDeleted().FirstOrDefaultAsync(byIdPredicate);
+            var getByIdPredicate = EfExpressionHelper.BuildByIdPredicate<TEntity>(this.Context, id);
+            return this.AllWithDeleted().FirstOrDefaultAsync(getByIdPredicate);
         }
 
         public void HardDelete(TEntity entity) => base.Delete(entity);
@@ -38,15 +37,13 @@ public void Undelete(TEntity entity)
         {
             entity.IsDeleted = false;
             entity.DeletedOn = null;
-
             this.Update(entity);
         }
 
         public override void Delete(TEntity entity)
         {
             entity.IsDeleted = true;
             entity.DeletedOn = DateTime.UtcNow;
-
             this.Update(entity);
         }
     }

ASP.NET Core/Data/AspNetCoreTemplate.Data/Repositories/EfRepository.cs

@@ -25,7 +25,7 @@ public EfRepository(ApplicationDbContext context)
 
         public virtual IQueryable<TEntity> AllAsNoTracking() => this.DbSet.AsNoTracking();
 
-        public virtual async Task AddAsync(TEntity entity) => await this.DbSet.AddAsync(entity);
+        public virtual Task AddAsync(TEntity entity) => this.DbSet.AddAsync(entity).AsTask();
 
         public virtual void Update(TEntity entity)
         {

ASP.NET Core/Web/AspNetCoreTemplate.Web/Controllers/HomeController.cs

@@ -1,5 +1,9 @@
 namespace AspNetCoreTemplate.Web.Controllers
 {
+    using System.Diagnostics;
+
+    using AspNetCoreTemplate.Web.ViewModels;
+
     using Microsoft.AspNetCore.Mvc;
 
     public class HomeController : BaseController
@@ -15,6 +19,10 @@ public IActionResult Privacy()
         }
 
         [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error() => this.View();
+        public IActionResult Error()
+        {
+            return this.View(
+                new ErrorViewModel { RequestId = Activity.Current?.Id ?? this.HttpContext.TraceIdentifier });
+        }
     }
 }