Improve performance (#80)

* Get total count before sorting to improve performance * Improve readability
VirtoCommerce · Mar 27, 2020 · c6c546b · c6c546b
1 parent 16cdf78
commit c6c546b
Showing 1 changed file with 31 additions and 21 deletions.
diff --git a/VirtoCommerce.PricingModule.Data/Services/PricingSearchServiceImpl.cs b/VirtoCommerce.PricingModule.Data/Services/PricingSearchServiceImpl.cs
@@ -37,19 +37,18 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
         {
             var result = new PricingSearchResult<coreModel.Price>();
 
-            ICollection<CatalogProduct> products;
-
             using (var repository = _repositoryFactory())
             {
                 repository.DisableChangesTracking();
 
-                var query = GetPricesQuery(repository, criteria, out products);
+                var query = GetPricesQuery(repository, criteria, out _);
 
                 var sortInfos = criteria.SortInfos;
                 if (sortInfos.IsNullOrEmpty())
                 {
                     sortInfos = new[] { new SortInfo { SortColumn = ReflectionUtility.GetPropertyName<coreModel.Price>(x => x.List) } };
                 }
+
                 //Try to replace sorting columns names
                 TryTransformSortingInfoColumnNames(_pricesSortingAliases, sortInfos);
 
@@ -67,10 +66,11 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
                     query = query.Skip(criteria.Skip).Take(criteria.Take);
                 }
 
-                var pricesIds = query.Select(x => x.Id).ToList();
-                result.Results = _pricingService.GetPricesById(pricesIds.ToArray())
-                                            .OrderBy(x => pricesIds.IndexOf(x.Id))
-                                            .ToList();
+                var ids = query.Select(x => x.Id).ToList();
+
+                result.Results = _pricingService.GetPricesById(ids.ToArray())
+                    .OrderBy(x => ids.IndexOf(x.Id))
+                    .ToList();
             }
 
             return result;
@@ -86,6 +86,8 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
 
                 var query = GetPricelistsQuery(repository, criteria);
 
+                result.TotalCount = query.Count();
+
                 var sortInfos = criteria.SortInfos;
                 if (sortInfos.IsNullOrEmpty())
                 {
@@ -94,13 +96,17 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
 
                 query = query.OrderBySortInfos(sortInfos).ThenBy(x => x.Id);
 
-                result.TotalCount = query.Count();
-                query = query.Skip(criteria.Skip).Take(criteria.Take);
+                var ids = query
+                    .Skip(criteria.Skip)
+                    .Take(criteria.Take)
+                    .Select(x => x.Id)
+                    .ToList();
 
-                var pricelistsIds = query.Select(x => x.Id).ToList();
-                result.Results = _pricingService.GetPricelistsById(pricelistsIds.ToArray())
-                                                .OrderBy(x => pricelistsIds.IndexOf(x.Id)).ToList();
+                result.Results = _pricingService.GetPricelistsById(ids.ToArray())
+                    .OrderBy(x => ids.IndexOf(x.Id))
+                    .ToList();
             }
+
             return result;
         }
 
@@ -114,6 +120,8 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
 
                 var query = GetPricelistAssignmentsQuery(repository, criteria);
 
+                result.TotalCount = query.Count();
+
                 var sortInfos = criteria.SortInfos;
                 if (sortInfos.IsNullOrEmpty())
                 {
@@ -122,17 +130,20 @@ public PricingSearchServiceImpl(Func<IPricingRepository> repositoryFactory, ICat
 
                 query = query.OrderBySortInfos(sortInfos).ThenBy(x => x.Id);
 
-                result.TotalCount = query.Count();
-                query = query.Skip(criteria.Skip).Take(criteria.Take);
+                var ids = query
+                    .Skip(criteria.Skip)
+                    .Take(criteria.Take)
+                    .Select(x => x.Id)
+                    .ToList();
 
-                var pricelistAssignmentsIds = query.Select(x => x.Id).ToList();
-                result.Results = _pricingService.GetPricelistAssignmentsById(pricelistAssignmentsIds.ToArray())
-                                                .OrderBy(x => pricelistAssignmentsIds.IndexOf(x.Id))
-                                                .ToList();
+                result.Results = _pricingService.GetPricelistAssignmentsById(ids.ToArray())
+                    .OrderBy(x => ids.IndexOf(x.Id))
+                    .ToList();
             }
 
             return result;
         }
+
         #endregion
 
 
@@ -162,9 +173,11 @@ protected virtual IQueryable<PriceEntity> GetPricesQuery(IPricingRepository repo
                     Sort = criteria.Sort.Replace("product.", string.Empty),
                     ResponseGroup = SearchResponseGroup.WithProducts,
                 };
+
                 var catalogSearchResult = _catalogSearchService.Search(catalogSearchCriteria);
 
                 var productIds = catalogSearchResult.Products.Select(x => x.Id).ToArray();
+
                 //preserve resulting products for future assignment to prices
                 products = catalogSearchResult.Products;
 
@@ -230,8 +243,5 @@ private static void TryTransformSortingInfoColumnNames(IDictionary<string, strin
                 }
             }
         }
-
-
     }
 }
-