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.

Add DbProvider, change the structure of settings.cfg file

KrzysztofPajakbb8acc4dee78
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
index 9ab6813ea..c992e8d11 100644
--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs
@@ -454,7 +454,7 @@ namespace Grand.Business.System.Services.Installation
var collation = new Collation(local);
options.Collation = collation;
var dataSettingsManager = new DataSettingsManager();
- var connectionString = dataSettingsManager.LoadSettings().DataConnectionString;
+ var connectionString = dataSettingsManager.LoadSettings().ConnectionString;
var mongourl = new MongoUrl(connectionString);
var databaseName = mongourl.DatabaseName;
diff --git a/src/Core/Grand.Domain/Data/DataSettings.cs b/src/Core/Grand.Domain/Data/DataSettings.cs
index bd844c0fa..8add89e73 100644
--- a/src/Core/Grand.Domain/Data/DataSettings.cs
+++ b/src/Core/Grand.Domain/Data/DataSettings.cs
@@ -9,11 +9,16 @@
/// <summary>
/// Connection string
/// </summary>
- public string DataConnectionString { get; set; }
+ public string ConnectionString { get; set; }
+
+ /// <summary>
+ /// Database type
+ /// </summary>
+ public DbProvider DbProvider { get; set; }
public bool IsValid()
{
- return !string.IsNullOrEmpty(DataConnectionString);
+ return !string.IsNullOrEmpty(ConnectionString);
}
}
}
diff --git a/src/Core/Grand.Domain/Data/DataSettingsHelper.cs b/src/Core/Grand.Domain/Data/DataSettingsHelper.cs
index 82108034c..bba199d8d 100644
--- a/src/Core/Grand.Domain/Data/DataSettingsHelper.cs
+++ b/src/Core/Grand.Domain/Data/DataSettingsHelper.cs
@@ -17,9 +17,9 @@
{
var manager = new DataSettingsManager();
var settings = manager.LoadSettings();
- _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.DataConnectionString);
- if (!string.IsNullOrEmpty(settings.DataConnectionString))
- _connectionString = settings.DataConnectionString;
+ _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);
+ if (!string.IsNullOrEmpty(settings.ConnectionString))
+ _connectionString = settings.ConnectionString;
}
return _databaseIsInstalled.Value;
}
@@ -27,8 +27,8 @@
{
var manager = new DataSettingsManager();
var settings = manager.LoadSettings();
- if (!string.IsNullOrEmpty(settings.DataConnectionString))
- _connectionString = settings.DataConnectionString;
+ if (!string.IsNullOrEmpty(settings.ConnectionString))
+ _connectionString = settings.ConnectionString;
}
public static string ConnectionString()
{
diff --git a/src/Core/Grand.Domain/Data/DataSettingsManager.cs b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
index d23433a40..2545e96e2 100644
--- a/src/Core/Grand.Domain/Data/DataSettingsManager.cs
+++ b/src/Core/Grand.Domain/Data/DataSettingsManager.cs
@@ -1,7 +1,7 @@
-using Grand.Domain.Data;
-using Grand.SharedKernel.Extensions;
+using Grand.SharedKernel.Extensions;
using System.IO;
using System.Linq;
+using System.Text.Json;
using System.Threading.Tasks;
namespace Grand.Domain.Data
@@ -25,10 +25,19 @@ namespace Grand.Domain.Data
if (!File.Exists(CommonPath.SettingsPath))
return new DataSettings();
- var connectionString = File.ReadLines(CommonPath.SettingsPath).FirstOrDefault();
- _dataSettings = new DataSettings() { DataConnectionString = connectionString };
- 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 };
+ }
+ return _dataSettings;
}
/// <summary>
@@ -42,7 +51,8 @@ namespace Grand.Domain.Data
{
using FileStream fs = File.Create(filePath);
}
- await File.WriteAllTextAsync(filePath, settings.DataConnectionString);
+ var data = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });
+ await File.WriteAllTextAsync(filePath, data);
}
}
}
diff --git a/src/Core/Grand.Domain/Data/DbProvider.cs b/src/Core/Grand.Domain/Data/DbProvider.cs
new file mode 100644
index 000000000..a6594dd2c
--- /dev/null
+++ b/src/Core/Grand.Domain/Data/DbProvider.cs
@@ -0,0 +1,7 @@
+namespace Grand.Domain.Data
+{
+ public enum DbProvider
+ {
+ MongoDB
+ }
+}
diff --git a/src/Core/Grand.Domain/Data/MongoDBContext.cs b/src/Core/Grand.Domain/Data/MongoDBContext.cs
index aec0efbfe..ef7f2fc78 100644
--- a/src/Core/Grand.Domain/Data/MongoDBContext.cs
+++ b/src/Core/Grand.Domain/Data/MongoDBContext.cs
@@ -36,7 +36,7 @@ namespace Grand.Domain.Data
protected IMongoDatabase TryReadMongoDatabase()
{
var dataSettingsManager = new DataSettingsManager();
- var connectionString = dataSettingsManager.LoadSettings().DataConnectionString;
+ var connectionString = dataSettingsManager.LoadSettings().ConnectionString;
var mongourl = new MongoUrl(connectionString);
var databaseName = mongourl.DatabaseName;
diff --git a/src/Core/Grand.Infrastructure/Data/StartupApplication.cs b/src/Core/Grand.Infrastructure/Data/StartupApplication.cs
index a4b356ebf..f911269f1 100644
--- a/src/Core/Grand.Infrastructure/Data/StartupApplication.cs
+++ b/src/Core/Grand.Infrastructure/Data/StartupApplication.cs
@@ -28,7 +28,7 @@ namespace Grand.Infrastructure.Data
{
var dataSettingsManager = new DataSettingsManager();
var dataProviderSettings = dataSettingsManager.LoadSettings();
- if (string.IsNullOrEmpty(dataProviderSettings.DataConnectionString))
+ if (string.IsNullOrEmpty(dataProviderSettings.ConnectionString))
{
serviceCollection.AddTransient(c => dataSettingsManager.LoadSettings());
serviceCollection.AddTransient<BaseDataProviderManager>(c => new MongoDBDataProviderManager(c.GetRequiredService<DataSettings>()));
@@ -36,7 +36,7 @@ namespace Grand.Infrastructure.Data
}
if (dataProviderSettings != null && dataProviderSettings.IsValid())
{
- var connectionString = dataProviderSettings.DataConnectionString;
+ var connectionString = dataProviderSettings.ConnectionString;
var mongourl = new MongoUrl(connectionString);
var databaseName = mongourl.DatabaseName;
serviceCollection.AddScoped(c => new MongoClient(mongourl).GetDatabase(databaseName));
diff --git a/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs b/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
index ebf868c08..018b6ea84 100644
--- a/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
+++ b/src/Core/Grand.Infrastructure/Plugins/PluginExtensions.cs
@@ -36,7 +36,7 @@ namespace Grand.Infrastructure.Plugins
public static async Task SaveInstalledPluginsFile(IList<string> pluginSystemNames, string filePath)
{
//serialize
- string result = JsonSerializer.Serialize(pluginSystemNames);
+ string result = JsonSerializer.Serialize(pluginSystemNames, new JsonSerializerOptions { WriteIndented = true });
//save
await File.WriteAllTextAsync(filePath, result);
await Task.CompletedTask;
diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.cs
index 6856a4d47..8aaad6eee 100644
--- a/src/Web/Grand.Web/Controllers/InstallController.cs
+++ b/src/Web/Grand.Web/Controllers/InstallController.cs
@@ -157,7 +157,8 @@ namespace Grand.Web.Controllers
//save settings
var settings = new DataSettings
{
- DataConnectionString = connectionString
+ ConnectionString = connectionString,
+ DbProvider = DbProvider.MongoDB
};
await settingsManager.SaveSettings(settings);