Minor queries optimization

VirtoCommerce · May 20, 2020 · 79f5a57 · 79f5a57
1 parent 1ac9dc8
commit 79f5a57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/VirtoCommerce.PricingModule.Data/Services/PricingSearchServiceImpl.cs b/src/VirtoCommerce.PricingModule.Data/Services/PricingSearchServiceImpl.cs
@@ -73,6 +73,7 @@ public virtual Task<PriceSearchResult> SearchPricesAsync(PricesSearchCriteria cr
                     {
                         var priceIds = await query.OrderBySortInfos(sortInfos).ThenBy(x => x.Id)
                                                             .Select(x => x.Id)
+                                                            .AsNoTracking()
                                                             .ToArrayAsync();
 
                         var unorderedResults = await _pricingService.GetPricesByIdAsync(priceIds);
@@ -103,6 +104,7 @@ public virtual async Task<PricelistSearchResult> SearchPricelistsAsync(Pricelist
                         var pricelistIds = await query.OrderBySortInfos(sortInfos).ThenBy(x => x.Id)
                                                                 .Select(x => x.Id)
                                                                 .Skip(criteria.Skip).Take(criteria.Take)
+                                                                .AsNoTracking()
                                                                 .ToArrayAsync();
                         var unorderedResults = await _pricingService.GetPricelistsByIdAsync(pricelistIds);
                         result.Results = unorderedResults.OrderBy(x => Array.IndexOf(pricelistIds, x.Id)).ToList();
@@ -134,6 +136,7 @@ public virtual async Task<PricelistAssignmentSearchResult> SearchPricelistAssign
                         var pricelistAssignmentsIds = await query.OrderBySortInfos(sortInfos).ThenBy(x => x.Id)
                                                                  .Select(x => x.Id)
                                                                 .Skip(criteria.Skip).Take(criteria.Take)
+                                                                .AsNoTracking()
                                                                 .ToArrayAsync();
                         var unorderedResults = await _pricingService.GetPricelistAssignmentsByIdAsync(pricelistAssignmentsIds);
                         result.Results = unorderedResults.OrderBy(x => Array.IndexOf(pricelistAssignmentsIds, x.Id)).ToList();

diff --git a/src/VirtoCommerce.PricingModule.Data/Services/PricingServiceImpl.cs b/src/VirtoCommerce.PricingModule.Data/Services/PricingServiceImpl.cs
@@ -82,7 +82,7 @@ public virtual async Task<IEnumerable<Pricelist>> EvaluatePriceListsAsync(PriceE
                 query = query.Where(x => (x.StartDate == null || evalContext.CertainDate >= x.StartDate) && (x.EndDate == null || x.EndDate >= evalContext.CertainDate));
             }
 
-            var assignments = query.ToArray();
+            var assignments = query.AsNoTracking().ToArray();
             var assignmentsToReturn = assignments.Where(x => x.DynamicExpression == null).ToList();
 
             foreach (var assignment in assignments.Where(x => x.DynamicExpression != null))
@@ -109,7 +109,7 @@ public virtual async Task<PricelistAssignment[]> GetAllPricelistAssignments()
             {
                 repository.DisableChangesTracking();
 
-                return (await repository.PricelistAssignments.Include(x => x.Pricelist).ToArrayAsync()).Select(x => x.ToModel(AbstractTypeFactory<PricelistAssignment>.TryCreateInstance())).ToArray();
+                return (await repository.PricelistAssignments.Include(x => x.Pricelist).AsNoTracking().ToArrayAsync()).Select(x => x.ToModel(AbstractTypeFactory<PricelistAssignment>.TryCreateInstance())).ToArray();
             }
         }
         /// <summary>
@@ -151,7 +151,7 @@ public virtual async Task<IEnumerable<Price>> EvaluateProductPricesAsync(PriceEv
                 query = query.Where(x => (x.StartDate == null || x.StartDate <= certainDate)
                     && (x.EndDate == null || x.EndDate > certainDate));
 
-                var queryResult = await query.ToArrayAsync();
+                var queryResult = await query.AsNoTracking().ToArrayAsync();
                 prices = queryResult.Select(x => x.ToModel(AbstractTypeFactory<Price>.TryCreateInstance())).ToArray();
             }