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
Refactor DataSettingsManager/SettingsPath
KrzysztofPajaka0c4b36d7c3e
diff --git a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs b/src/Business/Grand.Business.System/Services/Installation/InstallationService.csindex 2d6f155f9..2435c2d2c 100644--- a/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs+++ b/src/Business/Grand.Business.System/Services/Installation/InstallationService.cs@@ -971,7 +971,7 @@ public partial class InstallationService : IInstallationService{try{- var dataSettings = DataSettingsManager.LoadSettings(true);+ var dataSettings = DataSettingsManager.Instance.LoadSettings(true);var dbContext = _serviceProvider.GetRequiredService<IDatabaseContext>();dbContext.SetConnection(dataSettings.ConnectionString);diff --git a/src/Core/Grand.Data/DataSettingsManager.cs b/src/Core/Grand.Data/DataSettingsManager.csindex 354dc351b..6591eda68 100644--- a/src/Core/Grand.Data/DataSettingsManager.cs+++ b/src/Core/Grand.Data/DataSettingsManager.cs@@ -6,39 +6,65 @@ namespace Grand.Data;/// <summary>/// Manager of data settings (connection string)/// </summary>-public static class DataSettingsManager+public sealed class DataSettingsManager{- private static DataSettings _dataSettings;+ private static DataSettingsManager _instance;+ private static readonly object _lock = new();- private static bool? _databaseIsInstalled;+ public static DataSettingsManager Instance => _instance ?? throw new InvalidOperationException("DataSettingsManager has not been initialized. Call Initialize first.");++ private readonly string _settingsPath;++ private DataSettings _dataSettings;++ private bool? _databaseIsInstalled;+++ public static void Initialize(string settingsPath)+ {+ if (_instance == null)+ {+ lock (_lock)+ {+ if (_instance == null)+ {+ _instance = new DataSettingsManager(settingsPath);+ }+ }+ }+ }+ private DataSettingsManager(string settingsPath)+ {+ _settingsPath = settingsPath;+ }/// <summary>/// Load settings/// </summary>- public static DataSettings LoadSettings(bool reloadSettings = false)+ public DataSettings LoadSettings(bool reloadSettings = false){if (!reloadSettings && _dataSettings != null)return _dataSettings;- if (!File.Exists(CommonPath.SettingsPath))+ if (!File.Exists(_settingsPath))return new DataSettings();try{- var text = File.ReadAllText(CommonPath.SettingsPath);+ var text = File.ReadAllText(_settingsPath);_dataSettings = JsonSerializer.Deserialize<DataSettings>(text);}catch{//Try to read file- var connectionString = File.ReadLines(CommonPath.SettingsPath).FirstOrDefault();+ var connectionString = File.ReadLines(_settingsPath).FirstOrDefault();_dataSettings = new DataSettings { ConnectionString = connectionString, DbProvider = DbProvider.MongoDB };}return _dataSettings;}- public static DataSettings LoadDataSettings(DataSettings dataSettings)+ public DataSettings LoadDataSettings(DataSettings dataSettings){_dataSettings = dataSettings;return _dataSettings;@@ -51,16 +77,19 @@ public static class DataSettingsManager/// <returns></returns>public static bool DatabaseIsInstalled(){- if (!_databaseIsInstalled.HasValue)+ if (_instance == null)+ throw new InvalidOperationException("DataSettingsManager has not been initialized. Call Initialize first.");++ if (!_instance._databaseIsInstalled.HasValue){- var settings = _dataSettings ?? LoadSettings();- _databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);+ var settings = _instance._dataSettings ?? _instance.LoadSettings();+ _instance._databaseIsInstalled = settings != null && !string.IsNullOrEmpty(settings.ConnectionString);}- return _databaseIsInstalled.Value;+ return _instance._databaseIsInstalled.Value;}- public static void ResetCache()+ public void ResetCache(){_databaseIsInstalled = false;}@@ -69,15 +98,14 @@ public static class DataSettingsManager/// Save settings to a file/// </summary>/// <param name="settings"></param>- public static async Task SaveSettings(DataSettings settings)+ public async Task SaveSettings(DataSettings settings){- var filePath = CommonPath.SettingsPath;- if (!File.Exists(filePath))+ if (!File.Exists(_settingsPath)){- await using var fs = File.Create(filePath);+ await using var fs = File.Create(_settingsPath);}var data = JsonSerializer.Serialize(settings, new JsonSerializerOptions { WriteIndented = true });- await File.WriteAllTextAsync(filePath, data);+ await File.WriteAllTextAsync(_settingsPath, data);}}\ No newline at end of filediff --git a/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs b/src/Core/Grand.Data/LiteDb/LiteDBRepository.csindex 3a852c48f..f179ab7e5 100644--- a/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs+++ b/src/Core/Grand.Data/LiteDb/LiteDBRepository.cs@@ -39,7 +39,7 @@ public class LiteDBRepository<T> : IRepository<T> where T : BaseEntitypublic LiteDBRepository(IAuditInfoProvider auditInfoProvider){_auditInfoProvider = auditInfoProvider;- var connection = DataSettingsManager.LoadSettings();+ var connection = DataSettingsManager.Instance.LoadSettings();if (!string.IsNullOrEmpty(connection.ConnectionString)){diff --git a/src/Core/Grand.Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Data/Mongo/MongoDBContext.csindex 98feab33f..003cdaff6 100644--- a/src/Core/Grand.Data/Mongo/MongoDBContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoDBContext.cs@@ -11,7 +11,7 @@ public class MongoDBContext : IDatabaseContextpublic MongoDBContext(){- var connection = DataSettingsManager.LoadSettings();+ var connection = DataSettingsManager.Instance.LoadSettings();if (!string.IsNullOrEmpty(connection.ConnectionString))PrepareMongoDatabase(connection.ConnectionString);}@@ -134,7 +134,7 @@ public class MongoDBContext : IDatabaseContextprotected IMongoDatabase TryReadMongoDatabase(){- _connectionString = DataSettingsManager.LoadSettings().ConnectionString;+ _connectionString = DataSettingsManager.Instance.LoadSettings().ConnectionString;var mongourl = new MongoUrl(_connectionString);var databaseName = mongourl.DatabaseName;diff --git a/src/Core/Grand.Data/Mongo/MongoRepository.cs b/src/Core/Grand.Data/Mongo/MongoRepository.csindex b249900e6..fdb3a4847 100644--- a/src/Core/Grand.Data/Mongo/MongoRepository.cs+++ b/src/Core/Grand.Data/Mongo/MongoRepository.cs@@ -36,7 +36,7 @@ public class MongoRepository<T> : IRepository<T> where T : BaseEntitypublic MongoRepository(IAuditInfoProvider auditInfoProvider){_auditInfoProvider = auditInfoProvider;- var connection = DataSettingsManager.LoadSettings();+ var connection = DataSettingsManager.Instance.LoadSettings();if (!string.IsNullOrEmpty(connection.ConnectionString)){diff --git a/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.csindex 6da6720d8..f1e437540 100644--- a/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs+++ b/src/Core/Grand.Data/Mongo/MongoStoreFilesContext.cs@@ -10,7 +10,7 @@ public class MongoStoreFilesContext : IStoreFilesContextpublic MongoStoreFilesContext(){- var connectionString = DataSettingsManager.LoadSettings().ConnectionString;+ var connectionString = DataSettingsManager.Instance.LoadSettings().ConnectionString;var mongourl = new MongoUrl(connectionString);var databaseName = mongourl.DatabaseName;diff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.csindex ab877275b..07cac0ad7 100644--- a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs@@ -37,7 +37,7 @@ public class StartupApplication : IStartupApplicationvar applicationInsights = new ApplicationInsightsConfig();configuration.GetSection("ApplicationInsights").Bind(applicationInsights);- var dataProviderSettings = DataSettingsManager.LoadSettings();+ var dataProviderSettings = DataSettingsManager.Instance.LoadSettings();if (string.IsNullOrEmpty(dataProviderSettings.ConnectionString)){serviceCollection.AddTransient(_ => dataProviderSettings);diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 1a32870d1..b3f5d9281 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -36,7 +36,7 @@ public static class StartupBase{var dbConfig = services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));if (!string.IsNullOrEmpty(dbConfig.ConnectionString))- DataSettingsManager.LoadDataSettings(new DataSettings {+ DataSettingsManager.Instance.LoadDataSettings(new DataSettings {ConnectionString = dbConfig.ConnectionString,DbProvider = (DbProvider)dbConfig.DbProvider});@@ -207,9 +207,11 @@ public static class StartupBaseCommonPath.WebHostEnvironment = hostingEnvironment.WebRootPath;CommonPath.BaseDirectory = hostingEnvironment.ContentRootPath;-- services.AddTransient<ValidationFilter>();+ var settingsPath = Path.Combine(hostingEnvironment.ContentRootPath, CommonPath.AppData, configuration["Directory"] ?? "", CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);++ services.AddTransient<ValidationFilter>();var mvcCoreBuilder = services.AddMvcCore(options =>{options.Filters.AddService<ValidationFilter>();diff --git a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs b/src/Core/Grand.SharedKernel/Extensions/CommonPath.csindex 4d4812e77..900e58cf1 100644--- a/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs+++ b/src/Core/Grand.SharedKernel/Extensions/CommonPath.cs@@ -10,16 +10,12 @@ public static class CommonPathpublic static string DirectoryParam = "Directory";+ public static string SettingsFile = "Settings.cfg";+/// <summary>/// Extra parameter to path/// </summary>public static string Param { get; set; } = "";-- /// <summary>- /// Maps a settings path to a physical disk path.- /// </summary>- /// <returns>The physical path.</returns>- public static string SettingsPath => Path.Combine(BaseDirectory, AppData, Param, "Settings.cfg");/// <summary>/// Maps a installled plugins path to a physical disk path.diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.csindex ea84b5eaf..579bf6176 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Categories/CategoryServiceTests.cs@@ -11,6 +11,7 @@ using Grand.Infrastructure.Configuration;using Grand.Infrastructure.Events;using Grand.SharedKernel.Extensions;using MediatR;+using Microsoft.Extensions.Hosting.Internal;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;@@ -32,8 +33,8 @@ public class CategoryServiceTests[TestInitialize]public void Init(){- CommonPath.BaseDirectory = "";-+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);_casheManagerMock = new Mock<ICacheBase>();_categoryRepositoryMock = new Mock<IRepository<Category>>();_productRepositoryMock = new Mock<MongoRepository<Product>>(Mock.Of<IAuditInfoProvider>());diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.csindex 42d923150..27d3d11bd 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceFormatterTests.cs@@ -38,7 +38,8 @@ public class PriceFormatterTests[TestInitialize]public void TestInitialize(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);var eventPublisher = new Mock<IMediator>();_eventPublisher = eventPublisher.Object;diff --git a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.csindex 9a985ab41..f26458c95 100644--- a/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs+++ b/src/Tests/Grand.Business.Catalog.Tests/Services/Prices/PriceServiceTests.cs@@ -52,7 +52,8 @@ public class PriceServiceTests[TestInitialize]public void TestInitialize(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);_store = new Store { Id = "1" };tempWorkContext = new Mock<IWorkContext>();diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.csindex fdec98b8f..4c70f243f 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/CheckoutAttributes/CheckoutAttributeParserTests.cs@@ -32,7 +32,8 @@ public class CheckoutAttributeParserTests[TestInitialize]public void TestInitialize(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);//color choosing via DropDownListca1 = new CheckoutAttribute {diff --git a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.csindex b09fc8a27..de472b712 100644--- a/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs+++ b/src/Tests/Grand.Business.Checkout.Tests/Services/Orders/LoyaltyPointsServiceTests.cs@@ -2,6 +2,7 @@using Grand.Data;using Grand.Data.Tests.MongoDb;using Grand.Domain.Orders;+using Grand.SharedKernel.Extensions;using MediatR;using Microsoft.VisualStudio.TestTools.UnitTesting;using Moq;@@ -18,9 +19,12 @@ public class LoyaltyPointsServiceTests[TestInitialize]public void Init(){++ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);+_repository = new MongoDBRepositoryTest<LoyaltyPointsHistory>();_mediatorMock = new Mock<IMediator>();-_loyaltyPointsService =new LoyaltyPointsService(_repository, new LoyaltyPointsSettings(), _mediatorMock.Object);}diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.csindex ce603a4a2..bbfa56180 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Addresses/AddressAttributeServiceTests.cs@@ -22,7 +22,8 @@ public class AddressAttributeServiceTests[TestInitialize]public void Init(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);_cacheMock = new Mock<ICacheBase>();_repositoryMock = new Mock<MongoRepository<AddressAttribute>>(Mock.Of<IAuditInfoProvider>());_mediatorMock = new Mock<IMediator>();diff --git a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.csindex a9eb9dc3b..52da1c874 100644--- a/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs+++ b/src/Tests/Grand.Business.Common.Tests/Services/Directory/CurrencyServiceTests.cs@@ -32,7 +32,8 @@ public class CurrencyServiceTests[TestInitialize]public void TestInitialize(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);currencyUSD = new Currency {Id = "1",diff --git a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.csindex 5110e86aa..e3363c34c 100644--- a/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs+++ b/src/Tests/Grand.Business.Marketing.Tests/Services/Documents/DocumentTypeServiceTests.cs@@ -22,7 +22,8 @@ public class DocumentTypeServiceTests[TestInitialize]public void Init(){- CommonPath.BaseDirectory = "";+ var settingsPath = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(settingsPath);_mediatorMock = new Mock<IMediator>();_documentTypeRepositoryMock = new Mock<IRepository<DocumentType>>();diff --git a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.csindex e29f5ea2e..607b12cef 100644--- a/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs+++ b/src/Tests/Grand.Domain.Tests/Data/DataSettingsManagerTests.cs@@ -10,24 +10,25 @@ public class DataSettingsManagerTests{public DataSettingsManagerTests(){- CommonPath.BaseDirectory = TestContext.CurrentContext.TestDirectory;+ var path = Path.Combine(TestContext.CurrentContext.TestDirectory, CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(path);}[TestInitialize]public void Setup(){- DataSettingsManager.LoadDataSettings(null);+ DataSettingsManager.Instance.LoadDataSettings(null);- if (File.Exists(CommonPath.SettingsPath))- File.Delete(CommonPath.SettingsPath);+ /*if (File.Exists(CommonPath.SettingsPath))+ File.Delete(CommonPath.SettingsPath);*/}[TestMethod]public async Task SaveSettings_LoadSettings_Test(){- await DataSettingsManager.SaveSettings(new DataSettings+ await DataSettingsManager.Instance.SaveSettings(new DataSettings{ ConnectionString = "connectionstring", DbProvider = DbProvider.MongoDB });- var settings = DataSettingsManager.LoadSettings();+ var settings = DataSettingsManager.Instance.LoadSettings();Assert.IsNotNull(settings);Assert.IsTrue(DataSettingsManager.DatabaseIsInstalled());Assert.AreEqual("connectionstring", settings.ConnectionString);@@ -37,7 +38,7 @@ public class DataSettingsManagerTests[TestMethod]public async Task DatabaseIsInstalledTest_True(){- await DataSettingsManager.SaveSettings(new DataSettings+ await DataSettingsManager.Instance.SaveSettings(new DataSettings{ ConnectionString = "connectionstring", DbProvider = DbProvider.MongoDB });Assert.IsTrue(DataSettingsManager.DatabaseIsInstalled());}diff --git a/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs b/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.csindex df1af2ee0..90dcd2300 100644--- a/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs+++ b/src/Tests/Grand.Web.Common.Tests/AuthorizeMenuAttributeTests.cs@@ -30,8 +30,9 @@ public class AuthorizeMenuAttributeTests[TestInitialize]public void Setup(){- CommonPath.BaseDirectory = "";- var settings = DataSettingsManager.LoadSettings();+ var path = Path.Combine("", CommonPath.AppData, CommonPath.SettingsFile);+ DataSettingsManager.Initialize(path);+ var settings = DataSettingsManager.Instance.LoadSettings();_mockPermissionService = new Mock<IPermissionService>();_mockAdminSiteMapService = new Mock<IAdminSiteMapService>();_mockWorkContext = new Mock<IWorkContext>();diff --git a/src/Web/Grand.Web/Controllers/InstallController.cs b/src/Web/Grand.Web/Controllers/InstallController.csindex 5f8039ac3..2799d2014 100644--- a/src/Web/Grand.Web/Controllers/InstallController.cs+++ b/src/Web/Grand.Web/Controllers/InstallController.cs@@ -231,8 +231,8 @@ public class InstallController : ControllerDbProvider = model.DataProvider};- await DataSettingsManager.SaveSettings(settings);- DataSettingsManager.LoadSettings(true);+ await DataSettingsManager.Instance.SaveSettings(settings);+ DataSettingsManager.Instance.LoadSettings(true);var installationService = _serviceProvider.GetRequiredService<IInstallationService>();await installationService.InstallData(@@ -244,7 +244,7 @@ public class InstallController : Controller_logger.LogInformation("Database has been installed");//reset cache- DataSettingsManager.ResetCache();+ DataSettingsManager.Instance.ResetCache();PluginManager.ClearPlugins();@@ -281,10 +281,10 @@ public class InstallController : Controllercatch (Exception exception){//reset cache- DataSettingsManager.ResetCache();+ DataSettingsManager.Instance.ResetCache();await _cacheBase.Clear();- System.IO.File.Delete(CommonPath.SettingsPath);+ System.IO.File.Delete(Path.Combine(AppContext.BaseDirectory, CommonPath.AppData, CommonPath.SettingsFile));ModelState.AddModelError("",string.Format(locService.GetResource(model.SelectedLanguage, "SetupFailed"),