Improvements/code (#587)

* Refactor nested loops to LINQ for better readability
* Refactor PageHeadBuilder constructor and head config
* Refactor BaseModel constructor and remove PostInitialize
* Refactor static strings to const or readonly
* Add default values to GetCountryReport parameters
* Refactor ShoppingCartService for flexibility and cleanup
* Ensure ParentCategoryId is not null or empty on insert
* Make customer parameter mandatory in InsertGuestCustomer

Author: KrzysztofPajak

src/Business/Grand.Business.Catalog/Events/Handlers/UpdateProductOnCartEventHandler.cs

@@ -18,15 +18,15 @@ public async Task Handle(UpdateProductOnCartEvent notification, CancellationToke
     {
         var customers = _customerRepository.Table
             .Where(x => x.ShoppingCartItems.Any(y => y.ProductId == notification.Product.Id)).ToList();
-        foreach (var cs in customers)
-        foreach (var item in cs.ShoppingCartItems.Where(x => x.ProductId == notification.Product.Id))
+        foreach (var (cs, item) in from cs in customers
+                                   from item in cs.ShoppingCartItems.Where(x => x.ProductId == notification.Product.Id)
+                                   select (cs, item))
         {
             item.AdditionalShippingChargeProduct = notification.Product.AdditionalShippingCharge;
             item.IsFreeShipping = notification.Product.IsFreeShipping;
             item.IsGiftVoucher = notification.Product.IsGiftVoucher;
             item.IsShipEnabled = notification.Product.IsShipEnabled;
             item.IsTaxExempt = notification.Product.IsTaxExempt;
-
             await _customerRepository.UpdateToSet(cs.Id, x => x.ShoppingCartItems, z => z.Id, item.Id, item);
         }
     }

src/Business/Grand.Business.Catalog/Services/Categories/CategoryService.cs

@@ -402,6 +402,8 @@ public virtual async Task<Category> GetCategoryById(string categoryId)
     public virtual async Task InsertCategory(Category category)
     {
         ArgumentNullException.ThrowIfNull(category);
+        if (string.IsNullOrEmpty(category.ParentCategoryId))
+            category.ParentCategoryId = "";
 
         await _categoryRepository.InsertAsync(category);
 

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

@@ -60,9 +60,8 @@ public OrderReportService(IRepository<Order> orderRepository,
     /// <param name="startTimeUtc">Start date</param>
     /// <param name="endTimeUtc">End date</param>
     /// <returns>Result</returns>
-    public virtual async Task<IList<OrderByCountryReportLine>> GetCountryReport(string storeId, string vendorId,
-        int? os,
-        PaymentStatus? ps, ShippingStatus? ss, DateTime? startTimeUtc, DateTime? endTimeUtc)
+    public virtual async Task<IList<OrderByCountryReportLine>> GetCountryReport(string storeId = "", string vendorId = "",
+        int? os = null, PaymentStatus? ps = null, ShippingStatus? ss = null, DateTime? startTimeUtc = null, DateTime? endTimeUtc = null)
     {
         var query = from p in _orderRepository.Table
             select p;

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

@@ -8,7 +8,6 @@
 using Grand.Domain.Common;
 using Grand.Domain.Customers;
 using Grand.Domain.Orders;
-using Grand.Domain.Payments;
 using Grand.Infrastructure;
 using Grand.Infrastructure.Extensions;
 using MediatR;
@@ -314,7 +313,7 @@ await _mediator.Send(new AddRequiredProductsCommand {
     /// <returns>Warnings</returns>
     public virtual async Task<IList<string>> UpdateShoppingCartItem(Customer customer,
         string shoppingCartItemId, string warehouseId, IList<CustomAttribute> attributes,
-        double? customerEnteredPrice,
+        double? customerEnteredPrice = null,
         DateTime? rentalStartDate = null, DateTime? rentalEndDate = null,
         int quantity = 1, bool resetCheckoutData = true, string reservationId = "", string sciId = "")
     {

src/Business/Grand.Business.Core/Interfaces/Customers/ICustomerService.cs

@@ -128,7 +128,7 @@ Task<int> GetCountOnlineShoppingCart(DateTime lastActivityFromUtc, string storeI
     ///     Insert a guest customer
     /// </summary>
     /// <returns>Customer</returns>
-    Task<Customer> InsertGuestCustomer(Customer customer = null);
+    Task<Customer> InsertGuestCustomer(Customer customer);
 
     /// <summary>
     ///     Insert a customer

src/Core/Grand.Infrastructure/Caching/Constants/CommonCacheKey.cs

@@ -136,7 +136,7 @@ public static partial class CacheKey
     /// <summary>
     ///     Key pattern to clear cache
     /// </summary>
-    public static string URLEntity_PATTERN_KEY = "Grand.urlEntity.";
+    public const string URLEntity_PATTERN_KEY = "Grand.urlEntity.";
 
     #endregion
 

src/Core/Grand.Infrastructure/GrandVersion.cs

@@ -33,12 +33,12 @@ public static class GrandVersion
     /// <summary>
     ///     Gets the git branch
     /// </summary>
-    public static string GitBranch = GetGitBranch();
+    public static readonly string GitBranch = GetGitBranch();
 
     /// <summary>
     ///     Gets the git commit
     /// </summary>
-    public static string GitCommit = GetGitHash();
+    public static readonly string GitCommit = GetGitHash();
 
     /// <summary>
     ///     Gets the patch version

src/Core/Grand.Infrastructure/Models/BaseModel.cs

@@ -12,8 +12,7 @@ public class BaseModel
 
     public BaseModel()
     {
-        UserFields = new List<UserField>();
-        PostInitialize();
+        UserFields = [];
     }
 
     #endregion
@@ -29,10 +28,5 @@ public BaseModel()
     public virtual void BindModel(ModelBindingContext bindingContext)
     {
     }
-
-    protected virtual void PostInitialize()
-    {
-    }
-
     #endregion
 }

src/Core/Grand.SharedKernel/Extensions/CommonPath.cs

@@ -2,15 +2,15 @@
 
 public static class CommonPath
 {
-    public static string AppData => "App_Data";
+    public const string AppData = "App_Data";
 
-    public static string Plugins => "Plugins";
+    public const string Plugins = "Plugins";
 
-    public static string TmpUploadPath = "TempUploads";
+    public const string TmpUploadPath = "TempUploads";
 
-    public static string DirectoryParam = "Directory";
+    public const string DirectoryParam = "Directory";
 
-    public static string SettingsFile = "Settings.cfg";
+    public const string SettingsFile = "Settings.cfg";
 
-    public static string InstalledPluginsFile = "InstalledPlugins.cfg";
+    public const string InstalledPluginsFile = "InstalledPlugins.cfg";
 }

src/Plugins/Widgets.FacebookPixel/FacebookPixelDefaults.cs

@@ -5,7 +5,7 @@ public static class FacebookPixelDefaults
     public const string ProviderSystemName = "Widgets.FacebookPixel";
     public const string FriendlyName = "Widgets.FacebookPixel.FriendlyName";
     public const string ConfigurationUrl = "../WidgetsFacebookPixel/Configure";
-    public static string ConsentCookieSystemName = "FacebookPixel";
+    public const string ConsentCookieSystemName = "FacebookPixel";
 
     public static string Page => "head_html_tag";
     public static string AddToCart => "popup_add_to_cart_content_before";