Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Refactoring - use repository extensions
KrzysztofPajakd36c4ef06a83
diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.csindex 4c3c932e1..a5bcb313f 100644--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs+++ b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateIntervalPropertiesCommandHandler.cs@@ -1,11 +1,10 @@using Grand.Business.Catalog.Commands.Models;+using Grand.Domain.Catalog;+using Grand.Domain.Data;using Grand.Infrastructure.Caching;using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;-using Grand.Domain.Catalog;-using Grand.Domain.Data;using MediatR;-using MongoDB.Driver;using System;using System.Threading;using System.Threading.Tasks;@@ -30,13 +29,12 @@ namespace Grand.Business.Catalog.Commands.Handlersif (request.Product == null)throw new ArgumentNullException(nameof(request.Product));- var filter = Builders<Product>.Filter.Eq("Id", request.Product.Id);- var update = Builders<Product>.Update+ var update = UpdateBuilder<Product>.Create().Set(x => x.Interval, request.Interval).Set(x => x.IntervalUnitId, request.IntervalUnit).Set(x => x.IncBothDate, request.IncludeBothDates);- await _productRepository.Collection.UpdateOneAsync(filter, update);+ await _productRepository.UpdateOneAsync(x => x.Id == request.Product.Id, update);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, request.Product.Id));diff --git a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.csindex fdb276697..6b1d892f8 100644--- a/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs+++ b/src/Business/Grand.Business.Catalog/Commands/Handlers/UpdateProductReviewTotalsCommandHandler.cs@@ -5,7 +5,6 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;-using MongoDB.Driver;using System;using System.Threading;using System.Threading.Tasks;@@ -61,14 +60,13 @@ namespace Grand.Business.Catalog.Commands.Handlersrequest.Product.ApprovedTotalReviews = approvedTotalReviews;request.Product.NotApprovedTotalReviews = notApprovedTotalReviews;- var filter = Builders<Product>.Filter.Eq("Id", request.Product.Id);- var update = Builders<Product>.Update- .Set(x => x.ApprovedRatingSum, request.Product.ApprovedRatingSum)- .Set(x => x.NotApprovedRatingSum, request.Product.NotApprovedRatingSum)- .Set(x => x.ApprovedTotalReviews, request.Product.ApprovedTotalReviews)- .Set(x => x.NotApprovedTotalReviews, request.Product.NotApprovedTotalReviews);+ var update = UpdateBuilder<Product>.Create()+ .Set(x => x.ApprovedRatingSum, request.Product.ApprovedRatingSum)+ .Set(x => x.NotApprovedRatingSum, request.Product.NotApprovedRatingSum)+ .Set(x => x.ApprovedTotalReviews, request.Product.ApprovedTotalReviews)+ .Set(x => x.NotApprovedTotalReviews, request.Product.NotApprovedTotalReviews);- await _productRepository.Collection.UpdateOneAsync(filter, update);+ await _productRepository.UpdateOneAsync(x=>x.Id == request.Product.Id, update);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, request.Product.Id));diff --git a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.csindex 1f7d8724d..e3da9c9ba 100644--- a/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Products/ProductAttributeService.cs@@ -6,8 +6,6 @@ using Grand.Domain;using Grand.Domain.Catalog;using Grand.Domain.Data;using MediatR;-using MongoDB.Bson;-using MongoDB.Driver;using System;using System.Collections.Generic;using System.Linq;@@ -136,9 +134,10 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttribute == null)throw new ArgumentNullException(nameof(productAttribute));- var builder = Builders<Product>.Update;- var updatefilter = builder.PullFilter(x => x.ProductAttributeMappings, y => y.ProductAttributeId == productAttribute.Id);- await _productRepository.Collection.UpdateManyAsync(new BsonDocument(), updatefilter);+ //delete from all product collections+ await _productRepository.PullFilter(string.Empty, x => x.ProductAttributeMappings, z => z.ProductAttributeId, productAttribute.Id, true);++ //delete from productAttribute collectionawait _productAttributeRepository.DeleteAsync(productAttribute);//cache@@ -166,9 +165,7 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeMapping == null)throw new ArgumentNullException(nameof(productAttributeMapping));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.PullFilter(p => p.ProductAttributeMappings, y => y.Id == productAttributeMapping.Id);- await _productRepository.Collection.UpdateManyAsync(new BsonDocument("_id", productId), update);+ await _productRepository.PullFilter(productId, x => x.ProductAttributeMappings, z => z.Id, productAttributeMapping.Id);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -187,9 +184,7 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeMapping == null)throw new ArgumentNullException(nameof(productAttributeMapping));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.AddToSet(p => p.ProductAttributeMappings, productAttributeMapping);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.AddToSet(productId, x => x.ProductAttributeMappings, productAttributeMapping);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -209,30 +204,7 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeMapping == null)throw new ArgumentNullException(nameof(productAttributeMapping));- var builder = Builders<Product>.Filter;- var filter = builder.Eq(x => x.Id, productId);- filter &= builder.ElemMatch(x => x.ProductAttributeMappings, y => y.Id == productAttributeMapping.Id);- var update = Builders<Product>.Update- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ProductAttributeId, productAttributeMapping.ProductAttributeId)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).TextPrompt, productAttributeMapping.TextPrompt)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).IsRequired, productAttributeMapping.IsRequired)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ShowOnCatalogPage, productAttributeMapping.ShowOnCatalogPage)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).AttributeControlTypeId, productAttributeMapping.AttributeControlTypeId)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).DisplayOrder, productAttributeMapping.DisplayOrder)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).Combination, productAttributeMapping.Combination)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ValidationMinLength, productAttributeMapping.ValidationMinLength)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ValidationMaxLength, productAttributeMapping.ValidationMaxLength)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ValidationFileAllowedExtensions, productAttributeMapping.ValidationFileAllowedExtensions)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ValidationFileMaximumSize, productAttributeMapping.ValidationFileMaximumSize)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).DefaultValue, productAttributeMapping.DefaultValue)- .Set(x => x.ProductAttributeMappings.ElementAt(-1).ConditionAttribute, productAttributeMapping.ConditionAttribute);-- if (values)- {- update = update.Set(x => x.ProductAttributeMappings.ElementAt(-1).ProductAttributeValues, productAttributeMapping.ProductAttributeValues);- }-- await _productRepository.Collection.UpdateManyAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductAttributeMappings, z => z.Id, productAttributeMapping.Id, productAttributeMapping);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -256,9 +228,6 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeValue == null)throw new ArgumentNullException(nameof(productAttributeValue));- var filter = Builders<Product>.Filter.And(Builders<Product>.Filter.Eq(x => x.Id, productId),- Builders<Product>.Filter.ElemMatch(x => x.ProductAttributeMappings, x => x.Id == productAttributeMappingId));-var p = await _productRepository.GetByIdAsync(productId);if (p != null){@@ -269,8 +238,7 @@ namespace Grand.Business.Catalog.Services.Productsif (pav != null){pavs.ProductAttributeValues.Remove(pav);- var update = Builders<Product>.Update.Set("ProductAttributeMappings.$", pavs);- await _productRepository.Collection.UpdateOneAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductAttributeMappings, z => z.Id, productAttributeMappingId, pavs);}}}@@ -294,14 +262,16 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeValue == null)throw new ArgumentNullException(nameof(productAttributeValue));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.AddToSet(p => p.ProductAttributeMappings.ElementAt(-1).ProductAttributeValues, productAttributeValue);+ var p = await _productRepository.GetByIdAsync(productId);+ if (p == null)+ throw new ArgumentNullException(nameof(p));- var builder = Builders<Product>.Filter;- var filter = builder.Eq(x => x.Id, productId);- filter = filter & builder.Where(x => x.ProductAttributeMappings.Any(y => y.Id == productAttributeMappingId));+ var pam = p.ProductAttributeMappings.FirstOrDefault(x => x.Id == productAttributeMappingId);+ if (pam == null)+ throw new ArgumentNullException(nameof(pam));- await _productRepository.Collection.UpdateOneAsync(filter, update);+ pam.ProductAttributeValues.Add(productAttributeValue);+ await _productRepository.UpdateToSet(productId, x => x.ProductAttributeMappings, z => z.Id, productAttributeMappingId, pam);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -321,10 +291,6 @@ namespace Grand.Business.Catalog.Services.Productsif (productAttributeValue == null)throw new ArgumentNullException(nameof(productAttributeValue));-- var filter = Builders<Product>.Filter.And(Builders<Product>.Filter.Eq(x => x.Id, productId),- Builders<Product>.Filter.ElemMatch(x => x.ProductAttributeMappings, x => x.Id == productAttributeMappingId));-var p = await _productRepository.GetByIdAsync(productId);if (p != null){@@ -348,8 +314,7 @@ namespace Grand.Business.Catalog.Services.Productspav.PictureId = productAttributeValue.PictureId;pav.Locales = productAttributeValue.Locales;- var update = Builders<Product>.Update.Set("ProductAttributeMappings.$", pavs);- await _productRepository.Collection.UpdateOneAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductAttributeMappings, z => z.Id, productAttributeMappingId, pavs);}}}@@ -372,11 +337,8 @@ namespace Grand.Business.Catalog.Services.Products/// <returns>Product attribute mapping collection</returns>public virtual async Task<IList<PredefinedProductAttributeValue>> GetPredefinedProductAttributeValues(string productAttributeId){- var builder = Builders<ProductAttribute>.Filter;- var filter = FilterDefinition<ProductAttribute>.Empty;- filter = filter & builder.Where(x => x.Id == productAttributeId);- var pa = await _productAttributeRepository.Collection- .Find(filter).FirstOrDefaultAsync();+ var pa = await _productAttributeRepository.Table.Where(x => x.Id == productAttributeId)+ .FirstOrDefaultAsync2();return pa.PredefinedProductAttributeValues.OrderBy(x => x.DisplayOrder).ToList();}@@ -396,12 +358,7 @@ namespace Grand.Business.Catalog.Services.Productsif (combination == null)throw new ArgumentNullException(nameof(combination));- var updatebuilder = Builders<Product>.Update;-- var update = Builders<Product>.Update.PullFilter(p => p.ProductAttributeCombinations, Builders<ProductAttributeCombination>.Filter.Eq(per => per.Id, combination.Id));-- var result = await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);-+ await _productRepository.PullFilter(productId, x => x.ProductAttributeCombinations, z => z.Id, combination.Id);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -419,9 +376,7 @@ namespace Grand.Business.Catalog.Services.Productsif (combination == null)throw new ArgumentNullException(nameof(combination));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.AddToSet(p => p.ProductAttributeCombinations, combination);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.AddToSet(productId, x => x.ProductAttributeCombinations, combination);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));@@ -440,24 +395,7 @@ namespace Grand.Business.Catalog.Services.Productsif (combination == null)throw new ArgumentNullException(nameof(combination));- var builder = Builders<Product>.Filter;- var filter = builder.Eq(x => x.Id, productId);- filter &= builder.ElemMatch(x => x.ProductAttributeCombinations, y => y.Id == combination.Id);- var update = Builders<Product>.Update- .Set("ProductAttributeCombinations.$.StockQuantity", combination.StockQuantity)- .Set("ProductAttributeCombinations.$.ReservedQuantity", combination.ReservedQuantity)- .Set("ProductAttributeCombinations.$.AllowOutOfStockOrders", combination.AllowOutOfStockOrders)- .Set("ProductAttributeCombinations.$.Sku", combination.Sku)- .Set("ProductAttributeCombinations.$.Text", combination.Text)- .Set("ProductAttributeCombinations.$.Mpn", combination.Mpn)- .Set("ProductAttributeCombinations.$.Gtin", combination.Gtin)- .Set("ProductAttributeCombinations.$.OverriddenPrice", combination.OverriddenPrice)- .Set("ProductAttributeCombinations.$.NotifyAdminForQuantityBelow", combination.NotifyAdminForQuantityBelow)- .Set("ProductAttributeCombinations.$.WarehouseInventory", combination.WarehouseInventory)- .Set("ProductAttributeCombinations.$.PictureId", combination.PictureId)- .Set("ProductAttributeCombinations.$.TierPrices", combination.TierPrices);-- await _productRepository.Collection.UpdateManyAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductAttributeCombinations, z => z.Id, combination.Id, combination);//cacheawait _cacheBase.RemoveByPrefix(string.Format(CacheKey.PRODUCTS_BY_ID_KEY, productId));diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.jsonindex ebc724143..7c5d0cf11 100644--- a/src/Web/Grand.Web/App_Data/appsettings.json+++ b/src/Web/Grand.Web/App_Data/appsettings.json@@ -111,7 +111,7 @@"CookieSecurePolicyAlways": false,//Gets or sets a value indicating whether mini profiler should be displayed in public store (used for debugging)- "DisplayMiniProfilerInPublicStore": false,+ "DisplayMiniProfilerInPublicStore": true,"AllowNonAsciiCharInHeaders": true,@@ -123,10 +123,10 @@"LoadAllUrlEntitiesOnStartup": false,/// A value indicating whether to ignore ACL rules- "IgnoreAcl": true,+ "IgnoreAcl": false,//A value indicating whether to ignore "limit per store" rules- "IgnoreStoreLimitations": true,+ "IgnoreStoreLimitations": false,///Enable minimal Progressive Web App."EnableProgressiveWebApp": false,@@ -153,7 +153,7 @@//Indicates whether to ignore UsePoweredByMiddleware"IgnoreUsePoweredByMiddleware": false,//(Serilog) Request logging - The package includes middleware for smarter HTTP request logging.- "UseSerilogRequestLogging": false+ "UseSerilogRequestLogging": false},"Api": {