feat: make some methods of BrowseFilterService protected (#759)

Co-authored-by: Kutasina Elena <[email protected]>

Author: dvs39

…gModule.Web/Model/AggregationProperty.cs …Module.Core/Model/AggregationProperty.cssrc/VirtoCommerce.CatalogModule.Web/Model/AggregationProperty.cs renamed to src/VirtoCommerce.CatalogModule.Core/Model/AggregationProperty.cs src/VirtoCommerce.CatalogModule.Web/Model/AggregationProperty.cs renamed to src/VirtoCommerce.CatalogModule.Core/Model/AggregationProperty.cs

@@ -1,24 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace VirtoCommerce.CatalogModule.Web.Model
-{
-    public class AggregationProperty : ICloneable
-    {
-        public string Name { get; set; }
-        public bool IsSelected { get; set; }
-        public string Type { get; set; }
-        public string Currency { get; set; }
-        public int? Size { get; set; }
-        public int ValuesCount => Values?.Count ?? 0;
-        public IList<string> Values { get; set; }
-
-        public object Clone()
-        {
-            var result = (AggregationProperty)MemberwiseClone();
-            result.Values = Values?.ToList();
-            return result;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace VirtoCommerce.CatalogModule.Core.Model
+{
+    public class AggregationProperty : ICloneable
+    {
+        public string Name { get; set; }
+        public bool IsSelected { get; set; }
+        public string Type { get; set; }
+        public string Currency { get; set; }
+        public int? Size { get; set; }
+        public int ValuesCount => Values?.Count ?? 0;
+        public IList<string> Values { get; set; }
+
+        public object Clone()
+        {
+            var result = (AggregationProperty)MemberwiseClone();
+            result.Values = Values?.ToList();
+            return result;
+        }
+    }
+}

src/VirtoCommerce.CatalogModule.Data/Search/BrowseFilters/BrowseFilterService.cs

@@ -118,7 +118,7 @@ protected virtual async Task SaveSerializedValue(string storeId, string serializ
 
 
         // Support JSON for serialization
-        private static string Serialize(IList<IBrowseFilter> filters)
+        protected static string Serialize(IList<IBrowseFilter> filters)
         {
             string result = null;
 
@@ -133,20 +133,18 @@ private static string Serialize(IList<IBrowseFilter> filters)
                 };
 
                 // Serialize to JSON
-                using (var memStream = new MemoryStream())
-                {
-                    browsing.SerializeJson(memStream, _jsonSerializer);
-                    memStream.Seek(0, SeekOrigin.Begin);
+                using var memStream = new MemoryStream();
+                browsing.SerializeJson(memStream, _jsonSerializer);
+                memStream.Seek(0, SeekOrigin.Begin);
 
-                    result = memStream.ReadToString();
-                }
+                result = memStream.ReadToString();
             }
 
             return result;
         }
 
         // Support both JSON and XML for deserialization
-        private static IList<IBrowseFilter> Deserialize(string value)
+        protected static IList<IBrowseFilter> Deserialize(string value)
         {
             IList<IBrowseFilter> result = null;
 
@@ -163,11 +161,9 @@ private static IList<IBrowseFilter> Deserialize(string value)
                 else
                 {
                     // JSON
-                    using (var stringReader = new StringReader(value))
-                    using (var jsonTextReader = new JsonTextReader(stringReader))
-                    {
-                        browsing = _jsonSerializer.Deserialize<FilteredBrowsing>(jsonTextReader);
-                    }
+                    using var stringReader = new StringReader(value);
+                    using var jsonTextReader = new JsonTextReader(stringReader);
+                    browsing = _jsonSerializer.Deserialize<FilteredBrowsing>(jsonTextReader);
                 }
 
                 // Flatten groups

src/VirtoCommerce.CatalogModule.Web/Controllers/Api/CatalogBrowseFiltersController.cs

@@ -7,11 +7,11 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using VirtoCommerce.CatalogModule.Core;
+using VirtoCommerce.CatalogModule.Core.Model;
 using VirtoCommerce.CatalogModule.Core.Model.Search;
 using VirtoCommerce.CatalogModule.Core.Search;
 using VirtoCommerce.CatalogModule.Core.Services;
 using VirtoCommerce.CatalogModule.Data.Search.BrowseFilters;
-using VirtoCommerce.CatalogModule.Web.Model;
 using VirtoCommerce.Platform.Core.Common;
 using VirtoCommerce.Platform.Core.Settings;
 using VirtoCommerce.StoreModule.Core.Model;