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 (category/collection product service)
KrzysztofPajaka2115b44dac3
diff --git a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.csindex 988c7cead..0785e4fdf 100644--- a/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Categories/ProductCategoryService.cs@@ -10,8 +10,6 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.SharedKernel.Extensions;using MediatR;-using MongoDB.Bson;-using MongoDB.Driver;using System;using System.Collections.Generic;using System.Linq;@@ -110,9 +108,7 @@ namespace Grand.Business.Catalog.Services.Categoriesif (productCategory == null)throw new ArgumentNullException(nameof(productCategory));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.AddToSet(p => p.ProductCategories, productCategory);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.AddToSet(productId, x => x.ProductCategories, productCategory);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCATEGORIES_PATTERN_KEY);@@ -132,15 +128,7 @@ namespace Grand.Business.Catalog.Services.Categoriesif (productCategory == null)throw new ArgumentNullException(nameof(productCategory));- var builder = Builders<Product>.Filter;- var filter = builder.Eq(x => x.Id, productId);- filter = filter & builder.Where(x => x.ProductCategories.Any(y => y.Id == productCategory.Id));- var update = Builders<Product>.Update- .Set(x => x.ProductCategories.ElementAt(-1).CategoryId, productCategory.CategoryId)- .Set(x => x.ProductCategories.ElementAt(-1).IsFeaturedProduct, productCategory.IsFeaturedProduct)- .Set(x => x.ProductCategories.ElementAt(-1).DisplayOrder, productCategory.DisplayOrder);-- await _productRepository.Collection.UpdateManyAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductCategories, z => z.Id, productCategory.Id, productCategory);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCATEGORIES_PATTERN_KEY);@@ -159,9 +147,7 @@ namespace Grand.Business.Catalog.Services.Categoriesif (productCategory == null)throw new ArgumentNullException(nameof(productCategory));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.Pull(p => p.ProductCategories, productCategory);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.PullFilter(productId, x => x.ProductCategories, z => z.Id, productCategory.Id);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCATEGORIES_PATTERN_KEY);diff --git a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.csindex 695ff94aa..c4ad4890a 100644--- a/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs+++ b/src/Business/Grand.Business.Catalog/Services/Collections/ProductCollectionService.cs@@ -10,8 +10,6 @@ using Grand.Infrastructure.Caching.Constants;using Grand.Infrastructure.Extensions;using Grand.SharedKernel.Extensions;using MediatR;-using MongoDB.Bson;-using MongoDB.Driver;using System;using System.Linq;using System.Threading.Tasks;@@ -81,20 +79,19 @@ namespace Grand.Business.Catalog.Services.Collections}var query_ProductCollection = from prod in query- from pm in prod.ProductCollections- select new ProductsCollection- {- Id = pm.Id,- ProductId = prod.Id,- DisplayOrder = pm.DisplayOrder,- IsFeaturedProduct = pm.IsFeaturedProduct,- CollectionId = pm.CollectionId- };+ from pm in prod.ProductCollections+ select new ProductsCollection {+ Id = pm.Id,+ ProductId = prod.Id,+ DisplayOrder = pm.DisplayOrder,+ IsFeaturedProduct = pm.IsFeaturedProduct,+ CollectionId = pm.CollectionId+ };query_ProductCollection = from pm in query_ProductCollection- where pm.CollectionId == collectionId- orderby pm.DisplayOrder- select pm;+ where pm.CollectionId == collectionId+ orderby pm.DisplayOrder+ select pm;return Task.FromResult(new PagedList<ProductsCollection>(query_ProductCollection, pageIndex, pageSize));});@@ -110,9 +107,7 @@ namespace Grand.Business.Catalog.Services.Collectionsif (productCollection == null)throw new ArgumentNullException(nameof(productCollection));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.AddToSet(p => p.ProductCollections, productCollection);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.AddToSet(productId, x => x.ProductCollections, productCollection);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCOLLECTIONS_PATTERN_KEY);@@ -132,15 +127,7 @@ namespace Grand.Business.Catalog.Services.Collectionsif (productCollection == null)throw new ArgumentNullException(nameof(productCollection));- var builder = Builders<Product>.Filter;- var filter = builder.Eq(x => x.Id, productId);- filter = filter & builder.Where(x => x.ProductCollections.Any(y => y.Id == productCollection.Id));- var update = Builders<Product>.Update- .Set(x => x.ProductCollections.ElementAt(-1).CollectionId, productCollection.CollectionId)- .Set(x => x.ProductCollections.ElementAt(-1).IsFeaturedProduct, productCollection.IsFeaturedProduct)- .Set(x => x.ProductCollections.ElementAt(-1).DisplayOrder, productCollection.DisplayOrder);-- await _productRepository.Collection.UpdateManyAsync(filter, update);+ await _productRepository.UpdateToSet(productId, x => x.ProductCollections, z => z.Id, productCollection.Id, productCollection);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCOLLECTIONS_PATTERN_KEY);@@ -160,9 +147,7 @@ namespace Grand.Business.Catalog.Services.Collectionsif (productCollection == null)throw new ArgumentNullException(nameof(productCollection));- var updatebuilder = Builders<Product>.Update;- var update = updatebuilder.Pull(p => p.ProductCollections, productCollection);- await _productRepository.Collection.UpdateOneAsync(new BsonDocument("_id", productId), update);+ await _productRepository.PullFilter(productId, x => x.ProductCollections, z => z.Id, productCollection.Id);//cacheawait _cacheBase.RemoveByPrefix(CacheKey.PRODUCTCOLLECTIONS_PATTERN_KEY);