Improvements/code (#585)

* Make a static methods
* Refactor file reading to use async methods
* Refactor error handling in ApplicationBuilderExtensions
* Refactor SettingController.cs for improved readability
* Remove argument from the method call; it hides the caller information.
* Remove null-conditional operator from orderBuilder
* Simplify URL generation in _AdminLayout.cshtml
* Simplify log message in HomeController
* Fix potential null reference in currency dropdown
* Remove this unnecessary check for null.

Author: KrzysztofPajak

src/Business/Grand.Business.Authentication/Services/TwoFactorAuthenticationService.cs

@@ -87,7 +87,7 @@ await _customerService.UpdateUserField(customer, SystemCustomerFieldNames.TwoFac
         return model;
     }
 
-    private string PrepareRandomCode()
+    private static string PrepareRandomCode()
     {
         var generator = new Random();
         return generator.Next(0, 999999).ToString("D6");

src/Business/Grand.Business.Catalog/Services/ExportImport/BrandImportDataObject.cs

@@ -81,7 +81,7 @@ private async Task UpdateBrandData(BrandDto brandDto, Brand brand)
         await _slugService.SaveSlug(brand, seName, "");
     }
 
-    private bool ValidBrand(Brand brand)
+    private static bool ValidBrand(Brand brand)
     {
         return !string.IsNullOrEmpty(brand.Name);
     }

src/Business/Grand.Business.Catalog/Services/ExportImport/CategoryImportDataObject.cs

@@ -86,7 +86,7 @@ private async Task UpdateCategoryData(CategoryDto categoryDto, Category category
         await _slugService.SaveSlug(category, seName, "");
     }
 
-    private bool ValidCategory(Category category)
+    private static bool ValidCategory(Category category)
     {
         return !string.IsNullOrEmpty(category.Name);
     }

src/Business/Grand.Business.Catalog/Services/ExportImport/CollectionImportDataObject.cs

@@ -83,7 +83,7 @@ private async Task UpdateCollectionData(CollectionDto collectionDto, Collection
         await _slugService.SaveSlug(collection, sename, "");
     }
 
-    private bool ValidCollection(Collection collection)
+    private static bool ValidCollection(Collection collection)
     {
         return !string.IsNullOrEmpty(collection.Name);
     }

src/Business/Grand.Business.Catalog/Services/ExportImport/ProductImportDataObject.cs

@@ -265,7 +265,7 @@ private async Task PrepareProductPictures(ProductDto productDto, Product product
         }
     }
 
-    private bool ValidProduct(Product product)
+    private static bool ValidProduct(Product product)
     {
         return !string.IsNullOrEmpty(product.Name);
     }

src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs

@@ -258,10 +258,10 @@ public virtual async Task InsertProductAttributeValue(ProductAttributeValue prod
         ArgumentNullException.ThrowIfNull(productAttributeValue);
 
         var p = await _productRepository.GetByIdAsync(productId);
-        ArgumentNullException.ThrowIfNull(p, nameof(p));
+        ArgumentNullException.ThrowIfNull(p);
 
         var pam = p.ProductAttributeMappings.FirstOrDefault(x => x.Id == productAttributeMappingId);
-        ArgumentNullException.ThrowIfNull(pam, nameof(pam));
+        ArgumentNullException.ThrowIfNull(pam);
 
         pam.ProductAttributeValues.Add(productAttributeValue);
         await _productRepository.UpdateToSet(productId, x => x.ProductAttributeMappings, z => z.Id,

src/Business/Grand.Business.Catalog/Startup/StartupApplication.cs

@@ -44,7 +44,7 @@ public void Configure(WebApplication application, IWebHostEnvironment webHostEnv
     public int Priority => 100;
     public bool BeforeConfigure => false;
 
-    private void RegisterCatalogService(IServiceCollection serviceCollection)
+    private static void RegisterCatalogService(IServiceCollection serviceCollection)
     {
         serviceCollection.AddScoped<IOutOfStockSubscriptionService, OutOfStockSubscriptionService>();
         serviceCollection.AddScoped<ICategoryService, CategoryService>();
@@ -77,21 +77,21 @@ private void RegisterCatalogService(IServiceCollection serviceCollection)
         serviceCollection.AddScoped<IMeasureService, MeasureService>();
     }
 
-    private void RegisterDiscountsService(IServiceCollection serviceCollection)
+    private static void RegisterDiscountsService(IServiceCollection serviceCollection)
     {
         serviceCollection.AddScoped<IDiscountService, DiscountService>();
         serviceCollection.AddScoped<IDiscountValidationService, DiscountValidationService>();
         serviceCollection.AddScoped<IDiscountProviderLoader, DiscountProviderLoader>();
     }
 
-    private void RegisterTaxService(IServiceCollection serviceCollection)
+    private static void RegisterTaxService(IServiceCollection serviceCollection)
     {
         serviceCollection.AddScoped<ITaxService, TaxService>();
         serviceCollection.AddScoped<IVatService, VatService>();
         serviceCollection.AddScoped<ITaxCategoryService, TaxCategoryService>();
     }
 
-    private void RegisterExportImport(IServiceCollection serviceCollection)
+    private static void RegisterExportImport(IServiceCollection serviceCollection)
     {
         serviceCollection.AddScoped<ISchemaProperty<Brand>, BrandSchemaProperty>();
         serviceCollection.AddScoped<ISchemaProperty<Category>, CategorySchemaProperty>();

src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/PrepareOrderCodeCommandHandler.cs

@@ -24,7 +24,7 @@ public async Task<string> Handle(PrepareOrderCodeCommand request, CancellationTo
         return await Task.FromResult(code);
     }
 
-    private string RandomString(int length)
+    private static string RandomString(int length)
     {
         const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
         return new string(Enumerable.Repeat(chars, length)

src/Business/Grand.Business.Checkout/Commands/Handlers/Orders/ValidateMinShoppingCartSubtotalAmountCommandHandler.cs

@@ -38,7 +38,8 @@ protected virtual async Task<bool> ValidateMinOrderSubtotalAmount(IList<Shopping
             return false;
 
         //min order amount sub-total validation
-        if (!cart.Any() || !(_orderSettings.MinOrderSubtotalAmount > 0)) return true;
+        if (!(_orderSettings.MinOrderSubtotalAmount > 0)) return true;
+
         //subtotal
         var (_, _, subTotalWithoutDiscount, _, _) =
             await _orderTotalCalculationService.GetShoppingCartSubTotal(cart, false);

src/Business/Grand.Business.Checkout/Services/Orders/OrderReportService.cs

@@ -489,7 +489,8 @@ public virtual async Task<ReportPeriodOrder> GetOrderPeriodReport(int days, stri
             group o by 1
             into g
             select new ReportPeriodOrder { Amount = g.Sum(x => x.OrderTotal / x.CurrencyRate), Count = g.Count() };
-        var report = query.ToList()?.FirstOrDefault() ?? new ReportPeriodOrder();
+
+        var report = query.FirstOrDefault() ?? new ReportPeriodOrder();
         report.Date = date;
         return await Task.FromResult(report);
     }