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
Extend repository
KrzysztofPajakfe858c3d5143
diff --git a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.csindex 09a6f02b6..ae8d640a0 100644--- a/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs+++ b/src/Business/Grand.Business.Common/Services/Directory/UserFieldService.cs@@ -3,8 +3,6 @@ using Grand.Domain;using Grand.Domain.Common;using Grand.Domain.Data;using Grand.SharedKernel.Extensions;-using MongoDB.Bson;-using MongoDB.Driver;using System;using System.Linq;using System.Threading.Tasks;@@ -19,16 +17,13 @@ namespace Grand.Business.Common.Services.Directory#region Fields- private readonly IRepository<BaseEntity> _baseRepository;private readonly IRepository<UserFieldBaseEntity> _userfieldBaseEntitRepository;#endregion#region Ctorpublic UserFieldService(- IRepository<BaseEntity> baseRepository,IRepository<UserFieldBaseEntity> userfieldBaseEntitRepository){- _baseRepository = baseRepository;_userfieldBaseEntitRepository = userfieldBaseEntitRepository;}@@ -54,10 +49,11 @@ namespace Grand.Business.Common.Services.Directoryif (string.IsNullOrEmpty(key))throw new ArgumentNullException(nameof(key));- var collection = _baseRepository.Database.GetCollection<UserFieldBaseEntity>(entity);- var query = _baseRepository.Database.GetCollection<UserFieldBaseEntity>(entity).Find(new BsonDocument("_id", entityId)).FirstOrDefault();+ _ = _userfieldBaseEntitRepository.SetCollection(entity);- var props = query.UserFields.Where(x => string.IsNullOrEmpty(storeId) || x.StoreId == storeId);+ var basefields = await _userfieldBaseEntitRepository.GetByIdAsync(entityId);++ var props = basefields.UserFields.Where(x => string.IsNullOrEmpty(storeId) || x.StoreId == storeId);var prop = props.FirstOrDefault(ga =>ga.Key.Equals(key, StringComparison.OrdinalIgnoreCase)); //should be culture invariant@@ -69,33 +65,23 @@ namespace Grand.Business.Common.Services.Directoryif (string.IsNullOrWhiteSpace(valueStr)){//delete- var builder = Builders<UserFieldBaseEntity>.Update;- var updatefilter = builder.PullFilter(x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId);- await collection.UpdateManyAsync(new BsonDocument("_id", entityId), updatefilter);+ await _userfieldBaseEntitRepository.PullFilter(entityId, x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId);+}else{//update- prop.Value = valueStr;- var builder = Builders<UserFieldBaseEntity>.Filter;- var filter = builder.Eq(x => x.Id, entityId);- filter = filter & builder.Where(x => x.UserFields.Any(y => y.Key == prop.Key && y.StoreId == storeId));- var update = Builders<UserFieldBaseEntity>.Update- .Set(x => x.UserFields.ElementAt(-1).Value, prop.Value);- await collection.UpdateManyAsync(filter, update);+ await _userfieldBaseEntitRepository.UpdateToSet(entityId, x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId, prop);}}else{- prop = new UserField- {+ prop = new UserField {Key = key,Value = valueStr,StoreId = storeId,};- var updatebuilder = Builders<UserFieldBaseEntity>.Update;- var update = updatebuilder.AddToSet(p => p.UserFields, prop);- await collection.UpdateOneAsync(new BsonDocument("_id", entityId), update);+ await _userfieldBaseEntitRepository.AddToSet(entityId, x => x.UserFields, prop);}}@@ -115,12 +101,13 @@ namespace Grand.Business.Common.Services.Directoryif (key == null)throw new ArgumentNullException(nameof(key));- string keyGroup = entity.GetType().Name;+ var collectionName = entity.GetType().Name;++ _ = _userfieldBaseEntitRepository.SetCollection(collectionName);- var collection = _baseRepository.Database.GetCollection<UserFieldBaseEntity>(keyGroup);- var query = _baseRepository.Database.GetCollection<UserFieldBaseEntity>(keyGroup).Find(new BsonDocument("_id", entity.Id)).FirstOrDefault();+ var basefields = await _userfieldBaseEntitRepository.GetByIdAsync(entity.Id);- var props = query.UserFields.Where(x => string.IsNullOrEmpty(storeId) || x.StoreId == storeId);+ var props = basefields.UserFields.Where(x => string.IsNullOrEmpty(storeId) || x.StoreId == storeId);var prop = props.FirstOrDefault(ga =>ga.Key.Equals(key, StringComparison.OrdinalIgnoreCase)); //should be culture invariant@@ -132,9 +119,8 @@ namespace Grand.Business.Common.Services.Directoryif (string.IsNullOrWhiteSpace(valueStr)){//delete- var builder = Builders<UserFieldBaseEntity>.Update;- var updatefilter = builder.PullFilter(x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId);- await collection.UpdateManyAsync(new BsonDocument("_id", entity.Id), updatefilter);+ await _userfieldBaseEntitRepository.PullFilter(entity.Id, x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId);+var entityProp = entity.UserFields.FirstOrDefault(x => x.Key == prop.Key && x.StoreId == storeId);if (entityProp != null)entity.UserFields.Remove(entityProp);@@ -143,13 +129,7 @@ namespace Grand.Business.Common.Services.Directory{//updateprop.Value = valueStr;- var builder = Builders<UserFieldBaseEntity>.Filter;- var filter = builder.Eq(x => x.Id, entity.Id);- filter = filter & builder.Where(x => x.UserFields.Any(y => y.Key == prop.Key && y.StoreId == storeId));- var update = Builders<UserFieldBaseEntity>.Update- .Set(x => x.UserFields.ElementAt(-1).Value, prop.Value);-- await collection.UpdateManyAsync(filter, update);+ await _userfieldBaseEntitRepository.UpdateToSet(entity.Id, x => x.UserFields, y => y.Key == prop.Key && y.StoreId == storeId, prop);var entityProp = entity.UserFields.FirstOrDefault(x => x.Key == prop.Key && x.StoreId == storeId);if (entityProp != null)@@ -161,15 +141,13 @@ namespace Grand.Business.Common.Services.Directory{if (!string.IsNullOrWhiteSpace(valueStr)){- prop = new UserField- {+ prop = new UserField {Key = key,Value = valueStr,StoreId = storeId,};- var updatebuilder = Builders<UserFieldBaseEntity>.Update;- var update = updatebuilder.AddToSet(p => p.UserFields, prop);- await collection.UpdateOneAsync(new BsonDocument("_id", entity.Id), update);+ await _userfieldBaseEntitRepository.AddToSet(entity.Id, x => x.UserFields, prop);+entity.UserFields.Add(prop);}}@@ -180,10 +158,14 @@ namespace Grand.Business.Common.Services.Directoryif (entity == null)throw new ArgumentNullException(nameof(entity));- var collection = await _userfieldBaseEntitRepository.Database.GetCollection<UserFieldBaseEntity>(entity.GetType().Name)- .FindAsync(new BsonDocument("_id", entity.Id));+ var collectionName = entity.GetType().Name;+ _ = _userfieldBaseEntitRepository.SetCollection(collectionName);++ var basefields = await _userfieldBaseEntitRepository.GetByIdAsync(entity.Id);+ if (basefields == null)+ return default(TPropType);- var props = collection.FirstOrDefault().UserFields;+ var props = basefields.UserFields;if (props == null)return default(TPropType);props = props.Where(x => x.StoreId == storeId).ToList();diff --git a/src/Core/Grand.Domain/Data/IRepository.cs b/src/Core/Grand.Domain/Data/IRepository.csindex 3c649dc45..6d2b214fc 100644--- a/src/Core/Grand.Domain/Data/IRepository.cs+++ b/src/Core/Grand.Domain/Data/IRepository.cs@@ -18,6 +18,11 @@ namespace Grand.Domain.Data/// </summary>IMongoCollection<T> Collection { get; }+ /// <summary>+ /// Sets a collection+ /// </summary>+ bool SetCollection(string collectionName);+/// <summary>/// Gets a database/// </summary>@@ -153,6 +158,19 @@ namespace Grand.Domain.Data/// <returns></returns>Task UpdateToSet<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, U value);+ /// <summary>+ /// Update subdocument+ /// </summary>+ /// <typeparam name="U">Document</typeparam>+ /// <typeparam name="Z">Subdocuments</typeparam>+ /// <param name="id">Ident of entitie</param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</param>+ /// <param name="elemMatch">Subdocument ident value</param>+ /// <param name="value">Subdocument - to update (all values)</param>+ /// <returns></returns>+ Task UpdateToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch, U value);+/// <summary>/// Delete subdocument/// </summary>@@ -165,6 +183,16 @@ namespace Grand.Domain.Data/// <returns></returns>Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, bool updateMany = false);+ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch"></param>+ /// <returns></returns>+ Task PullFilter<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch);+/// <summary>/// Delete subdocument/// </summary>@@ -220,5 +248,9 @@ namespace Grand.Domain.Data/// </summary>IMongoQueryable<T> Table { get; }+ /// <summary>+ /// Gets a table collection+ /// </summary>+ IMongoQueryable<T> TableCollection(string collectionName);}}diff --git a/src/Core/Grand.Domain/Data/Repository.cs b/src/Core/Grand.Domain/Data/Repository.csindex f9b104529..54a8a49ad 100644--- a/src/Core/Grand.Domain/Data/Repository.cs+++ b/src/Core/Grand.Domain/Data/Repository.cs@@ -20,12 +20,22 @@ namespace Grand.Domain.Data/// Gets the collection/// </summary>protected IMongoCollection<T> _collection;+public IMongoCollection<T> Collection {get {return _collection;}}+ /// <summary>+ /// Sets a collection+ /// </summary>+ public bool SetCollection(string collectionName)+ {+ _collection = _collection.Database.GetCollection<T>(collectionName);+ return true;+ }+/// <summary>/// Mongo Database/// </summary>@@ -286,6 +296,27 @@ namespace Grand.Domain.Datavar result = await _collection.UpdateOneAsync(filter, update);}+ /// <summary>+ /// Update subdocument+ /// </summary>+ /// <typeparam name="U">Document</typeparam>+ /// <param name="id">Ident of entitie</param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</param>+ /// <param name="elemMatch">Subdocument ident value</param>+ /// <param name="value">Subdocument - to update (all values)</param>+ public virtual async Task UpdateToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch, U value)+ {+ var filter = Builders<T>.Filter.Eq(x => x.Id, id)+ & Builders<T>.Filter.ElemMatch(field, elemFieldMatch);++ MemberExpression me = field.Body as MemberExpression;+ MemberInfo minfo = me.Member;+ var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);++ var result = await _collection.UpdateOneAsync(filter, update);+ }+/// <summary>/// Delete subdocument/// </summary>@@ -309,6 +340,21 @@ namespace Grand.Domain.Datavar result = await _collection.UpdateOneAsync(filter, update);}}++ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch"></param>+ /// <returns></returns>+ public virtual async Task PullFilter<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch)+ {+ var filter = Builders<T>.Filter.Eq(x => x.Id, id);+ var update = Builders<T>.Update.PullFilter(field, elemFieldMatch);+ var result = await _collection.UpdateOneAsync(filter, update);+ }/// <summary>/// Delete subdocument/// </summary>@@ -414,6 +460,14 @@ namespace Grand.Domain.Dataget { return _collection.AsQueryable(); }}+ /// <summary>+ /// Gets a table collection+ /// </summary>+ public virtual IMongoQueryable<T> TableCollection(string collectionName)+ {+ return _collection.Database.GetCollection<T>(collectionName).AsQueryable();+ }+#endregion}}\ No newline at end of file