Minor improvements - Add to the cache - handler - get all manufacturer

neoayi · Apr 2, 2020 · 35ec48f · 35ec48f
1 parent e0b8fb1
commit 35ec48f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 2 deletions.
diff --git a/Grand.Web/Controllers/CatalogController.cs b/Grand.Web/Controllers/CatalogController.cs
@@ -217,6 +217,7 @@ public virtual async Task<IActionResult> Manufacturer(string manufacturerId, Cat
         public virtual async Task<IActionResult> ManufacturerAll()
         {
             var model = await _mediator.Send(new GetManufacturerAll() {
+                Customer = _workContext.CurrentCustomer,
                 Language = _workContext.WorkingLanguage,
                 Store = _storeContext.CurrentStore
             });

diff --git a/Grand.Web/Features/Handlers/Catalog/GetManufacturerAllHandler.cs b/Grand.Web/Features/Handlers/Catalog/GetManufacturerAllHandler.cs
@@ -1,9 +1,12 @@
-using Grand.Core.Domain.Media;
+using Grand.Core.Caching;
+using Grand.Core.Domain.Media;
 using Grand.Services.Catalog;
+using Grand.Services.Customers;
 using Grand.Services.Localization;
 using Grand.Services.Media;
 using Grand.Web.Extensions;
 using Grand.Web.Features.Models.Catalog;
+using Grand.Web.Infrastructure.Cache;
 using Grand.Web.Models.Catalog;
 using Grand.Web.Models.Media;
 using MediatR;
@@ -18,20 +21,32 @@ public class GetManufacturerAllHandler : IRequestHandler<GetManufacturerAll, ILi
         private readonly IManufacturerService _manufacturerService;
         private readonly IPictureService _pictureService;
         private readonly ILocalizationService _localizationService;
+        private readonly ICacheManager _cacheManager;
         private readonly MediaSettings _mediaSettings;
 
         public GetManufacturerAllHandler(IManufacturerService manufacturerService,
             IPictureService pictureService,
             ILocalizationService localizationService,
+            ICacheManager cacheManager,
             MediaSettings mediaSettings)
         {
             _manufacturerService = manufacturerService;
             _pictureService = pictureService;
             _localizationService = localizationService;
+            _cacheManager = cacheManager;
             _mediaSettings = mediaSettings;
         }
 
         public async Task<IList<ManufacturerModel>> Handle(GetManufacturerAll request, CancellationToken cancellationToken)
+        {
+            string cacheKey = string.Format(ModelCacheEventConst.MANUFACTURER_ALL_MODEL_KEY,
+                request.Language.Id,
+                string.Join(",", request.Customer.GetCustomerRoleIds()),
+                request.Store.Id);
+            return await _cacheManager.GetAsync(cacheKey, () => PrepareManufacturerAll(request));            
+        }
+
+        private async Task<List<ManufacturerModel>> PrepareManufacturerAll(GetManufacturerAll request)
         {
             var model = new List<ManufacturerModel>();
             var manufacturers = await _manufacturerService.GetAllManufacturers(storeId: request.Store.Id);

diff --git a/Grand.Web/Features/Models/Catalog/GetManufacturerAll.cs b/Grand.Web/Features/Models/Catalog/GetManufacturerAll.cs
@@ -1,4 +1,5 @@
-using Grand.Core.Domain.Localization;
+using Grand.Core.Domain.Customers;
+using Grand.Core.Domain.Localization;
 using Grand.Core.Domain.Stores;
 using Grand.Web.Models.Catalog;
 using MediatR;
@@ -9,6 +10,7 @@ namespace Grand.Web.Features.Models.Catalog
     public class GetManufacturerAll : IRequest<IList<ManufacturerModel>>
     {
         public Store Store { get; set; }
+        public Customer Customer { get; set; }
         public Language Language { get; set; }
     }
 }
diff --git a/Grand.Web/Infrastructure/Cache/ModelCacheEventConst.cs b/Grand.Web/Infrastructure/Cache/ModelCacheEventConst.cs
@@ -44,6 +44,7 @@ public static class ModelCacheEventConst
         /// </remarks>
         public const string MANUFACTURER_HOMEPAGE_KEY = "Grand.pres.manufacturer.navigation.homepage-{0}-{1}";
 
+
         /// <summary>
         /// Key for caching of manufacturer displayed on home page
         /// </summary>
@@ -54,6 +55,15 @@ public static class ModelCacheEventConst
         /// </remarks>
         public const string MANUFACTURER_FEATURED_PRODUCT_HOMEPAGE_KEY = "Grand.pres.manufacturer.navigation.homepage-fp-{0}-{1}-{2}";
 
+        /// <summary>
+        /// Key for List of ManufacturerModel caching
+        /// </summary>
+        /// <remarks>
+        /// {0} : language id
+        /// {1} : comma separated list of customer roles
+        /// {2} : current store ID
+        /// </remarks>
+        public const string MANUFACTURER_ALL_MODEL_KEY = "Grand.pres.manufacturer.navigation.all-{0}-{1}-{2}";
 
         /// <summary>
         /// Key for VendorNavigationModel caching