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
Grand.Business.Data - Code cleanup (ReSharper)
support3961ed2878e2
diff --git a/src/Core/Grand.Data/DataSettings.cs b/src/Core/Grand.Data/DataSettings.csindex 96159429d..5ab46d64f 100644--- a/src/Core/Grand.Data/DataSettings.cs+++ b/src/Core/Grand.Data/DataSettings.cs@@ -1,24 +1,22 @@-namespace Grand.Data+namespace Grand.Data;++/// <summary>+/// Data settings (connection string information)+/// </summary>+public class DataSettings{/// <summary>- /// Data settings (connection string information)+ /// Connection string/// </summary>- public class DataSettings- {-- /// <summary>- /// Connection string- /// </summary>- public string ConnectionString { get; set; }+ public string ConnectionString { get; set; }- /// <summary>- /// Database type- /// </summary>- public DbProvider DbProvider { get; set; }+ /// <summary>+ /// Database type+ /// </summary>+ public DbProvider DbProvider { get; set; }- public bool IsValid()- {- return !string.IsNullOrEmpty(ConnectionString);- }+ public bool IsValid()+ {+ return !string.IsNullOrEmpty(ConnectionString);}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/DataSettingsManager.cs b/src/Core/Grand.Data/DataSettingsManager.csindex 2007340f7..354dc351b 100644--- a/src/Core/Grand.Data/DataSettingsManager.cs+++ b/src/Core/Grand.Data/DataSettingsManager.cs@@ -1,83 +1,83 @@using Grand.SharedKernel.Extensions;using System.Text.Json;-namespace Grand.Data+namespace Grand.Data;++/// <summary>+/// Manager of data settings (connection string)+/// </summary>+public static class DataSettingsManager{+ private static DataSettings _dataSettings;++ private static bool? _databaseIsInstalled;+/// <summary>- /// Manager of data settings (connection string)+ /// Load settings/// </summary>- public static class DataSettingsManager+ public static DataSettings LoadSettings(bool reloadSettings = false){+ if (!reloadSettings && _dataSettings != null)+ return _dataSettings;- private static DataSettings _dataSettings;-- private static bool? _databaseIsInstalled;+ if (!File.Exists(CommonPath.SettingsPath))+ return new DataSettings();- /// <summary>- /// Load settings- /// </summary>- public static DataSettings LoadSettings(bool reloadSettings = false)+ try+ {+ var text = File.ReadAllText(CommonPath.SettingsPath);+ _dataSettings = JsonSerializer.Deserialize<DataSettings>(text);+ }+ catch{- if (!reloadSettings && _dataSettings != null)- return _dataSettings;+ //Try to read file+ var connectionString = File.ReadLines(CommonPath.SettingsPath).FirstOrDefault();+ _dataSettings = new DataSettings { ConnectionString = connectionString, DbProvider = DbProvider.MongoDB };+ }- if (!File.Exists(CommonPath.SettingsPath))- return new DataSettings();+ return _dataSettings;+ }- try- {- var text = File.ReadAllText(CommonPath.SettingsPath);- _dataSettings = JsonSerializer.Deserialize<DataSettings>(text);- }- catch- {- //Try to read file- var connectionString = File.ReadLines(CommonPath.SettingsPath).FirstOrDefault();- _dataSettings = new DataSettings { ConnectionString = connectionString, DbProvider = DbProvider.MongoDB };+ public static DataSettings LoadDataSettings(DataSettings dataSettings)+ {+ _dataSettings = dataSettings;+ return _dataSettings;+ }- }- return _dataSettings;- }- public static DataSettings LoadDataSettings(DataSettings dataSettings)+ /// <summary>+ /// Returns a value indicating whether database is already installed+ /// </summary>+ /// <returns></returns>+ public static bool DatabaseIsInstalled()+ {+ if (!_databaseIsInstalled.HasValue){- _dataSettings = dataSettings;- return _dataSettings;+ var settings = _dataSettings ?? LoadSettings();+ _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);}+ return _databaseIsInstalled.Value;+ }- /// <summary>- /// Returns a value indicating whether database is already installed- /// </summary>- /// <returns></returns>- public static bool DatabaseIsInstalled()- {- if (!_databaseIsInstalled.HasValue)- {- var settings = _dataSettings ?? LoadSettings();- _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);- }- return _databaseIsInstalled.Value;- }+ public static void ResetCache()+ {+ _databaseIsInstalled = false;+ }- public static void ResetCache()+ /// <summary>+ /// Save settings to a file+ /// </summary>+ /// <param name="settings"></param>+ public static async Task SaveSettings(DataSettings settings)+ {+ var filePath = CommonPath.SettingsPath;+ if (!File.Exists(filePath)){- _databaseIsInstalled = false;+ await using var fs = File.Create(filePath);}- /// <summary>- /// Save settings to a file- /// </summary>- /// <param name="settings"></param>- public static async Task SaveSettings(DataSettings settings)- {- var filePath = CommonPath.SettingsPath;- if (!File.Exists(filePath))- {- await using FileStream fs = File.Create(filePath);- }- var data = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });- await File.WriteAllTextAsync(filePath, data);- }+ var data = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });+ await File.WriteAllTextAsync(filePath, data);}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/DbProvider.cs b/src/Core/Grand.Data/DbProvider.csindex 5d97c41bf..d08981f74 100644--- a/src/Core/Grand.Data/DbProvider.cs+++ b/src/Core/Grand.Data/DbProvider.cs@@ -1,10 +1,9 @@-namespace Grand.Data+namespace Grand.Data;++public enum DbProvider{- public enum DbProvider- {- MongoDB,- CosmosDB,- DocumentDB,- LiteDB- }-}+ MongoDB,+ CosmosDB,+ DocumentDB,+ LiteDB+}\ No newline at end of filediff --git a/src/Core/Grand.Data/ExpressionFieldDefinition.cs b/src/Core/Grand.Data/ExpressionFieldDefinition.csindex 185c29af2..d08cbeb96 100644--- a/src/Core/Grand.Data/ExpressionFieldDefinition.cs+++ b/src/Core/Grand.Data/ExpressionFieldDefinition.cs@@ -1,17 +1,15 @@using System.Linq.Expressions;-namespace Grand.Data+namespace Grand.Data;++public class ExpressionFieldDefinition<TDocument, TField>{- public class ExpressionFieldDefinition<TDocument, TField>+ public ExpressionFieldDefinition(LambdaExpression expression, TField value){- public ExpressionFieldDefinition(LambdaExpression expression, TField value)- {- Expression = expression;- Value = value;- }-- public LambdaExpression Expression { get; }- public TField Value { get; }-+ Expression = expression;+ Value = value;}-}++ public LambdaExpression Expression { get; }+ public TField Value { get; }+}\ No newline at end of filediff --git a/src/Core/Grand.Data/IDatabaseContext.cs b/src/Core/Grand.Data/IDatabaseContext.csindex aaef3bd14..b79f63670 100644--- a/src/Core/Grand.Data/IDatabaseContext.cs+++ b/src/Core/Grand.Data/IDatabaseContext.cs@@ -1,17 +1,19 @@using Grand.Domain;-namespace Grand.Data+namespace Grand.Data;++public interface IDatabaseContext{- public interface IDatabaseContext- {- void SetConnection(string connectionString);- bool InstallProcessCreateTable { get; }- bool InstallProcessCreateIndex { get; }- Task<bool> DatabaseExist();- IQueryable<T> Table<T>(string collectionName);- Task CreateTable(string name, string collation);- Task DeleteTable(string name);- Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName, bool unique = false) where T : BaseEntity;- Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity;- }-}+ bool InstallProcessCreateTable { get; }+ bool InstallProcessCreateIndex { get; }+ void SetConnection(string connectionString);+ Task<bool> DatabaseExist();+ IQueryable<T> Table<T>(string collectionName);+ Task CreateTable(string name, string collation);+ Task DeleteTable(string name);++ Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName, bool unique = false)+ where T : BaseEntity;++ Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity;+}\ No newline at end of filediff --git a/src/Core/Grand.Data/IRepository.cs b/src/Core/Grand.Data/IRepository.csindex 0a69bef49..c144bafe6 100644--- a/src/Core/Grand.Data/IRepository.cs+++ b/src/Core/Grand.Data/IRepository.cs@@ -1,214 +1,215 @@using Grand.Domain;using System.Linq.Expressions;-namespace Grand.Data+namespace Grand.Data;++/// <summary>+/// Repository+/// </summary>+public interface IRepository<T> where T : BaseEntity{/// <summary>- /// Repository- /// </summary>- public interface IRepository<T> where T : BaseEntity- {-- /// <summary>- /// Sets a collection- /// </summary>- bool SetCollection(string collectionName);--- /// <summary>- /// Get entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- T GetById(string id);-- /// <summary>- /// Get async entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- Task<T> GetByIdAsync(string id);-- /// <summary>- /// Get entity by identifier- /// </summary>- /// <param name="predicate"></param>- /// <returns>Entity</returns>- Task<T> GetOneAsync(Expression<Func<T, bool>> predicate);-- /// <summary>- /// Insert entity- /// </summary>- /// <param name="entity">Entity</param>- T Insert(T entity);-- /// <summary>- /// Async Insert entity- /// </summary>- /// <param name="entity">Entity</param>- Task<T> InsertAsync(T entity);-- /// <summary>- /// Update entity- /// </summary>- /// <param name="entity">Entity</param>- T Update(T entity);-- /// <summary>- /// Async Update entity- /// </summary>- /// <param name="entity">Entity</param>- Task<T> UpdateAsync(T entity);-- /// <summary>- /// Update field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value);-- /// <summary>- /// Inc field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- Task IncField<U>(string id, Expression<Func<T, U>> expression, U value);-- /// <summary>- /// Updates a single entity- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder);-- /// <summary>- /// Updates a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder);-- /// <summary>- /// Add to set - add subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="value"></param>- /// <returns></returns>- Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, 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, 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>- /// <param name="id">Ident of entitie</param>- /// <param name="field"></param>- /// <param name="elemFieldMatch">Subdocument field to match</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>- /// Update subdocuments- /// </summary>- /// <typeparam name="T">Document</typeparam>- /// <typeparam name="U"></typeparam>- /// <param name="field"></param>- /// <param name="elemFieldMatch">Subdocument field to match</param>- /// <param name="value">Subdocument - to update (all values)</param>- /// <returns></returns>- Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value);--- /// <summary>- /// Delete subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <typeparam name="Z"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="elemFieldMatch"></param>- /// <param name="elemMatch"></param>- /// <returns></returns>- Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch);-- /// <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>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="element"></param>- /// <returns></returns>- Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element);-- /// <summary>- /// Delete entity- /// </summary>- /// <param name="entity">Entity</param>- void Delete(T entity);-- /// <summary>- /// Async Delete entity- /// </summary>- /// <param name="entity">Entity</param>- Task<T> DeleteAsync(T entity);-- /// <summary>- /// Async Delete entities- /// </summary>- /// <param name="entities">Entities</param>- Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities);-- /// <summary>- /// Delete a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <returns></returns>- Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression);-- /// <summary>- /// Clear entities- /// </summary>- Task ClearAsync();-- /// <summary>- /// Gets a table- /// </summary>- IQueryable<T> Table { get; }-- /// <summary>- /// Gets a table collection- /// </summary>- IQueryable<T> TableCollection(string collectionName);- }-}+ /// Gets a table+ /// </summary>+ IQueryable<T> Table { get; }++ /// <summary>+ /// Sets a collection+ /// </summary>+ bool SetCollection(string collectionName);+++ /// <summary>+ /// Get entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ T GetById(string id);++ /// <summary>+ /// Get async entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ Task<T> GetByIdAsync(string id);++ /// <summary>+ /// Get entity by identifier+ /// </summary>+ /// <param name="predicate"></param>+ /// <returns>Entity</returns>+ Task<T> GetOneAsync(Expression<Func<T, bool>> predicate);++ /// <summary>+ /// Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ T Insert(T entity);++ /// <summary>+ /// Async Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ Task<T> InsertAsync(T entity);++ /// <summary>+ /// Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ T Update(T entity);++ /// <summary>+ /// Async Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ Task<T> UpdateAsync(T entity);++ /// <summary>+ /// Update field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value);++ /// <summary>+ /// Inc field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ Task IncField<U>(string id, Expression<Func<T, U>> expression, U value);++ /// <summary>+ /// Updates a single entity+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder);++ /// <summary>+ /// Updates a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder);++ /// <summary>+ /// Add to set - add subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="value"></param>+ /// <returns></returns>+ Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, 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, 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>+ /// <param name="id">Ident of entitie</param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</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>+ /// Update subdocuments+ /// </summary>+ /// <typeparam name="T">Document</typeparam>+ /// <typeparam name="U"></typeparam>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</param>+ /// <param name="value">Subdocument - to update (all values)</param>+ /// <returns></returns>+ Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value);+++ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <typeparam name="Z"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch"></param>+ /// <param name="elemMatch"></param>+ /// <returns></returns>+ Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch,+ Z elemMatch);++ /// <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>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="element"></param>+ /// <returns></returns>+ Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element);++ /// <summary>+ /// Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ void Delete(T entity);++ /// <summary>+ /// Async Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ Task<T> DeleteAsync(T entity);++ /// <summary>+ /// Async Delete entities+ /// </summary>+ /// <param name="entities">Entities</param>+ Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities);++ /// <summary>+ /// Delete a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <returns></returns>+ Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression);++ /// <summary>+ /// Clear entities+ /// </summary>+ Task ClearAsync();++ /// <summary>+ /// Gets a table collection+ /// </summary>+ IQueryable<T> TableCollection(string collectionName);+}\ No newline at end of filediff --git a/src/Core/Grand.Data/IStoreFilesContext.cs b/src/Core/Grand.Data/IStoreFilesContext.csindex 8fef878e9..e16ce0d64 100644--- a/src/Core/Grand.Data/IStoreFilesContext.cs+++ b/src/Core/Grand.Data/IStoreFilesContext.cs@@ -1,9 +1,8 @@-namespace Grand.Data+namespace Grand.Data;++public interface IStoreFilesContext{- public interface IStoreFilesContext- {- Task<byte[]> BucketDownload(string id);- Task BucketDelete(string id);- Task<string> BucketUploadFromBytes(string filename, byte[] source);- }-}+ Task<byte[]> BucketDownload(string id);+ Task BucketDelete(string id);+ Task<string> BucketUploadFromBytes(string filename, byte[] source);+}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/LiteDBContext.cs b/src/Core/Grand.Data/LiteDb/LiteDBContext.csindex ca0432752..15a48bec5 100644--- a/src/Core/Grand.Data/LiteDb/LiteDBContext.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBContext.cs@@ -1,86 +1,86 @@using Grand.Domain;+using Grand.Domain.Common;using LiteDB;-namespace Grand.Data.LiteDb+namespace Grand.Data.LiteDb;++public class LiteDBContext : IDatabaseContext{- public class LiteDBContext : IDatabaseContext- {- protected LiteDatabase _database;+ protected LiteDatabase _database;- public LiteDBContext(LiteDatabase database)- {- _database = database;- }+ public LiteDBContext(LiteDatabase database)+ {+ _database = database;+ }- public void SetConnection(string connectionString)- {- if (string.IsNullOrEmpty(connectionString))- throw new ArgumentNullException(nameof(connectionString));+ public void SetConnection(string connectionString)+ {+ if (string.IsNullOrEmpty(connectionString))+ throw new ArgumentNullException(nameof(connectionString));+ }- }- //Not supported by LiteDB- public bool InstallProcessCreateTable => false;- public bool InstallProcessCreateIndex => true;+ //Not supported by LiteDB+ public bool InstallProcessCreateTable => false;+ public bool InstallProcessCreateIndex => true;- public IQueryable<T> Table<T>(string collectionName)- {- if (string.IsNullOrEmpty(collectionName))- throw new ArgumentNullException(nameof(collectionName));+ public IQueryable<T> Table<T>(string collectionName)+ {+ if (string.IsNullOrEmpty(collectionName))+ throw new ArgumentNullException(nameof(collectionName));- return _database.GetCollection<T>(collectionName).FindAll().AsQueryable();- }+ return _database.GetCollection<T>(collectionName).FindAll().AsQueryable();+ }- public async Task<bool> DatabaseExist()- {- return await Task.FromResult(_database.CollectionExists(nameof(Grand.Domain.Common.GrandNodeVersion)));- }+ public async Task<bool> DatabaseExist()+ {+ return await Task.FromResult(_database.CollectionExists(nameof(GrandNodeVersion)));+ }- public Task CreateTable(string name, string collation)- {- //Not supported by LiteDB- return Task.CompletedTask;- }+ public Task CreateTable(string name, string collation)+ {+ //Not supported by LiteDB+ return Task.CompletedTask;+ }- public Task DeleteTable(string name)- {- if (string.IsNullOrEmpty(name))- throw new ArgumentNullException(nameof(name));+ public Task DeleteTable(string name)+ {+ if (string.IsNullOrEmpty(name))+ throw new ArgumentNullException(nameof(name));- _database.DropCollection(name);+ _database.DropCollection(name);- return Task.CompletedTask;- }+ return Task.CompletedTask;+ }- public Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName, bool unique = false) where T : BaseEntity+ public Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName,+ bool unique = false) where T : BaseEntity+ {+ if (string.IsNullOrEmpty(indexName))+ throw new ArgumentNullException(nameof(indexName));+ try{- if (string.IsNullOrEmpty(indexName))- throw new ArgumentNullException(nameof(indexName));- try+ foreach (var (selector, value, fieldName) in orderBuilder?.Fields){- foreach (var (selector, value, fieldName) in orderBuilder?.Fields)- {- var col = _database.GetCollection<T>();- if (selector != null)- col.EnsureIndex(selector, unique);- }+ var col = _database.GetCollection<T>();+ if (selector != null)+ col.EnsureIndex(selector, unique);}- catch { }-- return Task.CompletedTask;}+ catch { }- public Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity- {-- if (string.IsNullOrEmpty(indexName))- throw new ArgumentNullException(nameof(indexName));- try- {- _database.GetCollection<T>().DropIndex(indexName);- }- catch { }+ return Task.CompletedTask;+ }- return Task.CompletedTask;+ public Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity+ {+ if (string.IsNullOrEmpty(indexName))+ throw new ArgumentNullException(nameof(indexName));+ try+ {+ _database.GetCollection<T>().DropIndex(indexName);}+ catch { }++ return Task.CompletedTask;}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs b/src/Core/Grand.Data/LiteDb/LiteDBRepository.csindex 84ec6f25f..d8990feeb 100644--- a/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs@@ -4,639 +4,621 @@ using LiteDB;using System.Linq.Expressions;using System.Reflection;-namespace Grand.Data.LiteDb+namespace Grand.Data.LiteDb;++/// <summary>+/// MongoDB repository+/// </summary>+public class LiteDBRepository<T> : IRepository<T> where T : BaseEntity{+ #region Fields++ private readonly IAuditInfoProvider _auditInfoProvider;+/// <summary>- /// MongoDB repository+ /// Gets the collection/// </summary>- public class LiteDBRepository<T> : IRepository<T> where T : BaseEntity- {- #region Fields+ protected ILiteCollection<T> _collection;- private readonly IAuditInfoProvider _auditInfoProvider;-- /// <summary>- /// Gets the collection- /// </summary>- protected ILiteCollection<T> _collection;+ public ILiteCollection<T> Collection => _collection;- public ILiteCollection<T> Collection => _collection;+ /// <summary>+ /// Sets a collection+ /// </summary>+ public bool SetCollection(string collectionName)+ {+ _collection = _database.GetCollection<T>(collectionName);+ return true;+ }- /// <summary>- /// Sets a collection- /// </summary>- public bool SetCollection(string collectionName)- {- _collection = _database.GetCollection<T>(collectionName);- return true;- }+ /// <summary>+ /// Mongo Database+ /// </summary>+ protected LiteDatabase _database;- /// <summary>- /// Mongo Database- /// </summary>- protected LiteDatabase _database;- public LiteDatabase Database => _database;+ public LiteDatabase Database => _database;- #endregion+ #endregion- #region Ctor+ #region Ctor- /// <summary>- /// Ctor- /// </summary>- public LiteDBRepository(IAuditInfoProvider auditInfoProvider)- {- _auditInfoProvider = auditInfoProvider;- var connection = DataSettingsManager.LoadSettings();+ /// <summary>+ /// Ctor+ /// </summary>+ public LiteDBRepository(IAuditInfoProvider auditInfoProvider)+ {+ _auditInfoProvider = auditInfoProvider;+ var connection = DataSettingsManager.LoadSettings();- if (!string.IsNullOrEmpty(connection.ConnectionString))- {- _database = new LiteDatabase(connection.ConnectionString);- _collection = _database.GetCollection<T>(typeof(T).Name);- }- }- public LiteDBRepository(string connectionString, IAuditInfoProvider auditInfoProvider)+ if (!string.IsNullOrEmpty(connection.ConnectionString)){- _auditInfoProvider = auditInfoProvider;- _database = new LiteDatabase(connectionString);+ _database = new LiteDatabase(connection.ConnectionString);_collection = _database.GetCollection<T>(typeof(T).Name);}+ }+ public LiteDBRepository(string connectionString, IAuditInfoProvider auditInfoProvider)+ {+ _auditInfoProvider = auditInfoProvider;+ _database = new LiteDatabase(connectionString);+ _collection = _database.GetCollection<T>(typeof(T).Name);+ }- public LiteDBRepository(LiteDatabase database, IAuditInfoProvider auditInfoProvider)- {- _database = database;- _auditInfoProvider = auditInfoProvider;- _collection = _database.GetCollection<T>(typeof(T).Name);- }- #endregion+ public LiteDBRepository(LiteDatabase database, IAuditInfoProvider auditInfoProvider)+ {+ _database = database;+ _auditInfoProvider = auditInfoProvider;+ _collection = _database.GetCollection<T>(typeof(T).Name);+ }- #region Methods+ #endregion- /// <summary>- /// Get entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- public virtual T GetById(string id)- {- return _collection.Find(e => e.Id == id).FirstOrDefault();- }- /// <summary>- /// Get async entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- public virtual async Task<T> GetByIdAsync(string id)- {- return await Task.FromResult(GetById(id));- }-- /// <summary>- /// Get async entity by expression- /// </summary>- /// <param name="predicate"></param>- /// <returns>Entity</returns>- public virtual Task<T> GetOneAsync(Expression<Func<T, bool>> predicate)- {- var visitor = new ToLowerInvariantVisitor();- //WORKAROUND Issue #479 - Method ToLowerInvariant() in String are not supported when convert to BsonExpression- var modifiedExpression = (Expression<Func<T, bool>>)visitor.Visit(predicate);- return Task.FromResult(_collection.Find(modifiedExpression).FirstOrDefault());- }+ #region Methods- /// <summary>- /// Insert entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual T Insert(T entity)- {- entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.CreatedBy = _auditInfoProvider.GetCurrentUser();- _collection.Insert(entity);- return entity;- }+ /// <summary>+ /// Get entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ public virtual T GetById(string id)+ {+ return _collection.Find(e => e.Id == id).FirstOrDefault();+ }- /// <summary>- /// Async Insert entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> InsertAsync(T entity)- {- Insert(entity);- return await Task.FromResult(entity);- }+ /// <summary>+ /// Get async entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ public virtual async Task<T> GetByIdAsync(string id)+ {+ return await Task.FromResult(GetById(id));+ }- /// <summary>- /// Update entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual T Update(T entity)- {- entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();- _collection.Update(entity);- return entity;+ /// <summary>+ /// Get async entity by expression+ /// </summary>+ /// <param name="predicate"></param>+ /// <returns>Entity</returns>+ public virtual Task<T> GetOneAsync(Expression<Func<T, bool>> predicate)+ {+ var visitor = new ToLowerInvariantVisitor();+ //WORKAROUND Issue #479 - Method ToLowerInvariant() in String are not supported when convert to BsonExpression+ var modifiedExpression = (Expression<Func<T, bool>>)visitor.Visit(predicate);+ return Task.FromResult(_collection.Find(modifiedExpression).FirstOrDefault());+ }- }+ /// <summary>+ /// Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual T Insert(T entity)+ {+ entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.CreatedBy = _auditInfoProvider.GetCurrentUser();+ _collection.Insert(entity);+ return entity;+ }- /// <summary>- /// Async Update entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> UpdateAsync(T entity)- {- Update(entity);- return await Task.FromResult(entity);- }+ /// <summary>+ /// Async Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> InsertAsync(T entity)+ {+ Insert(entity);+ return await Task.FromResult(entity);+ }- /// <summary>- /// Update field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- public virtual Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value)- {- var entity = _database.GetCollection(typeof(T).Name).FindById(new(id));- var bsonValue = BsonMapper.Global.Serialize<U>(value);- entity[GetName(expression)] = bsonValue;- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- _database.GetCollection(typeof(T).Name).Update(entity);+ /// <summary>+ /// Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual T Update(T entity)+ {+ entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();+ _collection.Update(entity);+ return entity;+ }- return Task.CompletedTask;- }+ /// <summary>+ /// Async Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> UpdateAsync(T entity)+ {+ Update(entity);+ return await Task.FromResult(entity);+ }- /// <summary>- /// Inc field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- public virtual Task IncField<U>(string id, Expression<Func<T, U>> expression, U value)- {- var entity = _database.GetCollection(typeof(T).Name).FindById(new(id));- switch (value)- {- case int intValue:- var intrawValue = Convert.ToInt32(entity[GetName(expression)].RawValue);- var bsonIntValue = BsonMapper.Global.Serialize<int>(intrawValue + intValue);- entity[GetName(expression)] = bsonIntValue;- _database.GetCollection(typeof(T).Name).Update(entity);- break;- case long longValue:- var longrawValue = Convert.ToInt64(entity[GetName(expression)].RawValue);- var bsonLongValue = BsonMapper.Global.Serialize<long>(longrawValue + longValue);- entity[GetName(expression)] = bsonLongValue;- _database.GetCollection(typeof(T).Name).Update(entity);- break;- }+ /// <summary>+ /// Update field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ public virtual Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value)+ {+ var entity = _database.GetCollection(typeof(T).Name).FindById(new BsonValue(id));+ var bsonValue = BsonMapper.Global.Serialize(value);+ entity[GetName(expression)] = bsonValue;+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ _database.GetCollection(typeof(T).Name).Update(entity);++ return Task.CompletedTask;+ }- return Task.CompletedTask;- }- /// <summary>- /// Updates a single entity.- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- public virtual Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder)+ /// <summary>+ /// Inc field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ public virtual Task IncField<U>(string id, Expression<Func<T, U>> expression, U value)+ {+ var entity = _database.GetCollection(typeof(T).Name).FindById(new BsonValue(id));+ switch (value){- var entity = _collection.FindOne(filterexpression);- Update(entity, updateBuilder);- return Task.CompletedTask;+ case int intValue:+ var intrawValue = Convert.ToInt32(entity[GetName(expression)].RawValue);+ var bsonIntValue = BsonMapper.Global.Serialize(intrawValue + intValue);+ entity[GetName(expression)] = bsonIntValue;+ _database.GetCollection(typeof(T).Name).Update(entity);+ break;+ case long longValue:+ var longrawValue = Convert.ToInt64(entity[GetName(expression)].RawValue);+ var bsonLongValue = BsonMapper.Global.Serialize(longrawValue + longValue);+ entity[GetName(expression)] = bsonLongValue;+ _database.GetCollection(typeof(T).Name).Update(entity);+ break;}- /// <summary>- /// Updates a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- public virtual Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder)+ return Task.CompletedTask;+ }++ /// <summary>+ /// Updates a single entity.+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ public virtual Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder)+ {+ var entity = _collection.FindOne(filterexpression);+ Update(entity, updateBuilder);+ return Task.CompletedTask;+ }++ /// <summary>+ /// Updates a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ public virtual Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression, UpdateBuilder<T> updateBuilder)+ {+ var entities = _collection.Find(filterexpression);+ foreach (var entity in entities) Update(entity, updateBuilder);+ return Task.CompletedTask;+ }++ private Task Update(T entity, UpdateBuilder<T> updateBuilder)+ {+ foreach (var item in updateBuilder.ExpressionFields){- var entities = _collection.Find(filterexpression);- foreach (var entity in entities)- {- Update(entity, updateBuilder);- }- return Task.CompletedTask;+ var name = GetName(item.Expression);++ var propertyInfo = entity?.GetType().GetProperty(name,+ BindingFlags.Public | BindingFlags.Instance);++ propertyInfo?.SetValue(entity, item.Value);}- private Task Update(T entity, UpdateBuilder<T> updateBuilder)- {- foreach (var item in updateBuilder.ExpressionFields)- {- var name = GetName(item.Expression);+ entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();- var propertyInfo = entity?.GetType().GetProperty(name,- BindingFlags.Public | BindingFlags.Instance);+ _collection.Update(entity);+ return Task.CompletedTask;+ }- propertyInfo?.SetValue(entity, item.Value);- }-- entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();+ /// <summary>+ /// Add to set - add subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="value"></param>+ /// <returns></returns>+ public virtual Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, U value)+ {+ var collection = _database.GetCollection(_collection.Name);+ var entity = collection.FindById(new BsonValue(id));+ var fieldName = ((MemberExpression)field.Body).Member.Name;- _collection.Update(entity);- return Task.CompletedTask;+ if (entity[fieldName].IsArray)+ {+ var bsonValue = BsonMapper.Global.Serialize(value);+ var list = entity[fieldName].AsArray.ToList();+ list.Add(bsonValue);+ entity[fieldName] = new BsonArray(list);+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}- /// <summary>- /// Add to set - add subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="value"></param>- /// <returns></returns>- public virtual Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, U value)- {- var collection = _database.GetCollection(_collection.Name);- var entity = collection.FindById(new(id));- var fieldName = ((MemberExpression)field.Body).Member.Name;+ return Task.CompletedTask;+ }- if (entity[fieldName].IsArray)- {- var bsonValue = BsonMapper.Global.Serialize<U>(value);- var list = entity[fieldName].AsArray.ToList();- list.Add(bsonValue);- entity[fieldName] = new BsonArray(list);- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);- }- return Task.CompletedTask;+ /// <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>+ public virtual Task UpdateToSet<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field,+ Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, U value)+ {+ var collection = _database.GetCollection(_collection.Name);+ var entity = collection.FindById(new BsonValue(id));+ var fieldName = ((MemberExpression)field.Body).Member.Name;++ var member = ((MemberExpression)elemFieldMatch.Body).Member;+ var dBFieldName = member.GetCustomAttribute<DBFieldNameAttribute>();+ var elementfieldName = dBFieldName?.Name ?? member.Name;++ if (entity[fieldName].IsArray)+ {+ var bsonValue = BsonMapper.Global.Serialize(value);+ var list = entity[fieldName].AsArray.ToList();+ var document = list.FirstOrDefault(x => x[elementfieldName] == new BsonValue(elemMatch));+ if (document == null) return Task.CompletedTask;+ foreach (var key in bsonValue.AsDocument.Keys) document[key] = bsonValue[key];+ entity[fieldName] = new BsonArray(list);+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}- /// <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>- public virtual Task UpdateToSet<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, U value)+ return Task.CompletedTask;+ }++ /// <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="value">Subdocument - to update (all values)</param>+ public virtual Task UpdateToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field,+ Expression<Func<U, bool>> elemFieldMatch, U value)+ {+ var collection = _database.GetCollection(_collection.Name);+ var entity = collection.FindById(new BsonValue(id));+ var fieldName = ((MemberExpression)field.Body).Member.Name;+ if (entity == null) return Task.CompletedTask;++ if (entity[fieldName].IsArray){- var collection = _database.GetCollection(_collection.Name);- var entity = collection.FindById(new(id));- var fieldName = ((MemberExpression)field.Body).Member.Name;-- var member = ((MemberExpression)elemFieldMatch.Body).Member;- var dBFieldName = member.GetCustomAttribute<DBFieldNameAttribute>();- var elementfieldName = dBFieldName?.Name ?? member.Name;-- if (entity[fieldName].IsArray)+ var bsonValue = BsonMapper.Global.Serialize(value);+ var list = BsonMapper.Global.Deserialize<IList<U>>(entity[fieldName]).ToList();+ var position = list.FirstOrDefault(elemFieldMatch.Compile());+ if (position == null) return Task.CompletedTask;++ foreach (var item in position.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)){- var bsonValue = BsonMapper.Global.Serialize<U>(value);- var list = entity[fieldName].AsArray.ToList();- var document = list.FirstOrDefault(x => x[elementfieldName] == new BsonValue(elemMatch));- if (document == null) return Task.CompletedTask;+ var propertyField = position.GetType().GetProperty(item.Name,+ BindingFlags.Public | BindingFlags.Instance);- foreach (var key in bsonValue.AsDocument.Keys)- {- document[key] = bsonValue[key];- }- entity[fieldName] = new BsonArray(list);- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);+ propertyField?.SetValue(position, item.GetValue(value));}- return Task.CompletedTask;+ var updateList = BsonMapper.Global.Serialize<IList<U>>(list);+ entity[fieldName] = updateList;+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}- /// <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="value">Subdocument - to update (all values)</param>- public virtual Task UpdateToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch, U value)- {- var collection = _database.GetCollection(_collection.Name);- var entity = collection.FindById(new(id));- var fieldName = ((MemberExpression)field.Body).Member.Name;- if (entity == null) return Task.CompletedTask;+ return Task.CompletedTask;+ }+ /// <summary>+ /// Update subdocuments+ /// </summary>+ /// <typeparam name="T">Document</typeparam>+ /// <typeparam name="U"></typeparam>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</param>+ /// <param name="value">Subdocument - to update (all values)</param>+ /// <returns></returns>+ public virtual Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value)+ {+ var collection = _database.GetCollection(_collection.Name);+ var fieldName = ((MemberExpression)field.Body).Member.Name;+ var records = collection.Find(Query.EQ($"{fieldName}[*] ANY", elemFieldMatch.ToString())).ToList();+ foreach (var entity in records)if (entity[fieldName].IsArray){- var bsonValue = BsonMapper.Global.Serialize<U>(value);- var list = BsonMapper.Global.Deserialize<IList<U>>(entity[fieldName]).ToList();- var position = list.FirstOrDefault(elemFieldMatch.Compile());- if (position == null) return Task.CompletedTask;-- foreach (var item in position.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))+ var bsonValue = BsonMapper.Global.Serialize(value);+ var oldbsonValue = BsonMapper.Global.Serialize(elemFieldMatch);+ var list = entity[fieldName].AsArray.ToList();+ if (list != null && list.Any()){- var propertyField = position.GetType().GetProperty(item.Name,- BindingFlags.Public | BindingFlags.Instance);-- propertyField?.SetValue(position, item.GetValue(value));+ list.Add(bsonValue);+ list.Remove(oldbsonValue);+ entity[fieldName] = new BsonArray(list);+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}+ }- var updateList = BsonMapper.Global.Serialize<IList<U>>(list);- entity[fieldName] = updateList;- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ return Task.CompletedTask;+ }- collection.Update(entity);- }- return Task.CompletedTask;+ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <typeparam name="Z"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch"></param>+ /// <param name="elemMatch"></param>+ /// <returns></returns>+ public virtual Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field,+ Expression<Func<U, Z>> elemFieldMatch, Z elemMatch)+ {+ var collection = _database.GetCollection(_collection.Name);+ var fieldName = ((MemberExpression)field.Body).Member.Name;- }+ var member = ((MemberExpression)elemFieldMatch.Body).Member;+ var dBFieldName = member.GetCustomAttribute<DBFieldNameAttribute>();+ var elementfieldName = dBFieldName?.Name ?? member.Name;- /// <summary>- /// Update subdocuments- /// </summary>- /// <typeparam name="T">Document</typeparam>- /// <typeparam name="U"></typeparam>- /// <param name="field"></param>- /// <param name="elemFieldMatch">Subdocument field to match</param>- /// <param name="value">Subdocument - to update (all values)</param>- /// <returns></returns>- public virtual Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value)+ if (string.IsNullOrEmpty(id)){- var collection = _database.GetCollection(_collection.Name);- var fieldName = ((MemberExpression)field.Body).Member.Name;- var records = collection.Find(Query.EQ($"{fieldName}[*] ANY", elemFieldMatch.ToString())).ToList();- foreach (var entity in records)- {- if (entity[fieldName].IsArray)- {- var bsonValue = BsonMapper.Global.Serialize<U>(value);- var oldbsonValue = BsonMapper.Global.Serialize<U>(elemFieldMatch);- var list = entity[fieldName].AsArray.ToList();- if (list!=null && list.Any())- {- list.Add(bsonValue);- list.Remove(oldbsonValue);- entity[fieldName] = new BsonArray(list);- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);- }- }- }- return Task.CompletedTask;-+ //update many+ var entities = collection.FindAll();+ foreach (var entity in entities) UpdateEntity(entity);}- /// <summary>- /// Delete subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <typeparam name="Z"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="elemFieldMatch"></param>- /// <param name="elemMatch"></param>- /// <returns></returns>- public virtual Task PullFilter<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, Z>> elemFieldMatch, Z elemMatch)+ else{- var collection = _database.GetCollection(_collection.Name);- var fieldName = ((MemberExpression)field.Body).Member.Name;-- var member = ((MemberExpression)elemFieldMatch.Body).Member;- var dBFieldName = member.GetCustomAttribute<DBFieldNameAttribute>();- var elementfieldName = dBFieldName?.Name ?? member.Name;-- if (string.IsNullOrEmpty(id))- {- //update many- var entities = collection.FindAll();- foreach (var entity in entities)- {- UpdateEntity(entity);- }- }- else- {- //update one- var entity = collection.FindById(new(id));- UpdateEntity(entity);- }+ //update one+ var entity = collection.FindById(new BsonValue(id));+ UpdateEntity(entity);+ }- void UpdateEntity(BsonDocument entity)+ void UpdateEntity(BsonDocument entity)+ {+ if (entity != null && entity[fieldName].IsArray){- if (entity != null && entity[fieldName].IsArray)+ var bsonValue = BsonMapper.Global.Serialize(elemMatch);+ var list = entity[fieldName].AsArray.ToList();+ var documents = list.Where(x => x[elementfieldName] == new BsonValue(elemMatch)).ToList();+ if (documents != null && documents.Any()){- var bsonValue = BsonMapper.Global.Serialize<Z>(elemMatch);- var list = entity[fieldName].AsArray.ToList();- var documents = list.Where(x => x[elementfieldName] == new BsonValue(elemMatch)).ToList();- if (documents != null && documents.Any())- {- foreach (var document in documents)- {- list.Remove(document);- }- entity[fieldName] = new BsonArray(list);- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);- }+ foreach (var document in documents) list.Remove(document);+ entity[fieldName] = new BsonArray(list);+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}}+ }- return Task.CompletedTask;+ return Task.CompletedTask;+ }- }+ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch"></param>+ /// <returns></returns>+ public virtual Task PullFilter<U>(string id, Expression<Func<T, IEnumerable<U>>> field,+ Expression<Func<U, bool>> elemFieldMatch)+ {+ var collection = _database.GetCollection(_collection.Name);+ var entity = collection.FindById(new BsonValue(id));+ var fieldName = ((MemberExpression)field.Body).Member.Name;+ if (entity == null) return Task.CompletedTask;- /// <summary>- /// Delete subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="elemFieldMatch"></param>- /// <returns></returns>- public virtual Task PullFilter<U>(string id, Expression<Func<T, IEnumerable<U>>> field, Expression<Func<U, bool>> elemFieldMatch)+ if (entity[fieldName].IsArray){+ var list = BsonMapper.Global.Deserialize<IList<U>>(entity[fieldName]).ToList();+ var position = list.FirstOrDefault(elemFieldMatch.Compile());+ if (position == null) return Task.CompletedTask;- var collection = _database.GetCollection(_collection.Name);- var entity = collection.FindById(new(id));- var fieldName = ((MemberExpression)field.Body).Member.Name;- if (entity == null) return Task.CompletedTask;+ list.Remove(position);- if (entity[fieldName].IsArray)- {- var list = BsonMapper.Global.Deserialize<IList<U>>(entity[fieldName]).ToList();- var position = list.FirstOrDefault(elemFieldMatch.Compile());- if (position == null) return Task.CompletedTask;+ var updatelist = BsonMapper.Global.Serialize<IList<U>>(list);+ entity[fieldName] = updatelist;+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);+ }- list.Remove(position);+ return Task.CompletedTask;+ }- var updatelist = BsonMapper.Global.Serialize<IList<U>>(list);- entity[fieldName] = updatelist;- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);- }- return Task.CompletedTask;+ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="element"></param>+ /// <returns></returns>+ public virtual Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element)+ {+ var collection = _database.GetCollection(_collection.Name);+ var fieldName = ((MemberExpression)field.Body).Member.Name;+ if (string.IsNullOrEmpty(id))+ {+ var entities = collection.Find(Query.EQ($"{fieldName}[*] ANY", element)).ToList();+ foreach (var entity in entities) UpdateEntity(entity);+ }+ else+ {+ //update one+ var entity = collection.FindById(new BsonValue(id));+ UpdateEntity(entity);}- /// <summary>- /// Delete subdocument- /// </summary>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="element"></param>- /// <returns></returns>- public virtual Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element)+ void UpdateEntity(BsonDocument entity){- var collection = _database.GetCollection(_collection.Name);- var fieldName = ((MemberExpression)field.Body).Member.Name;- if (string.IsNullOrEmpty(id))+ if (entity != null && entity[fieldName].IsArray){- var entities = collection.Find(Query.EQ($"{fieldName}[*] ANY", element)).ToList();- foreach (var entity in entities)+ var list = entity[fieldName].AsArray.ToList();+ if (list != null && list.Any()){- UpdateEntity(entity);+ list.Remove(new BsonValue(element));+ entity[fieldName] = new BsonArray(list);+ entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();+ entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();+ collection.Update(entity);}}- else- {- //update one- var entity = collection.FindById(new(id));- UpdateEntity(entity);- }+ }- void UpdateEntity(BsonDocument entity)- {- if (entity != null && entity[fieldName].IsArray)- {- var list = entity[fieldName].AsArray.ToList();- if (list!=null && list.Any())- {- list.Remove(new BsonValue(element));- entity[fieldName] = new BsonArray(list);- entity["UpdatedOnUtc"] = _auditInfoProvider.GetCurrentDateTime();- entity["UpdatedBy"] = _auditInfoProvider.GetCurrentUser();- collection.Update(entity);- }- }- }+ return Task.CompletedTask;+ }- return Task.CompletedTask;+ /// <summary>+ /// Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual void Delete(T entity)+ {+ _collection.Delete(new BsonValue(entity.Id));+ }- }+ /// <summary>+ /// Async Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> DeleteAsync(T entity)+ {+ Delete(entity);+ return await Task.FromResult(entity);+ }- /// <summary>- /// Delete entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual void Delete(T entity)- {- _collection.Delete(new BsonValue(entity.Id));- }+ /// <summary>+ /// Async Delete entities+ /// </summary>+ /// <param name="entities">Entities</param>+ public virtual async Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities)+ {+ foreach (var entity in entities) await DeleteAsync(entity);+ return entities;+ }- /// <summary>- /// Async Delete entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> DeleteAsync(T entity)- {- Delete(entity);- return await Task.FromResult(entity);- }- /// <summary>- /// Async Delete entities- /// </summary>- /// <param name="entities">Entities</param>- public virtual async Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities)- {- foreach (T entity in entities)- {- await DeleteAsync(entity);- }- return entities;- }- /// <summary>- /// Delete a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <returns></returns>- public virtual Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression)- {- _collection.DeleteMany(filterexpression);- return Task.CompletedTask;- }+ /// <summary>+ /// Delete a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <returns></returns>+ public virtual Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression)+ {+ _collection.DeleteMany(filterexpression);+ return Task.CompletedTask;+ }- /// <summary>- /// Clear entities- /// </summary>- public Task ClearAsync()- {- _collection.DeleteAll();- return Task.CompletedTask;- }+ /// <summary>+ /// Clear entities+ /// </summary>+ public Task ClearAsync()+ {+ _collection.DeleteAll();+ return Task.CompletedTask;+ }- #endregion+ #endregion- #region Properties+ #region Properties- /// <summary>- /// Gets a table- /// </summary>- public virtual IQueryable<T> Table => _collection.Query().ToEnumerable().AsQueryable();+ /// <summary>+ /// Gets a table+ /// </summary>+ public virtual IQueryable<T> Table => _collection.Query().ToEnumerable().AsQueryable();- /// <summary>- /// Gets a table collection- /// </summary>- public virtual IQueryable<T> TableCollection(string collectionName)- {- return _database.GetCollection<T>(collectionName).Query().ToEnumerable().AsQueryable();- }+ /// <summary>+ /// Gets a table collection+ /// </summary>+ public virtual IQueryable<T> TableCollection(string collectionName)+ {+ return _database.GetCollection<T>(collectionName).Query().ToEnumerable().AsQueryable();+ }- #endregion+ #endregion- #region Helpers-+ #region Helpers+ private string GetName(LambdaExpression lambdaexpression)+ {+ var expression = (MemberExpression)lambdaexpression.Body;+ return expression.Member.Name;+ }- private string GetName(LambdaExpression lambdaexpression)- {- var expression = (MemberExpression)lambdaexpression.Body;- return expression.Member.Name;- }- private string GetName<TSource, TField>(Expression<Func<TSource, TField>> Field)- {- if (object.Equals(Field, null))- {- throw new NullReferenceException("Field is required");- }+ private string GetName<TSource, TField>(Expression<Func<TSource, TField>> Field)+ {+ if (Equals(Field, null)) throw new NullReferenceException("Field is required");- MemberExpression expr = null;+ MemberExpression expr = null;- switch (Field.Body)+ switch (Field.Body)+ {+ case MemberExpression expression:+ expr = expression;+ break;+ case UnaryExpression expression:+ expr = (MemberExpression)expression.Operand;+ break;+ default:{- case MemberExpression expression:- expr = expression;- break;- case UnaryExpression expression:- expr = (MemberExpression)expression.Operand;- break;- default:- {- const string format = "Expression '{0}' not supported.";- var message = string.Format(format, Field);+ const string format = "Expression '{0}' not supported.";+ var message = string.Format(format, Field);- throw new ArgumentException(message, nameof(Field));- }+ throw new ArgumentException(message, nameof(Field));}-- return expr.Member.Name;}- #endregion+ return expr.Member.Name;}++ #endregion}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.cs b/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.csindex 06e93108c..e03e70917 100644--- a/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBStartupBase.cs@@ -1,17 +1,16 @@using Grand.SharedKernel;using LiteDB;-namespace Grand.Data.LiteDb+namespace Grand.Data.LiteDb;++public class LiteDBStartupBase : IStartupBase{- public class LiteDBStartupBase : IStartupBase- {- public int Priority => 0;+ public int Priority => 0;- public void Execute()- {- BsonMapper.Global.EmptyStringToNull = false;- BsonMapper.Global.SerializeNullValues = true;- BsonMapper.Global.EnumAsInteger = true;- }+ public void Execute()+ {+ BsonMapper.Global.EmptyStringToNull = false;+ BsonMapper.Global.SerializeNullValues = true;+ BsonMapper.Global.EnumAsInteger = true;}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.cs b/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.csindex 49bb6d82a..fa5d12d96 100644--- a/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBStoreFilesContext.cs@@ -1,47 +1,47 @@using Grand.Domain;using LiteDB;-namespace Grand.Data.LiteDb+namespace Grand.Data.LiteDb;++public class LiteDBStoreFilesContext : IStoreFilesContext{- public class LiteDBStoreFilesContext : IStoreFilesContext+ protected LiteDatabase _database;++ public LiteDBStoreFilesContext(LiteDatabase database){- protected LiteDatabase _database;+ _database = database;+ }- public LiteDBStoreFilesContext(LiteDatabase database)- {- _database = database;- }+ public async Task<byte[]> BucketDownload(string id)+ {+ var fs = _database.FileStorage;+ var file = fs.FindById(id);- public async Task<byte[]> BucketDownload(string id)+ if (file == null)+ throw new ArgumentNullException(nameof(file));++ using (var stream = file.OpenRead())+ using (MemoryStream mstream = new()){- var fs = _database.FileStorage;- var file = fs.FindById(id);-- if (file == null)- throw new ArgumentNullException(nameof(file));-- using (var stream = file.OpenRead())- using (MemoryStream mstream = new ())- {- stream.CopyTo(mstream);- return await Task.FromResult(mstream.ToArray());- }+ stream.CopyTo(mstream);+ return await Task.FromResult(mstream.ToArray());}- public Task BucketDelete(string id)- {- var fs = _database.FileStorage;- fs.Delete(id);+ }- return Task.CompletedTask;- }+ public Task BucketDelete(string id)+ {+ var fs = _database.FileStorage;+ fs.Delete(id);- public async Task<string> BucketUploadFromBytes(string filename, byte[] source)- {- var id = UniqueIdentifier.New;- var fs = _database.FileStorage;- fs.Upload(id, filename, new MemoryStream(source));+ return Task.CompletedTask;+ }- return await Task.FromResult(id);- }+ public async Task<string> BucketUploadFromBytes(string filename, byte[] source)+ {+ var id = UniqueIdentifier.New;+ var fs = _database.FileStorage;+ fs.Upload(id, filename, new MemoryStream(source));++ return await Task.FromResult(id);}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/ToLowerInvariantVisitor.cs b/src/Core/Grand.Data/LiteDb/ToLowerInvariantVisitor.csindex ed5bd4c5c..ca90715dc 100644--- a/src/Core/Grand.Data/LiteDb/ToLowerInvariantVisitor.cs+++ b/src/Core/Grand.Data/LiteDb/ToLowerInvariantVisitor.cs@@ -1,6 +1,7 @@using System.Linq.Expressions;namespace Grand.Data.LiteDb;+public class ToLowerInvariantVisitor : ExpressionVisitor{protected override Expression VisitMethodCall(MethodCallExpression node)@@ -8,12 +9,9 @@ public class ToLowerInvariantVisitor : ExpressionVisitorif (node.Method == typeof(string).GetMethod("ToLowerInvariant", Type.EmptyTypes)){var invariantMethod = typeof(string).GetMethod("ToLower", Type.EmptyTypes);- if (invariantMethod != null)- {- return Expression.Call(node.Object, invariantMethod);- }-+ if (invariantMethod != null) return Expression.Call(node.Object, invariantMethod);}+return base.VisitMethodCall(node);}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.cs b/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.csindex 8b08774a4..1e8787d2d 100644--- a/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.cs+++ b/src/Core/Grand.Data/Mongo/BsonUtcDateTimeSerializer.cs@@ -1,19 +1,18 @@using MongoDB.Bson.Serialization;using MongoDB.Bson.Serialization.Serializers;-namespace Grand.Data.Mongo+namespace Grand.Data.Mongo;++public class BsonUtcDateTimeSerializer : DateTimeSerializer{- public class BsonUtcDateTimeSerializer : DateTimeSerializer+ public override DateTime Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args){- public override DateTime Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args)- {- return new DateTime(base.Deserialize(context, args).Ticks, DateTimeKind.Utc);- }+ return new DateTime(base.Deserialize(context, args).Ticks, DateTimeKind.Utc);+ }- public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, DateTime value)- {- var utcValue = new DateTime(value.Ticks, DateTimeKind.Utc);- base.Serialize(context, args, utcValue);- }+ public override void Serialize(BsonSerializationContext context, BsonSerializationArgs args, DateTime value)+ {+ var utcValue = new DateTime(value.Ticks, DateTimeKind.Utc);+ base.Serialize(context, args, utcValue);}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Data/Mongo/MongoDBContext.csindex 7a4f2153a..98feab33f 100644--- a/src/Core/Grand.Data/Mongo/MongoDBContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoDBContext.cs@@ -2,147 +2,143 @@using MongoDB.Bson;using MongoDB.Driver;-namespace Grand.Data.Mongo+namespace Grand.Data.Mongo;++public class MongoDBContext : IDatabaseContext{- public class MongoDBContext : IDatabaseContext- {- private string _connectionString;- protected IMongoDatabase _database;+ private string _connectionString;+ protected IMongoDatabase _database;- public MongoDBContext()- {- var connection = DataSettingsManager.LoadSettings();- if (!string.IsNullOrEmpty(connection.ConnectionString))- PrepareMongoDatabase(connection.ConnectionString);- }-- private void PrepareMongoDatabase(string connectionString)- {- _connectionString = connectionString;- var mongourl = new MongoUrl(connectionString);- var databaseName = mongourl.DatabaseName;- _database = new MongoClient(connectionString).GetDatabase(databaseName);- }+ public MongoDBContext()+ {+ var connection = DataSettingsManager.LoadSettings();+ if (!string.IsNullOrEmpty(connection.ConnectionString))+ PrepareMongoDatabase(connection.ConnectionString);+ }-- public MongoDBContext(IMongoDatabase mongodatabase)- {- _database = mongodatabase;- }- public IMongoDatabase Database()- {- return _database;- }+ public MongoDBContext(IMongoDatabase mongodatabase)+ {+ _database = mongodatabase;+ }- public void SetConnection(string connectionString)- {- if (string.IsNullOrEmpty(connectionString))- throw new ArgumentNullException(nameof(connectionString));+ public void SetConnection(string connectionString)+ {+ if (string.IsNullOrEmpty(connectionString))+ throw new ArgumentNullException(nameof(connectionString));- PrepareMongoDatabase(connectionString);- }+ PrepareMongoDatabase(connectionString);+ }- public bool InstallProcessCreateTable => true;- public bool InstallProcessCreateIndex => true;+ public bool InstallProcessCreateTable => true;+ public bool InstallProcessCreateIndex => true;- public IQueryable<T> Table<T>(string collectionName)- {- if (string.IsNullOrEmpty(collectionName))- throw new ArgumentNullException(nameof(collectionName));+ public IQueryable<T> Table<T>(string collectionName)+ {+ if (string.IsNullOrEmpty(collectionName))+ throw new ArgumentNullException(nameof(collectionName));- return _database.GetCollection<T>(collectionName).AsQueryable();- }+ return _database.GetCollection<T>(collectionName).AsQueryable();+ }- protected IMongoDatabase TryReadMongoDatabase()- {- _connectionString = DataSettingsManager.LoadSettings().ConnectionString;+ public async Task<bool> DatabaseExist()+ {+ if (string.IsNullOrEmpty(_connectionString))+ throw new ArgumentNullException(nameof(_connectionString));- var mongourl = new MongoUrl(_connectionString);- var databaseName = mongourl.DatabaseName;- var mongodb = new MongoClient(_connectionString).GetDatabase(databaseName);- return mongodb;- }+ var client = new MongoClient(_connectionString);+ var databaseName = new MongoUrl(_connectionString).DatabaseName;+ var database = client.GetDatabase(databaseName);+ await database.RunCommandAsync((Command<BsonDocument>)"{ping:1}");- public async Task<bool> DatabaseExist()- {- if (string.IsNullOrEmpty(_connectionString))- throw new ArgumentNullException(nameof(_connectionString));+ var filter = new BsonDocument("name", "GrandNodeVersion");+ var found = database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter }).Result;+ return await found.AnyAsync();+ }- var client = new MongoClient(_connectionString);- var databaseName = new MongoUrl(_connectionString).DatabaseName;- var database = client.GetDatabase(databaseName);- await database.RunCommandAsync((Command<BsonDocument>)"{ping:1}");+ public async Task CreateTable(string name, string collation)+ {+ if (string.IsNullOrEmpty(name))+ throw new ArgumentNullException(nameof(name));- var filter = new BsonDocument("name", "GrandNodeVersion");- var found = database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter }).Result;- return await found.AnyAsync();+ if (!string.IsNullOrEmpty(collation))+ {+ var options = new CreateCollectionOptions {+ Collation = new Collation(collation)+ };+ await _database.CreateCollectionAsync(name, options);}-- public async Task CreateTable(string name, string collation)+ else{- if (string.IsNullOrEmpty(name))- throw new ArgumentNullException(nameof(name));-- if (!string.IsNullOrEmpty(collation))- {- var options = new CreateCollectionOptions {- Collation = new Collation(collation)- };- await _database.CreateCollectionAsync(name, options);- }- else- await _database.CreateCollectionAsync(name);-+ await _database.CreateCollectionAsync(name);}+ }- public async Task DeleteTable(string name)- {- if (string.IsNullOrEmpty(name))- throw new ArgumentNullException(nameof(name));+ public async Task DeleteTable(string name)+ {+ if (string.IsNullOrEmpty(name))+ throw new ArgumentNullException(nameof(name));- await _database.DropCollectionAsync(name);- }+ await _database.DropCollectionAsync(name);+ }++ public async Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName,+ bool unique = false) where T : BaseEntity+ {+ if (string.IsNullOrEmpty(indexName))+ throw new ArgumentNullException(nameof(indexName));++ IList<IndexKeysDefinition<T>> keys = new List<IndexKeysDefinition<T>>();+ foreach (var item in orderBuilder.Fields)+ if (item.selector != null)+ keys.Add(item.value+ ? Builders<T>.IndexKeys.Ascending(item.selector)+ : Builders<T>.IndexKeys.Descending(item.selector));+ else+ keys.Add(item.value+ ? Builders<T>.IndexKeys.Ascending(item.fieldName)+ : Builders<T>.IndexKeys.Descending(item.fieldName));- public async Task CreateIndex<T>(IRepository<T> repository, OrderBuilder<T> orderBuilder, string indexName, bool unique = false) where T : BaseEntity+ try{- if (string.IsNullOrEmpty(indexName))- throw new ArgumentNullException(nameof(indexName));-- IList<IndexKeysDefinition<T>> keys = new List<IndexKeysDefinition<T>>();- foreach (var item in orderBuilder.Fields)- {- if (item.selector != null)- {- keys.Add(item.value- ? Builders<T>.IndexKeys.Ascending(item.selector)- : Builders<T>.IndexKeys.Descending(item.selector));- }- else- {- keys.Add(item.value- ? Builders<T>.IndexKeys.Ascending(item.fieldName)- : Builders<T>.IndexKeys.Descending(item.fieldName));- }- }-- try- {- await ((MongoRepository<T>)repository).Collection.Indexes.CreateOneAsync(new CreateIndexModel<T>(Builders<T>.IndexKeys.Combine(keys),- new CreateIndexOptions { Name = indexName, Unique = unique }));- }- catch { }+ await ((MongoRepository<T>)repository).Collection.Indexes.CreateOneAsync(new CreateIndexModel<T>(+ Builders<T>.IndexKeys.Combine(keys),+ new CreateIndexOptions { Name = indexName, Unique = unique }));}+ catch { }+ }- public async Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity+ public async Task DeleteIndex<T>(IRepository<T> repository, string indexName) where T : BaseEntity+ {+ if (string.IsNullOrEmpty(indexName))+ throw new ArgumentNullException(nameof(indexName));+ try{- if (string.IsNullOrEmpty(indexName))- throw new ArgumentNullException(nameof(indexName));- try- {- await ((MongoRepository<T>)repository).Collection.Indexes.DropOneAsync(indexName);- }- catch { }+ await ((MongoRepository<T>)repository).Collection.Indexes.DropOneAsync(indexName);}+ catch { }+ }++ private void PrepareMongoDatabase(string connectionString)+ {+ _connectionString = connectionString;+ var mongourl = new MongoUrl(connectionString);+ var databaseName = mongourl.DatabaseName;+ _database = new MongoClient(connectionString).GetDatabase(databaseName);+ }++ public IMongoDatabase Database()+ {+ return _database;+ }++ protected IMongoDatabase TryReadMongoDatabase()+ {+ _connectionString = DataSettingsManager.LoadSettings().ConnectionString;++ var mongourl = new MongoUrl(_connectionString);+ var databaseName = mongourl.DatabaseName;+ var mongodb = new MongoClient(_connectionString).GetDatabase(databaseName);+ return mongodb;}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/Mongo/MongoDBStartupBase.cs b/src/Core/Grand.Data/Mongo/MongoDBStartupBase.csindex 37d2997bc..792463f7f 100644--- a/src/Core/Grand.Data/Mongo/MongoDBStartupBase.cs+++ b/src/Core/Grand.Data/Mongo/MongoDBStartupBase.cs@@ -1,37 +1,36 @@-using Grand.SharedKernel;+using Grand.Domain.Media;+using Grand.SharedKernel;using MongoDB.Bson.Serialization;using MongoDB.Bson.Serialization.Conventions;using MongoDB.Bson.Serialization.Options;using MongoDB.Bson.Serialization.Serializers;-namespace Grand.Data.Mongo-{- public class MongoDBStartupBase : IStartupBase- {- public int Priority => 0;+namespace Grand.Data.Mongo;- /// <summary>- /// Register MongoDB mappings- /// </summary>- public void Execute()- {- BsonSerializer.RegisterSerializer(typeof(DateTime), new BsonUtcDateTimeSerializer());+public class MongoDBStartupBase : IStartupBase+{+ public int Priority => 0;- BsonSerializer.RegisterSerializer(typeof(Dictionary<int, int>),- new DictionaryInterfaceImplementerSerializer<Dictionary<int, int>>(DictionaryRepresentation.ArrayOfArrays));+ /// <summary>+ /// Register MongoDB mappings+ /// </summary>+ public void Execute()+ {+ BsonSerializer.RegisterSerializer(typeof(DateTime), new BsonUtcDateTimeSerializer());- //global set an equivalent of [BsonIgnoreExtraElements] for every Domain Model- var cp = new ConventionPack {- new IgnoreExtraElementsConvention(true)- };- ConventionRegistry.Register("ApplicationConventions", cp, t => true);+ BsonSerializer.RegisterSerializer(typeof(Dictionary<int, int>),+ new DictionaryInterfaceImplementerSerializer<Dictionary<int, int>>(DictionaryRepresentation.ArrayOfArrays));- BsonClassMap.RegisterClassMap<Grand.Domain.Media.Download>(cm =>- {- cm.AutoMap();- cm.UnmapMember(m => m.DownloadBinary);- });- }+ //global set an equivalent of [BsonIgnoreExtraElements] for every Domain Model+ var cp = new ConventionPack {+ new IgnoreExtraElementsConvention(true)+ };+ ConventionRegistry.Register("ApplicationConventions", cp, t => true);+ BsonClassMap.RegisterClassMap<Download>(cm =>+ {+ cm.AutoMap();+ cm.UnmapMember(m => m.DownloadBinary);+ });}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/Mongo/MongoRepository.cs b/src/Core/Grand.Data/Mongo/MongoRepository.csindex 3ab9a7bfe..1c94d7388 100644--- a/src/Core/Grand.Data/Mongo/MongoRepository.cs+++ b/src/Core/Grand.Data/Mongo/MongoRepository.cs@@ -2,481 +2,464 @@ using Grand.Domain;using MongoDB.Bson;using MongoDB.Driver;using System.Linq.Expressions;-using System.Reflection;-namespace Grand.Data.Mongo+namespace Grand.Data.Mongo;++/// <summary>+/// MongoDB repository+/// </summary>+public class MongoRepository<T> : IRepository<T> where T : BaseEntity{- /// <summary>- /// MongoDB repository- /// </summary>- public class MongoRepository<T> : IRepository<T> where T : BaseEntity- {- #region Fields+ #region Fields- private readonly IAuditInfoProvider _auditInfoProvider;+ private readonly IAuditInfoProvider _auditInfoProvider;- /// <summary>- /// Gets the collection- /// </summary>- protected IMongoCollection<T> _collection;+ /// <summary>+ /// Gets the collection+ /// </summary>+ protected IMongoCollection<T> _collection;- public IMongoCollection<T> Collection => _collection;+ public IMongoCollection<T> Collection => _collection;- /// <summary>- /// Sets a collection- /// </summary>- public bool SetCollection(string collectionName)- {- _collection = _collection.Database.GetCollection<T>(collectionName);- return true;- }+ /// <summary>+ /// Sets a collection+ /// </summary>+ public bool SetCollection(string collectionName)+ {+ _collection = _collection.Database.GetCollection<T>(collectionName);+ return true;+ }- /// <summary>- /// Mongo Database- /// </summary>- protected IMongoDatabase _database;+ /// <summary>+ /// Mongo Database+ /// </summary>+ protected IMongoDatabase _database;- public IMongoDatabase Database => _database;+ public IMongoDatabase Database => _database;- #endregion+ #endregion- #region Ctor+ #region Ctor- /// <summary>- /// Ctor- /// </summary>- public MongoRepository(IAuditInfoProvider auditInfoProvider)- {- _auditInfoProvider = auditInfoProvider;- var connection = DataSettingsManager.LoadSettings();-- if (!string.IsNullOrEmpty(connection.ConnectionString))- {- var client = new MongoClient(connection.ConnectionString);- var databaseName = new MongoUrl(connection.ConnectionString).DatabaseName;- _database = client.GetDatabase(databaseName);- _collection = _database.GetCollection<T>(typeof(T).Name);- }- }+ /// <summary>+ /// Ctor+ /// </summary>+ public MongoRepository(IAuditInfoProvider auditInfoProvider)+ {+ _auditInfoProvider = auditInfoProvider;+ var connection = DataSettingsManager.LoadSettings();- public MongoRepository(string connectionString, IAuditInfoProvider auditInfoProvider)+ if (!string.IsNullOrEmpty(connection.ConnectionString)){- _auditInfoProvider = auditInfoProvider;- var client = new MongoClient(connectionString);- var databaseName = new MongoUrl(connectionString).DatabaseName;+ var client = new MongoClient(connection.ConnectionString);+ var databaseName = new MongoUrl(connection.ConnectionString).DatabaseName;_database = client.GetDatabase(databaseName);_collection = _database.GetCollection<T>(typeof(T).Name);}+ }+ public MongoRepository(string connectionString, IAuditInfoProvider auditInfoProvider)+ {+ _auditInfoProvider = auditInfoProvider;+ var client = new MongoClient(connectionString);+ var databaseName = new MongoUrl(connectionString).DatabaseName;+ _database = client.GetDatabase(databaseName);+ _collection = _database.GetCollection<T>(typeof(T).Name);+ }- public MongoRepository(IMongoDatabase database, IAuditInfoProvider auditInfoProvider)- {- _database = database;- _auditInfoProvider = auditInfoProvider;- _collection = _database.GetCollection<T>(typeof(T).Name);- }- #endregion+ public MongoRepository(IMongoDatabase database, IAuditInfoProvider auditInfoProvider)+ {+ _database = database;+ _auditInfoProvider = auditInfoProvider;+ _collection = _database.GetCollection<T>(typeof(T).Name);+ }- #region Methods+ #endregion- /// <summary>- /// Get entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- public virtual T GetById(string id)- {- return _collection.Find(e => e.Id == id).FirstOrDefault();- }+ #region Methods- /// <summary>- /// Get async entity by identifier- /// </summary>- /// <param name="id">Identifier</param>- /// <returns>Entity</returns>- public virtual Task<T> GetByIdAsync(string id)- {- return _collection.Find(e => e.Id == id).FirstOrDefaultAsync();- }+ /// <summary>+ /// Get entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ public virtual T GetById(string id)+ {+ return _collection.Find(e => e.Id == id).FirstOrDefault();+ }- /// <summary>- /// Get async entity by expression- /// </summary>- /// <param name="predicate"></param>- /// <returns>Entity</returns>- public virtual Task<T> GetOneAsync(Expression<Func<T, bool>> predicate)- {- return _collection.Find(predicate).FirstOrDefaultAsync();- }-- /// <summary>- /// Insert entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual T Insert(T entity)- {- entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.CreatedBy = _auditInfoProvider.GetCurrentUser();- _collection.InsertOne(entity);- return entity;- }+ /// <summary>+ /// Get async entity by identifier+ /// </summary>+ /// <param name="id">Identifier</param>+ /// <returns>Entity</returns>+ public virtual Task<T> GetByIdAsync(string id)+ {+ return _collection.Find(e => e.Id == id).FirstOrDefaultAsync();+ }- /// <summary>- /// Async Insert entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> InsertAsync(T entity)- {- entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.CreatedBy = _auditInfoProvider.GetCurrentUser();- await _collection.InsertOneAsync(entity);- return entity;- }+ /// <summary>+ /// Get async entity by expression+ /// </summary>+ /// <param name="predicate"></param>+ /// <returns>Entity</returns>+ public virtual Task<T> GetOneAsync(Expression<Func<T, bool>> predicate)+ {+ return _collection.Find(predicate).FirstOrDefaultAsync();+ }- /// <summary>- /// Update entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual T Update(T entity)- {- entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.UpdatedBy = _auditInfoProvider?.GetCurrentUser();- _collection.ReplaceOne(x => x.Id == entity.Id, entity, new ReplaceOptions { IsUpsert = false });- return entity;- }+ /// <summary>+ /// Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual T Insert(T entity)+ {+ entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.CreatedBy = _auditInfoProvider.GetCurrentUser();+ _collection.InsertOne(entity);+ return entity;+ }- /// <summary>- /// Async Update entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> UpdateAsync(T entity)- {- entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();- entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();- await _collection.ReplaceOneAsync(x => x.Id == entity.Id, entity,- new ReplaceOptions { IsUpsert = false });- return entity;- }+ /// <summary>+ /// Async Insert entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> InsertAsync(T entity)+ {+ entity.CreatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.CreatedBy = _auditInfoProvider.GetCurrentUser();+ await _collection.InsertOneAsync(entity);+ return entity;+ }- /// <summary>- /// Update field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- public virtual async Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value)- {- var builder = Builders<T>.Filter;- var filter = builder.Eq(x => x.Id, id);- var update = Builders<T>.Update- .Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime())- .Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser())- .Set(expression, value);-- await _collection.UpdateOneAsync(filter, update);- }+ /// <summary>+ /// Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual T Update(T entity)+ {+ entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.UpdatedBy = _auditInfoProvider?.GetCurrentUser();+ _collection.ReplaceOne(x => x.Id == entity.Id, entity, new ReplaceOptions { IsUpsert = false });+ return entity;+ }- /// <summary>- /// Inc field for entity- /// </summary>- /// <typeparam name="U">Value</typeparam>- /// <param name="id">Ident record</param>- /// <param name="expression">Linq Expression</param>- /// <param name="value">value</param>- public virtual async Task IncField<U>(string id, Expression<Func<T, U>> expression, U value)- {- var builder = Builders<T>.Filter;- var filter = builder.Eq(x => x.Id, id);- var update = Builders<T>.Update- .Inc(expression, value);+ /// <summary>+ /// Async Update entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> UpdateAsync(T entity)+ {+ entity.UpdatedOnUtc = _auditInfoProvider.GetCurrentDateTime();+ entity.UpdatedBy = _auditInfoProvider.GetCurrentUser();+ await _collection.ReplaceOneAsync(x => x.Id == entity.Id, entity,+ new ReplaceOptions { IsUpsert = false });+ return entity;+ }- await _collection.UpdateOneAsync(filter, update);- }+ /// <summary>+ /// Update field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ public virtual async Task UpdateField<U>(string id, Expression<Func<T, U>> expression, U value)+ {+ var builder = Builders<T>.Filter;+ var filter = builder.Eq(x => x.Id, id);+ var update = Builders<T>.Update+ .Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime())+ .Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser())+ .Set(expression, value);++ await _collection.UpdateOneAsync(filter, update);+ }- /// <summary>- /// Updates a single entity.- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- public virtual async Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression,- UpdateBuilder<T> updateBuilder)- {- updateBuilder.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- updateBuilder.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var update = Builders<T>.Update.Combine(updateBuilder.Fields);- await _collection.UpdateOneAsync(filterexpression, update);- }+ /// <summary>+ /// Inc field for entity+ /// </summary>+ /// <typeparam name="U">Value</typeparam>+ /// <param name="id">Ident record</param>+ /// <param name="expression">Linq Expression</param>+ /// <param name="value">value</param>+ public virtual async Task IncField<U>(string id, Expression<Func<T, U>> expression, U value)+ {+ var builder = Builders<T>.Filter;+ var filter = builder.Eq(x => x.Id, id);+ var update = Builders<T>.Update+ .Inc(expression, value);- /// <summary>- /// Updates a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <param name="updateBuilder"></param>- /// <returns></returns>- public virtual async Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression,- UpdateBuilder<T> updateBuilder)- {- updateBuilder.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- updateBuilder.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var update = Builders<T>.Update.Combine(updateBuilder.Fields);- await _collection.UpdateManyAsync(filterexpression, update);- }+ await _collection.UpdateOneAsync(filter, update);+ }- /// <summary>- /// Add to set - add subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="value"></param>- /// <returns></returns>- public virtual async Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, U value)- {- var builder = Builders<T>.Filter;- var filter = builder.Eq(x => x.Id, id);- var update = Builders<T>.Update.AddToSet(field, value);+ /// <summary>+ /// Updates a single entity.+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ public virtual async Task UpdateOneAsync(Expression<Func<T, bool>> filterexpression,+ UpdateBuilder<T> updateBuilder)+ {+ updateBuilder.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ updateBuilder.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var update = Builders<T>.Update.Combine(updateBuilder.Fields);+ await _collection.UpdateOneAsync(filterexpression, update);+ }- var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);- await _collection.UpdateOneAsync(filter, combinedUpdate);- }+ /// <summary>+ /// Updates a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <param name="updateBuilder"></param>+ /// <returns></returns>+ public virtual async Task UpdateManyAsync(Expression<Func<T, bool>> filterexpression,+ UpdateBuilder<T> updateBuilder)+ {+ updateBuilder.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ updateBuilder.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var update = Builders<T>.Update.Combine(updateBuilder.Fields);+ await _collection.UpdateManyAsync(filterexpression, update);+ }- /// <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>- public virtual async Task UpdateToSet<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field,- Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, U value)- {- var filter = Builders<T>.Filter.Eq(x => x.Id, id)- & Builders<T>.Filter.ElemMatch(field, Builders<U>.Filter.Eq(elemFieldMatch, elemMatch));+ /// <summary>+ /// Add to set - add subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="value"></param>+ /// <returns></returns>+ public virtual async Task AddToSet<U>(string id, Expression<Func<T, IEnumerable<U>>> field, U value)+ {+ var builder = Builders<T>.Filter;+ var filter = builder.Eq(x => x.Id, id);+ var update = Builders<T>.Update.AddToSet(field, value);++ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ await _collection.UpdateOneAsync(filter, combinedUpdate);+ }- MemberExpression me = field.Body as MemberExpression;- MemberInfo minfo = me.Member;- var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);- var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ /// <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>+ public virtual async Task UpdateToSet<U, Z>(string id, Expression<Func<T, IEnumerable<U>>> field,+ Expression<Func<U, Z>> elemFieldMatch, Z elemMatch, U value)+ {+ var filter = Builders<T>.Filter.Eq(x => x.Id, id)+ & Builders<T>.Filter.ElemMatch(field, Builders<U>.Filter.Eq(elemFieldMatch, elemMatch));++ var me = field.Body as MemberExpression;+ var minfo = me.Member;+ var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);+ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);++ await _collection.UpdateOneAsync(filter, combinedUpdate);+ }+ /// <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="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 = string.IsNullOrEmpty(id)+ ? Builders<T>.Filter.Where(x => true)+ : Builders<T>.Filter.Eq(x => x.Id, id)+ & Builders<T>.Filter.ElemMatch(field, elemFieldMatch);++ var me = field.Body as MemberExpression;+ var minfo = me.Member;+ var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);++ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ if (string.IsNullOrEmpty(id))+ await _collection.UpdateManyAsync(filter, combinedUpdate);+ elseawait _collection.UpdateOneAsync(filter, combinedUpdate);- }+ }- /// <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="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 = string.IsNullOrEmpty(id)- ? Builders<T>.Filter.Where(x => true)- : 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 updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);- if (string.IsNullOrEmpty(id))- {- await _collection.UpdateManyAsync(filter, combinedUpdate);- }- else- {- await _collection.UpdateOneAsync(filter, combinedUpdate);- }- }+ /// <summary>+ /// Update subdocuments+ /// </summary>+ /// <typeparam name="T">Document</typeparam>+ /// <typeparam name="U"></typeparam>+ /// <param name="field"></param>+ /// <param name="elemFieldMatch">Subdocument field to match</param>+ /// <param name="value">Subdocument - to update (all values)</param>+ /// <returns></returns>+ public virtual async Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value)+ {+ var me = field.Body as MemberExpression;+ var minfo = me.Member;- /// <summary>- /// Update subdocuments- /// </summary>- /// <typeparam name="T">Document</typeparam>- /// <typeparam name="U"></typeparam>- /// <param name="field"></param>- /// <param name="elemFieldMatch">Subdocument field to match</param>- /// <param name="value">Subdocument - to update (all values)</param>- /// <returns></returns>- public virtual async Task UpdateToSet<U>(Expression<Func<T, IEnumerable<U>>> field, U elemFieldMatch, U value)- {- MemberExpression me = field.Body as MemberExpression;- MemberInfo minfo = me.Member;+ var filter = new BsonDocument {+ new BsonElement(minfo.Name, elemFieldMatch.ToString())+ };++ var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);- var filter = new BsonDocument {- new BsonElement(minfo.Name, elemFieldMatch.ToString())- };+ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);- var update = Builders<T>.Update.Set($"{minfo.Name}.$", value);+ await _collection.UpdateManyAsync(filter, combinedUpdate);+ }++ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <typeparam name="U"></typeparam>+ /// <typeparam name="Z"></typeparam>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <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)+ {+ 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 updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ if (string.IsNullOrEmpty(id))await _collection.UpdateManyAsync(filter, combinedUpdate);- }+ else+ await _collection.UpdateOneAsync(filter, combinedUpdate);+ }- /// <summary>- /// Delete subdocument- /// </summary>- /// <typeparam name="U"></typeparam>- /// <typeparam name="Z"></typeparam>- /// <param name="id"></param>- /// <param name="field"></param>- /// <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)- {- 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 updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);-- if (string.IsNullOrEmpty(id))- {- await _collection.UpdateManyAsync(filter, combinedUpdate);- }- else- {- await _collection.UpdateOneAsync(filter, combinedUpdate);- }- }+ /// <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);- /// <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 updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);- var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);+ await _collection.UpdateOneAsync(filter, combinedUpdate);+ }- await _collection.UpdateOneAsync(filter, combinedUpdate);- }+ /// <summary>+ /// Delete subdocument+ /// </summary>+ /// <param name="id"></param>+ /// <param name="field"></param>+ /// <param name="element"></param>+ /// <returns></returns>+ public virtual async Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element)+ {+ var update = Builders<T>.Update.Pull(field, element);- /// <summary>- /// Delete subdocument- /// </summary>- /// <param name="id"></param>- /// <param name="field"></param>- /// <param name="element"></param>- /// <returns></returns>- public virtual async Task Pull(string id, Expression<Func<T, IEnumerable<string>>> field, string element)- {- var update = Builders<T>.Update.Pull(field, element);-- var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());- var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());- var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);-- if (string.IsNullOrEmpty(id))- {- await _collection.UpdateManyAsync(Builders<T>.Filter.Where(x => true), combinedUpdate);- }- else- {- await _collection.UpdateOneAsync(Builders<T>.Filter.Eq(x => x.Id, id), combinedUpdate);- }- }+ var updateDate = Builders<T>.Update.Set(x => x.UpdatedOnUtc, _auditInfoProvider.GetCurrentDateTime());+ var updateUser = Builders<T>.Update.Set(x => x.UpdatedBy, _auditInfoProvider.GetCurrentUser());+ var combinedUpdate = Builders<T>.Update.Combine(update, updateDate, updateUser);- /// <summary>- /// Delete entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual void Delete(T entity)- {- _collection.FindOneAndDelete(e => e.Id == entity.Id);- }+ if (string.IsNullOrEmpty(id))+ await _collection.UpdateManyAsync(Builders<T>.Filter.Where(x => true), combinedUpdate);+ else+ await _collection.UpdateOneAsync(Builders<T>.Filter.Eq(x => x.Id, id), combinedUpdate);+ }- /// <summary>- /// Async Delete entity- /// </summary>- /// <param name="entity">Entity</param>- public virtual async Task<T> DeleteAsync(T entity)- {- await _collection.DeleteOneAsync(e => e.Id == entity.Id);- return entity;- }+ /// <summary>+ /// Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual void Delete(T entity)+ {+ _collection.FindOneAndDelete(e => e.Id == entity.Id);+ }- /// <summary>- /// Async Delete entities- /// </summary>- /// <param name="entities">Entities</param>- public virtual async Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities)- {- foreach (T entity in entities)- {- await DeleteAsync(entity);- }+ /// <summary>+ /// Async Delete entity+ /// </summary>+ /// <param name="entity">Entity</param>+ public virtual async Task<T> DeleteAsync(T entity)+ {+ await _collection.DeleteOneAsync(e => e.Id == entity.Id);+ return entity;+ }- return entities;- }+ /// <summary>+ /// Async Delete entities+ /// </summary>+ /// <param name="entities">Entities</param>+ public virtual async Task<IEnumerable<T>> DeleteAsync(IEnumerable<T> entities)+ {+ foreach (var entity in entities) await DeleteAsync(entity);- /// <summary>- /// Delete a many entities- /// </summary>- /// <param name="filterexpression"></param>- /// <returns></returns>- public virtual async Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression)- {- await _collection.DeleteManyAsync(filterexpression);- }+ return entities;+ }- /// <summary>- /// Clear entities- /// </summary>- public Task ClearAsync()- {- return _collection.DeleteManyAsync(Builders<T>.Filter.Empty);- }+ /// <summary>+ /// Delete a many entities+ /// </summary>+ /// <param name="filterexpression"></param>+ /// <returns></returns>+ public virtual async Task DeleteManyAsync(Expression<Func<T, bool>> filterexpression)+ {+ await _collection.DeleteManyAsync(filterexpression);+ }- #endregion+ /// <summary>+ /// Clear entities+ /// </summary>+ public Task ClearAsync()+ {+ return _collection.DeleteManyAsync(Builders<T>.Filter.Empty);+ }- #region Properties+ #endregion- /// <summary>- /// Gets a table- /// </summary>- public virtual IQueryable<T> Table => _collection.AsQueryable();+ #region Properties- /// <summary>- /// Gets a table collection- /// </summary>- public virtual IQueryable<T> TableCollection(string collectionName)- {- return _collection.Database.GetCollection<T>(collectionName).AsQueryable();- }+ /// <summary>+ /// Gets a table+ /// </summary>+ public virtual IQueryable<T> Table => _collection.AsQueryable();- #endregion+ /// <summary>+ /// Gets a table collection+ /// </summary>+ public virtual IQueryable<T> TableCollection(string collectionName)+ {+ return _collection.Database.GetCollection<T>(collectionName).AsQueryable();}++ #endregion}\ No newline at end of filediff --git a/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.csindex 5a46e7fe1..6da6720d8 100644--- a/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs@@ -1,44 +1,44 @@using MongoDB.Bson;using MongoDB.Driver;+using MongoDB.Driver.GridFS;-namespace Grand.Data.Mongo+namespace Grand.Data.Mongo;++public class MongoStoreFilesContext : IStoreFilesContext{- public class MongoStoreFilesContext : IStoreFilesContext+ protected IMongoDatabase _database;++ public MongoStoreFilesContext()+ {+ var connectionString = DataSettingsManager.LoadSettings().ConnectionString;++ var mongourl = new MongoUrl(connectionString);+ var databaseName = mongourl.DatabaseName;+ _database = new MongoClient(connectionString).GetDatabase(databaseName);+ }++ public MongoStoreFilesContext(IMongoDatabase database)+ {+ _database = database;+ }++ public async Task<byte[]> BucketDownload(string id)+ {+ var bucket = new GridFSBucket(_database);+ var binary = await bucket.DownloadAsBytesAsync(new ObjectId(id), new GridFSDownloadOptions { CheckMD5 = true });+ return binary;+ }++ public async Task BucketDelete(string id)+ {+ var bucket = new GridFSBucket(_database);+ await bucket.DeleteAsync(new ObjectId(id));+ }++ public async Task<string> BucketUploadFromBytes(string filename, byte[] source){- protected IMongoDatabase _database;-- public MongoStoreFilesContext()- {- var connectionString = DataSettingsManager.LoadSettings().ConnectionString;-- var mongourl = new MongoUrl(connectionString);- var databaseName = mongourl.DatabaseName;- _database = new MongoClient(connectionString).GetDatabase(databaseName);- }-- public MongoStoreFilesContext(IMongoDatabase database)- {- _database = database;- }-- public async Task<byte[]> BucketDownload(string id)- {- var bucket = new MongoDB.Driver.GridFS.GridFSBucket(_database);- var binary = await bucket.DownloadAsBytesAsync(new ObjectId(id), new MongoDB.Driver.GridFS.GridFSDownloadOptions { CheckMD5 = true });- return binary;-- }- public async Task BucketDelete(string id)- {- var bucket = new MongoDB.Driver.GridFS.GridFSBucket(_database);- await bucket.DeleteAsync(new ObjectId(id));- }-- public async Task<string> BucketUploadFromBytes(string filename, byte[] source)- {- var bucket = new MongoDB.Driver.GridFS.GridFSBucket(_database);- var id = await bucket.UploadFromBytesAsync(filename, source);- return id.ToString();- }+ var bucket = new GridFSBucket(_database);+ var id = await bucket.UploadFromBytesAsync(filename, source);+ return id.ToString();}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/OrderBuilder.cs b/src/Core/Grand.Data/OrderBuilder.csindex 6eeed7739..2f2542533 100644--- a/src/Core/Grand.Data/OrderBuilder.cs+++ b/src/Core/Grand.Data/OrderBuilder.cs@@ -1,44 +1,45 @@using System.Linq.Expressions;-namespace Grand.Data+namespace Grand.Data;++public class OrderBuilder<T>{- public class OrderBuilder<T>- {- private readonly List<(Expression<Func<T, object>> selector, bool value, string fieldName)> _list = new();+ private readonly List<(Expression<Func<T, object>> selector, bool value, string fieldName)> _list = new();- protected OrderBuilder() { }+ protected OrderBuilder() { }- public static OrderBuilder<T> Create()- {- return new();- }+ public IEnumerable<(Expression<Func<T, object>> selector, bool value, string fieldName)> Fields => _list;- public OrderBuilder<T> Ascending(Expression<Func<T, object>> selector)- {- _list.Add((selector, true, ""));+ public static OrderBuilder<T> Create()+ {+ return new OrderBuilder<T>();+ }- return this;- }- public OrderBuilder<T> Ascending(string fieldName)- {- _list.Add((null, true, fieldName));+ public OrderBuilder<T> Ascending(Expression<Func<T, object>> selector)+ {+ _list.Add((selector, true, ""));- return this;- }+ return this;+ }- public OrderBuilder<T> Descending(Expression<Func<T, object>> selector)- {- _list.Add((selector, false, ""));+ public OrderBuilder<T> Ascending(string fieldName)+ {+ _list.Add((null, true, fieldName));- return this;- }- public OrderBuilder<T> Descending(string fieldName)- {- _list.Add((null, false, fieldName));+ return this;+ }++ public OrderBuilder<T> Descending(Expression<Func<T, object>> selector)+ {+ _list.Add((selector, false, ""));- return this;- }+ return this;+ }++ public OrderBuilder<T> Descending(string fieldName)+ {+ _list.Add((null, false, fieldName));- public IEnumerable<(Expression<Func<T, object>> selector, bool value, string fieldName)> Fields => _list;+ return this;}-}+}\ No newline at end of filediff --git a/src/Core/Grand.Data/UpdateBuilder.cs b/src/Core/Grand.Data/UpdateBuilder.csindex ad78c6302..f2fe3d1e2 100644--- a/src/Core/Grand.Data/UpdateBuilder.cs+++ b/src/Core/Grand.Data/UpdateBuilder.cs@@ -1,34 +1,32 @@using MongoDB.Driver;using System.Linq.Expressions;-namespace Grand.Data+namespace Grand.Data;++public class UpdateBuilder<T>{- public class UpdateBuilder<T>- {- private readonly List<UpdateDefinition<T>> _list = new();- private readonly List<ExpressionFieldDefinition<T, object>> _expressionFieldDefinitions = new();+ private readonly List<ExpressionFieldDefinition<T, object>> _expressionFieldDefinitions = new();+ private readonly List<UpdateDefinition<T>> _list = new();- protected UpdateBuilder() { }+ protected UpdateBuilder() { }- public static UpdateBuilder<T> Create()- {- return new();- }+ public IEnumerable<UpdateDefinition<T>> Fields => _list;- public UpdateBuilder<T> Set<TProperty>(Expression<Func<T, TProperty>> selector, TProperty value)- {- //for mongodb- _list.Add(Builders<T>.Update.Set(selector, value));+ public IEnumerable<ExpressionFieldDefinition<T, object>> ExpressionFields => _expressionFieldDefinitions;- //for other Db- _expressionFieldDefinitions.Add(new ExpressionFieldDefinition<T, object>(selector, value));+ public static UpdateBuilder<T> Create()+ {+ return new UpdateBuilder<T>();+ }- return this;- }+ public UpdateBuilder<T> Set<TProperty>(Expression<Func<T, TProperty>> selector, TProperty value)+ {+ //for mongodb+ _list.Add(Builders<T>.Update.Set(selector, value));- public IEnumerable<UpdateDefinition<T>> Fields => _list;+ //for other Db+ _expressionFieldDefinitions.Add(new ExpressionFieldDefinition<T, object>(selector, value));- public IEnumerable<ExpressionFieldDefinition<T, object>> ExpressionFields => _expressionFieldDefinitions;+ return this;}--}+}\ No newline at end of file