Skip to content

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.

Further improvements UpdateBuilder - use builder pattern

KrzysztofPajak2a36f3fd8bd5
diff --git a/src/Core/Grand.Domain/Data/IRepository.cs b/src/Core/Grand.Domain/Data/IRepository.cs
index 96b6950eb..f4ac63c05 100644
--- a/src/Core/Grand.Domain/Data/IRepository.cs
+++ b/src/Core/Grand.Domain/Data/IRepository.cs
@@ -156,7 +156,7 @@ namespace Grand.Domain.Data
/// <param name="elemMatch"></param>
/// <param name="value"></param>
/// <returns></returns>
- Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch);
+ Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, bool updateMany = false);
/// <summary>
/// Async Update entities
diff --git a/src/Core/Grand.Domain/Data/Repository.cs b/src/Core/Grand.Domain/Data/Repository.cs
index 32b73f20b..46581b951 100644
--- a/src/Core/Grand.Domain/Data/Repository.cs
+++ b/src/Core/Grand.Domain/Data/Repository.cs
@@ -284,12 +284,18 @@ namespace Grand.Domain.Data
/// <param name="elemFieldMatch"></param>
/// <param name="elemMatch"></param>
/// <returns></returns>
- public virtual async Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch)
+ public virtual async Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, bool updateMany = false)
{
- var filter = Builders<T>.Filter.Eq(x => x.Id, id);
+ var filter = string.IsNullOrEmpty(id) ? Builders<T>.Filter.Where(x => true) : Builders<T>.Filter.Eq(x => x.Id, id);
var update = Builders<T>.Update.PullFilter(field, Builders<U>.Filter.Eq(elemFieldMatch, elemMatch));
- var result = await _collection.UpdateOneAsync(filter, update);
-
+ if (updateMany)
+ {
+ var result = await _collection.UpdateManyAsync(filter, update);
+ }
+ else
+ {
+ var result = await _collection.UpdateOneAsync(filter, update);
+ }
}
/// <summary>
diff --git a/src/Core/Grand.Domain/Data/UpdateBuilder.cs b/src/Core/Grand.Domain/Data/UpdateBuilder.cs
index 790ad50ac..988b7197c 100644
--- a/src/Core/Grand.Domain/Data/UpdateBuilder.cs
+++ b/src/Core/Grand.Domain/Data/UpdateBuilder.cs
@@ -9,9 +9,17 @@ namespace Grand.Domain.Data
{
private readonly List<UpdateDefinition<T>> _list = new();
- public void Set<TProperty>(Expression<Func<T, TProperty>> selector, TProperty value)
+ protected UpdateBuilder() { }
+
+ public static UpdateBuilder<T> Create()
+ {
+ return new();
+ }
+
+ public UpdateBuilder<T> Set<TProperty>(Expression<Func<T, TProperty>> selector, TProperty value)
{
_list.Add(Builders<T>.Update.Set(selector, value));
+ return this;
}
public IEnumerable<UpdateDefinition<T>> Fields {