Refactor StoreService and WorkContextSetter

Author: KrzysztofPajak

src/Business/Grand.Business.Common/Services/Stores/StoreService.cs

@@ -56,18 +56,6 @@ public virtual async Task<IList<Store>> GetAllStores()
         });
     }
 
-    /// <summary>
-    ///     Gets all stores
-    /// </summary>
-    /// <returns>Stores</returns>
-    public virtual IList<Store> GetAll()
-    {
-        return _allStores ??= _cacheBase.Get(CacheKey.STORES_ALL_KEY, () =>
-        {
-            return _storeRepository.Table.OrderBy(x => x.DisplayOrder).ToList();
-        });
-    }
-
     /// <summary>
     ///     Gets a store
     /// </summary>

src/Business/Grand.Business.Core/Interfaces/Common/Stores/IStoreService.cs

@@ -13,12 +13,6 @@ public interface IStoreService
     /// <returns>Stores</returns>
     Task<IList<Store>> GetAllStores();
 
-    /// <summary>
-    ///     Gets all stores
-    /// </summary>
-    /// <returns>Stores</returns>
-    IList<Store> GetAll();
-
     /// <summary>
     ///     Gets a store
     /// </summary>

src/Web/Grand.Web.Common/WorkContextSetter.cs

@@ -13,6 +13,7 @@
 using Grand.Domain.Vendors;
 using Grand.Infrastructure;
 using Grand.Infrastructure.Configuration;
+using Grand.SharedKernel.Extensions;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Localization;
@@ -38,7 +39,6 @@ public WorkContextSetter(
         IStoreService storeService,
         IAclService aclService,
         IVendorService vendorService,
-        LanguageSettings languageSettings,
         TaxSettings taxSettings,
         AppConfig config)
     {
@@ -51,7 +51,6 @@ public WorkContextSetter(
         _storeService = storeService;
         _aclService = aclService;
         _vendorService = vendorService;
-        _languageSettings = languageSettings;
         _taxSettings = taxSettings;
         _config = config;
     }
@@ -70,7 +69,6 @@ public WorkContextSetter(
     private readonly IAclService _aclService;
     private readonly IVendorService _vendorService;
 
-    private readonly LanguageSettings _languageSettings;
     private readonly TaxSettings _taxSettings;
     private readonly AppConfig _config;
 
@@ -347,8 +345,7 @@ protected async Task<Language> WorkingLanguage(Customer customer, Store store)
         var customerLanguageId =
             customer.GetUserFieldFromEntity<string>(SystemCustomerFieldNames.LanguageId, store.Id);
 
-        if (_languageSettings.AutomaticallyDetectLanguage &&
-            language == null && string.IsNullOrEmpty(customerLanguageId))
+        if (language == null && string.IsNullOrEmpty(customerLanguageId))
             language = await GetLanguageFromRequest(allStoreLanguages, store);
 
         //check customer language 
@@ -420,10 +417,9 @@ protected async Task<TaxDisplayType> TaxDisplayType(Customer customer, Store sto
         return await Task.FromResult(taxDisplayType);
     }
 
-    private const string StoreCookieName = ".Grand.Store";
     private string GetStoreCookie()
     {
-        return _httpContextAccessor.HttpContext?.Request.Cookies[StoreCookieName];
+        return _httpContextAccessor.HttpContext?.Request.Cookies[CommonHelper.StoreCookieName];
     }
 
     protected async Task<Store> CurrentStore(string id = null)
@@ -433,7 +429,7 @@ protected async Task<Store> CurrentStore(string id = null)
 
         var host = _httpContextAccessor.HttpContext?.Request.Host.Host;
 
-        var allStores = _storeService.GetAll();
+        var allStores = await _storeService.GetAllStores();
         var stores = allStores.Where(s => s.ContainsHostValue(host)).ToList();
         if (!stores.Any())
             return allStores.FirstOrDefault();

src/Web/Grand.Web/Controllers/CommonController.cs

@@ -248,7 +248,7 @@ public virtual async Task<IActionResult> SetStore(
         if (currentstoreShortcut != shortcut)
             if (commonSettings.AllowToSelectStore)
             {
-                var selectedstore = storeService.GetAll().FirstOrDefault(x =>
+                var selectedstore = (await storeService.GetAllStores()).FirstOrDefault(x =>
                     string.Equals(x.Shortcut, shortcut, StringComparison.InvariantCultureIgnoreCase));
                 if (selectedstore != null)
                 {

src/Web/Grand.Web/Views/Shared/Partials/Selector_Store.cshtml

@@ -3,7 +3,7 @@
 @inject IStoreService StoreService
 @inject IWorkContextAccessor workContextAccessor
 @{
-    var availableStores = StoreService.GetAll()
+    var availableStores = (await StoreService.GetAllStores())
         .Select(x =>
         {
             //model