Merge pull request #360 from Bram1903/Code_Refactoring

Thank you very much for your participation
neozhu · Apr 24, 2023 · 88fffde · 88fffde
2 parents 39bd782 + ece2081
commit 88fffde
Show file tree

Hide file tree

Showing 242 changed files with 1,723 additions and 2,119 deletions.
diff --git a/src/Application/Common/Behaviours/AuthorizationBehaviour.cs b/src/Application/Common/Behaviours/AuthorizationBehaviour.cs
@@ -1,9 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 using CleanArchitecture.Blazor.Application.Common.Interfaces.Identity;
 using CleanArchitecture.Blazor.Application.Common.Security;
-using System.Reflection;
 
 namespace CleanArchitecture.Blazor.Application.Common.Behaviours;
 

diff --git a/src/Application/Common/Behaviours/CacheInvalidationBehaviour.cs b/src/Application/Common/Behaviours/CacheInvalidationBehaviour.cs
@@ -20,7 +20,7 @@ ILogger<CacheInvalidationBehaviour<TRequest, TResponse>> logger
     }
     public async Task<TResponse> Handle(TRequest request,  RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
     {
-        _logger.LogTrace("{Name} cache expire with {@Request}.", nameof(request), request);
+        _logger.LogTrace("{Name} cache expire with {@Request}", nameof(request), request);
         var response = await next().ConfigureAwait(false);
         if (!string.IsNullOrEmpty(request.CacheKey))
         {

diff --git a/src/Application/Common/Behaviours/MemoryCacheBehaviour.cs b/src/Application/Common/Behaviours/MemoryCacheBehaviour.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using LazyCache;
-
 namespace CleanArchitecture.Blazor.Application.Common.Behaviours;
 
 public class MemoryCacheBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse>
@@ -21,7 +19,7 @@ ILogger<MemoryCacheBehaviour<TRequest, TResponse>> logger
     }
     public async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
     {
-        _logger.LogTrace("{Name} is caching with {@Request}.", nameof(request),request);
+        _logger.LogTrace("{Name} is caching with {@Request}", nameof(request),request);
         var response = await _cache.GetOrAddAsync(
             request.CacheKey,
             async () =>

diff --git a/src/Application/Common/Behaviours/UnhandledExceptionBehaviour.cs b/src/Application/Common/Behaviours/UnhandledExceptionBehaviour.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Threading;
-
 namespace CleanArchitecture.Blazor.Application.Common.Behaviours;
 
 public class UnhandledExceptionBehaviour<TRequest, TResponse> : IPipelineBehavior<TRequest, TResponse> where TRequest : IRequest<TResponse>

diff --git a/src/Application/Common/Behaviours/ValidationBehaviour.cs b/src/Application/Common/Behaviours/ValidationBehaviour.cs
@@ -17,14 +17,14 @@ public ValidationBehaviour(
     public  async Task<TResponse> Handle(TRequest request, RequestHandlerDelegate<TResponse> next, CancellationToken cancellationToken)
     {
         var context = new ValidationContext<TRequest>(request);
-        var failrules = _validators
+        var failRules = _validators
             .Select(validator => validator.Validate(context))
             .SelectMany(result => result.Errors)
-            .Where(failrules => failrules != null)
+            .Where(failRules => failRules != null)
             .ToList();
-        if (failrules.Any())
+        if (failRules.Any())
         {
-            throw new ValidationException(failrules);
+            throw new ValidationException(failRules);
         }
         return await next().ConfigureAwait(false);
     }

diff --git a/src/Application/Common/Configurations/AppConfigurationSettings.cs b/src/Application/Common/Configurations/AppConfigurationSettings.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace CleanArchitecture.Blazor.Application.Configurations;
+namespace CleanArchitecture.Blazor.Application.Common.Configurations;
 
 public class AppConfigurationSettings
 {

diff --git a/src/Application/Common/Configurations/DashbordSettings.cs b/src/Application/Common/Configurations/DashbordSettings.cs
@@ -1,18 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace CleanArchitecture.Blazor.Application.Configurations;
+namespace CleanArchitecture.Blazor.Application.Common.Configurations;
 
 public class DashboardSettings
 {
     public const string SectionName = nameof(DashboardSettings);
 
-    public string Version { get; set; }="6.0.2";
+    public string Version { get; set; } = "6.0.2";
     public string App { get; set; } = "Dashboard";
     public string AppName { get; set; } = "Admin Dashboard";
     public string AppFlavor { get; set; } = String.Empty;
     public string AppFlavorSubscript { get; set; } = String.Empty;
     public string Company { get; set; } = "Company";
-    public string Copyright { get; set; } = "@2022 Copyright";
+    public string Copyright { get; set; } = "@2023 Copyright";
 
 }
diff --git a/src/Application/Common/ExceptionHandlers/ConflictException.cs b/src/Application/Common/ExceptionHandlers/ConflictException.cs
@@ -1,4 +1,4 @@
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 public class ConflictException : ServerException
 {
     public ConflictException(string message)

diff --git a/src/Application/Common/ExceptionHandlers/DbExceptionHandler.cs b/src/Application/Common/ExceptionHandlers/DbExceptionHandler.cs
@@ -1,15 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading.Tasks;
-using CleanArchitecture.Blazor.Application.Features.Products.Commands.AddEdit;
-using Microsoft.Data.SqlClient;
-using Microsoft.EntityFrameworkCore;
+using Microsoft.Data.SqlClient;
 
 namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
-public class DbExceptionHandler<TRequest, TResponse, TException> : IRequestExceptionHandler<TRequest, TResponse, TException>
+
+public class
+    DbExceptionHandler<TRequest, TResponse, TException> : IRequestExceptionHandler<TRequest, TResponse, TException>
     where TRequest : IRequest<Result>
     where TException : DbUpdateException
 {
@@ -20,51 +14,53 @@ public DbExceptionHandler(ILogger<DbExceptionHandler<TRequest, TResponse, TExcep
         _logger = logger;
     }
 
-    public Task Handle(TRequest request, TException exception, RequestExceptionHandlerState<TResponse> state, CancellationToken cancellationToken)
+    public Task Handle(TRequest request, TException exception, RequestExceptionHandlerState<TResponse> state,
+        CancellationToken cancellationToken)
     {
-        var response = Activator.CreateInstance<TResponse>();
+        TResponse response = Activator.CreateInstance<TResponse>();
         if (response is Result result)
         {
             result.Succeeded = false;
-            result.Errors = getErrors(exception);
+            result.Errors = GetErrors(exception);
             state.SetHandled(response);
         }
+
         return Task.CompletedTask;
     }
 
-    private string[] getErrors(DbUpdateException exception)
+    private static string[] GetErrors(DbUpdateException exception)
     {
         IList<string> errors = new List<string>();
         if (exception.InnerException != null
-               && exception.InnerException != null
-               && exception.InnerException is SqlException sqlException
-            )
+            && exception.InnerException != null
+            && exception.InnerException is SqlException sqlException
+           )
         {
             switch (sqlException.Number)
             {
-                case 2627:  // Unique constraint error
-                    errors.Add("A Unique Constraint Error Has Occured While Updating the record! Duplicate Record cannot be inserted in the System.");
+                case 2627: // Unique constraint error
+                    errors.Add(
+                        "A Unique Constraint Error Has Occured While Updating the record! Duplicate Record cannot be inserted in the System.");
                     break;
-                case 544:   // Cannot insert explicit value for identity column in table 'Departments' when IDENTITY_INSERT is set to OFF
-                    errors.Add("Cannot insert explicit value for identity column in the system when the id is set to OFF");
+                case 544
+                    : // Cannot insert explicit value for identity column in table 'Departments' when IDENTITY_INSERT is set to OFF
+                    errors.Add(
+                        "Cannot insert explicit value for identity column in the system when the id is set to OFF");
                     break;
-                case 547:   // Constraint check violation, Conflict in the database
+                case 547: // Constraint check violation, Conflict in the database
                     errors.Add("A Constraint Check violation Error Has Occured While Updating the record(s)!");
                     break;
-                case 2601:  // Duplicated key row error // Constraint violation exception // A custom exception of yours for concurrency issues           
+                case 2601
+                    : // Duplicated key row error // Constraint violation exception // A custom exception of yours for concurrency issues           
                     errors.Add("A Duplicate Key Error Has Occured While Updating the record(s)!");
                     break;
-                case 201:  // Proceudre missing parameters            
+                case 201: // Procedure missing parameters            
                     errors.Add("A Missing Parameter has led to Error  While Creating the record(s)!");
                     break;
-                default:
-                    break;
             }
         }
 
 
-
         return errors.ToArray();
-
     }
-}
+}
diff --git a/src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs b/src/Application/Common/ExceptionHandlers/ForbiddenAccessException.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 
 public class ForbiddenException : ServerException
 {

diff --git a/src/Application/Common/ExceptionHandlers/InternalServerException.cs b/src/Application/Common/ExceptionHandlers/InternalServerException.cs
@@ -1,4 +1,4 @@
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 public class InternalServerException : ServerException
 {
     public InternalServerException(string message)

diff --git a/src/Application/Common/ExceptionHandlers/NotFoundException.cs b/src/Application/Common/ExceptionHandlers/NotFoundException.cs
@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 
 public class NotFoundException : ServerException
 {

diff --git a/src/Application/Common/ExceptionHandlers/ServerException.cs b/src/Application/Common/ExceptionHandlers/ServerException.cs
@@ -1,6 +1,6 @@
 using System.Net;
 
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 public class ServerException : Exception
 {
     public IEnumerable<string> ErrorMessages { get; }

diff --git a/src/Application/Common/ExceptionHandlers/UnauthorizedException.cs b/src/Application/Common/ExceptionHandlers/UnauthorizedException.cs
@@ -1,4 +1,4 @@
-namespace CleanArchitecture.Blazor.Application.Common.Exceptions;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 public class UnauthorizedException : ServerException
 {
     public UnauthorizedException(string message)

diff --git a/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs b/src/Application/Common/ExceptionHandlers/ValidationExceptionHandler.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
+namespace CleanArchitecture.Blazor.Application.Common.ExceptionHandlers;
 public class ValidationExceptionHandler<TRequest, TResponse, TException> : IRequestExceptionHandler<TRequest, TResponse, TException>
     where TRequest : IRequest<Result>
     where TException : ValidationException

diff --git a/src/Application/Common/Extensions/DataRowExtensions.cs b/src/Application/Common/Extensions/DataRowExtensions.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Text;
-
 namespace CleanArchitecture.Blazor.Application.Common.Extensions;
 
 public static class DataRowExtensions

diff --git a/src/Application/Common/Extensions/DescriptionAttributeExtensions.cs b/src/Application/Common/Extensions/DescriptionAttributeExtensions.cs
@@ -1,7 +1,4 @@
-using System.ComponentModel;
-using System.Reflection;
-
-namespace CleanArchitecture.Blazor.Application.Common.Extensions;
+namespace CleanArchitecture.Blazor.Application.Common.Extensions;
 public static class DescriptionAttributeExtensions
 {
     public static string GetDescription(this Enum e)