Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Minor changes

KrzysztofPajak52e76d19827d
diff --git a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
index b44760a82..2cb81c169 100644
--- a/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
+++ b/src/Business/Grand.Business.Common/Services/Configuration/SettingService.cs
@@ -4,8 +4,6 @@ using Grand.Domain.Data;
using Grand.Infrastructure.Caching;
using Grand.Infrastructure.Caching.Constants;
using MongoDB.Bson;
-using MongoDB.Bson.Serialization;
-using MongoDB.Driver;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -51,7 +49,7 @@ namespace Grand.Business.Common.Services.Configuration
private IList<Setting> GetSettingsByName(string name)
{
if (string.IsNullOrEmpty(name))
- throw new ArgumentNullException("name");
+ throw new ArgumentNullException(nameof(name));
return _settingRepository.Table.Where(x => x.Name == name.ToLowerInvariant()).ToList();
}
@@ -150,7 +148,7 @@ namespace Grand.Business.Common.Services.Configuration
setting = settings.FirstOrDefault(x => x.StoreId == "");
if (setting != null)
- return BsonSerializer.Deserialize<T>(setting.Metadata);
+ return MongoDB.Bson.Serialization.BsonSerializer.Deserialize<T>(setting.Metadata);
}
return defaultValue;
@@ -200,7 +198,7 @@ namespace Grand.Business.Common.Services.Configuration
/// <returns>Settings</returns>
public virtual IList<Setting> GetAllSettings()
{
- return _settingRepository.Collection.Find(new BsonDocument()).SortBy(x => x.Name).ToList();
+ return _settingRepository.Table.OrderBy(x => x.Name).ToList();
}
/// <summary>
@@ -231,7 +229,7 @@ namespace Grand.Business.Common.Services.Configuration
if (setting == null && !String.IsNullOrEmpty(storeId))
setting = settings.FirstOrDefault(x => x.StoreId == "");
- return BsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
+ return MongoDB.Bson.Serialization.BsonSerializer.Deserialize(setting.Metadata, type) as ISettings;
}
return Activator.CreateInstance(type) as ISettings;
});
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
index 80add3605..31aa4b1b4 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallDataProducts.cs
@@ -5,7 +5,6 @@ using Grand.Domain.Catalog;
using Grand.Domain.Media;
using Grand.Domain.Seo;
using Microsoft.Extensions.DependencyInjection;
-using MongoDB.Driver;
using System;
using System.Collections.Generic;
using System.IO;