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.

Move Migrating Process to Grand.Module.Migration (#521)

Krzysztof Pajak6b07a5d2d805
diff --git a/GrandNode.sln b/GrandNode.sln
index 9273232b1..ddbeb9275 100644
--- a/GrandNode.sln
+++ b/GrandNode.sln
@@ -137,7 +137,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Payments.StripeCheckout", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Installer", "src\Modules\Grand.Module.Installer\Grand.Module.Installer.csproj", "{62460E0C-D4D1-4606-9716-965267B77BA3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Module.Installer", "src\Modules\Grand.Module.Installer\Grand.Module.Installer.csproj", "{62460E0C-D4D1-4606-9716-965267B77BA3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Migration", "src\Modules\Grand.Module.Migration\Grand.Module.Migration.csproj", "{75F9D855-026B-4BCB-90CE-3800F02FA0A7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -364,6 +366,10 @@ Global
{62460E0C-D4D1-4606-9716-965267B77BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62460E0C-D4D1-4606-9716-965267B77BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62460E0C-D4D1-4606-9716-965267B77BA3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {75F9D855-026B-4BCB-90CE-3800F02FA0A7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -424,6 +430,7 @@ Global
{9DAAD56A-8DB7-4A41-BAF3-9486D617AB05} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
{8AD9B827-7FB6-4581-85BB-82D7F298DE1A} = {F6F48227-B3C5-4A51-B33F-FF9AD96352DB}
{62460E0C-D4D1-4606-9716-965267B77BA3} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
+ {75F9D855-026B-4BCB-90CE-3800F02FA0A7} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}
diff --git a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
index 67dc8cc8f..3b4363504 100644
--- a/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
+++ b/src/Business/Grand.Business.Common/Services/Localization/TranslationService.cs
@@ -1,4 +1,3 @@
-using Grand.Business.Common.Utilities;
using Grand.Business.Core.Interfaces.Common.Localization;
using Grand.Data;
using Grand.Domain.Localization;
@@ -8,7 +7,6 @@ using Grand.SharedKernel.Extensions;
using MediatR;
using System.Collections.Concurrent;
using System.Xml;
-using System.Xml.Schema;
namespace Grand.Business.Common.Services.Localization;
@@ -68,9 +66,9 @@ public class TranslationService : ITranslationService
public virtual async Task<TranslationResource> GetTranslateResourceByName(string name, string languageId)
{
var query = from lsr in _translationRepository.Table
- orderby lsr.Name
- where lsr.LanguageId == languageId && lsr.Name == name
- select lsr;
+ orderby lsr.Name
+ where lsr.LanguageId == languageId && lsr.Name == name
+ select lsr;
var translateResource = await Task.FromResult(query.FirstOrDefault());
return translateResource;
}
@@ -224,48 +222,37 @@ public class TranslationService : ITranslationService
if (string.IsNullOrEmpty(xml))
return;
- var xmlDoc = LanguageXmlDocument(xml);
+ var xmlDoc = XmlExtensions.LanguageXmlDocument(xml);
- var nodes = xmlDoc.SelectNodes("//Language/Resource");
- if (nodes != null)
- foreach (XmlNode node in nodes)
+ var translateResources = XmlExtensions.ParseTranslationResources(xmlDoc);
+
+ foreach (var item in translateResources)
+ {
+ //bulk insert
+ var resource = (from l in _translationRepository.Table
+ where l.Name == item.Name.ToLowerInvariant() && l.LanguageId == language.Id
+ select l).FirstOrDefault();
+
+ if (resource != null)
{
- var name = node.Attributes?["Name"]?.InnerText.Trim();
- var area = node.Attributes?["Area"]?.InnerText.Trim();
- var value = "";
- var valueNode = node.SelectSingleNode("Value");
- if (valueNode != null)
- value = valueNode.InnerText;
-
- if (string.IsNullOrEmpty(name))
- continue;
-
- //bulk insert
- var resource = (from l in _translationRepository.Table
- where l.Name == name.ToLowerInvariant() && l.LanguageId == language.Id
- select l).FirstOrDefault();
-
- if (resource != null)
- {
- resource.Name = resource.Name.ToLowerInvariant();
- resource.Value = value;
- if (Enum.TryParse<TranslationResourceArea>(area, out var areaEnum))
- resource.Area = areaEnum;
- await _translationRepository.UpdateAsync(resource);
- }
- else
- {
- _ = Enum.TryParse(area, out TranslationResourceArea areaEnum);
- await _translationRepository.InsertAsync(new TranslationResource {
- LanguageId = language.Id,
- Name = name.ToLowerInvariant(),
- Value = value,
- Area = areaEnum,
- CreatedBy = _workContext.CurrentCustomer.Email
- });
- }
+ resource.Name = resource.Name.ToLowerInvariant();
+ resource.Value = item.Value;
+ if (Enum.TryParse<TranslationResourceArea>(item.Area, out var areaEnum))
+ resource.Area = areaEnum;
+ await _translationRepository.UpdateAsync(resource);
}
-
+ else
+ {
+ _ = Enum.TryParse(item.Area, out TranslationResourceArea areaEnum);
+ await _translationRepository.InsertAsync(new TranslationResource {
+ LanguageId = language.Id,
+ Name = item.Name.ToLowerInvariant(),
+ Value = item.Value,
+ Area = areaEnum,
+ CreatedBy = _workContext.CurrentCustomer.Email
+ });
+ }
+ }
await RefreshCachedResources(language.Id);
}
@@ -281,35 +268,22 @@ public class TranslationService : ITranslationService
if (string.IsNullOrEmpty(xml))
return;
- var xmlDoc = LanguageXmlDocument(xml);
-
- var translateResources = new List<TranslationResource>();
-
- var nodes = xmlDoc.SelectNodes("//Language/Resource");
- if (nodes != null)
- foreach (XmlNode node in nodes)
- {
- var name = node.Attributes?["Name"]?.InnerText.Trim();
- var area = node.Attributes?["Area"]?.InnerText.Trim();
- var value = "";
- var valueNode = node.SelectSingleNode("Value");
- if (valueNode != null)
- value = valueNode.InnerText;
-
- if (string.IsNullOrEmpty(name))
- continue;
-
- _ = Enum.TryParse(area, out TranslationResourceArea areaEnum);
+ var xmlDoc = XmlExtensions.LanguageXmlDocument(xml);
- await _translationRepository.InsertAsync(new TranslationResource {
- LanguageId = language.Id,
- Name = name.ToLowerInvariant(),
- Value = value,
- Area = areaEnum,
- CreatedBy = "System"
- });
- }
+ var translateResources = XmlExtensions.ParseTranslationResources(xmlDoc);
+ foreach (var item in translateResources)
+ {
+ _ = Enum.TryParse(item.Area, out TranslationResourceArea areaEnum);
+
+ await _translationRepository.InsertAsync(new TranslationResource {
+ LanguageId = language.Id,
+ Name = item.Name.ToLowerInvariant(),
+ Value = item.Value,
+ Area = areaEnum,
+ CreatedBy = "System"
+ });
+ }
await RefreshCachedResources(language.Id);
}
@@ -344,18 +318,5 @@ public class TranslationService : ITranslationService
g => g.First().Value);
}
- private static XmlDocument LanguageXmlDocument(string xml)
- {
- var schemas = new XmlSchemaSet();
- schemas.Add("", XmlReader.Create(new StringReader(LanguageSchema.SchemaXsd)));
-
- var xmlDoc = new XmlDocument { Schemas = schemas, XmlResolver = null };
- xmlDoc.LoadXml(xml);
-
- // Validate XML.
- xmlDoc.Validate((_, e) => throw new XmlException("XML data does not conform to the schema", e.Exception));
- return xmlDoc;
- }
-
#endregion
}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
deleted file mode 100644
index 5915c101d..000000000
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateLogoSettings.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using Grand.Business.Core.Interfaces.Common.Configuration;
-using Grand.Business.Core.Interfaces.Storage;
-using Grand.Data;
-using Grand.Domain.Configuration;
-using Grand.Domain.Stores;
-using Grand.Infrastructure.Migrations;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.StaticFiles;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System.Text.Json;
-
-namespace Grand.Business.System.Services.Migrations._1._1;
-
-public class MigrationUpdateLogoSettings : IMigration
-{
- public int Priority => 0;
- public DbVersion Version => new(1, 1);
- public Guid Identity => new("82A5E26A-7861-4C72-9D5E-AF95477CE1F7");
- public string Name => "Update logo settings - StoreInformationSettings";
-
- /// <summary>
- /// Upgrade process
- /// </summary>
- /// <param name="database"></param>
- /// <param name="serviceProvider"></param>
- /// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
- {
- var repository = serviceProvider.GetRequiredService<IRepository<Setting>>();
- var storeSettings = repository.Table.Where(x => x.Name == "storeinformationsettings");
- var settingService = serviceProvider.GetRequiredService<ISettingService>();
- var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateLogoSettings>>();
- var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
-
- //update logo settings
- try
- {
- foreach (var storeSetting in storeSettings)
- {
- var metadata = storeSetting.Metadata;
- var settingsLogo = JsonSerializer.Deserialize<SettingsLogo>(metadata);
- if (settingsLogo != null && !string.IsNullOrEmpty(settingsLogo.LogoPicture))
- {
- var pictureService = serviceProvider.GetRequiredService<IPictureService>();
- new FileExtensionContentTypeProvider().TryGetContentType(settingsLogo.LogoPicture,
- out var mimeType);
-
- var path = Path.Combine(hostingEnvironment.WebRootPath, settingsLogo.LogoPicture);
-
- var pictureId = pictureService.InsertPicture(File.ReadAllBytes(path), mimeType, "").GetAwaiter()
- .GetResult();
- var storeInformationSettings =
- settingService.LoadSetting<StoreInformationSettings>(storeSetting.StoreId);
- storeInformationSettings.LogoPictureId = pictureId?.Id;
- settingService.SaveSetting(storeInformationSettings, storeSetting.StoreId).GetAwaiter().GetResult();
- }
- }
- }
- catch (Exception ex)
- {
- logService.LogError(ex, "UpgradeProcess - MigrationUpdateSettings");
- }
-
- return true;
- }
-
- private class SettingsLogo
- {
- public string LogoPicture { get; set; }
- }
-}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
index 4cb44a0a3..ee4fa5f5e 100644
--- a/src/Business/Grand.Business.System/Startup/StartupApplication.cs
+++ b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
@@ -5,11 +5,9 @@ using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Business.System.Services.Admin;
using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Business.System.Services.MachineNameProvider;
-using Grand.Business.System.Services.Migrations;
using Grand.Business.System.Services.Reports;
using Grand.Infrastructure;
using Grand.Infrastructure.Configuration;
-using Grand.Infrastructure.Migrations;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
@@ -66,7 +64,6 @@ public class StartupApplication : IStartupApplication
private void RegisterAdmin(IServiceCollection serviceCollection)
{
- serviceCollection.AddScoped<IAdminSiteMapService, AdminSiteMapService>();
- serviceCollection.AddScoped<IMigrationProcess, MigrationProcess>();
+ serviceCollection.AddScoped<IAdminSiteMapService, AdminSiteMapService>();
}
}
\ No newline at end of file
diff --git a/src/Core/Grand.Data/IDatabaseContext.cs b/src/Core/Grand.Data/IDatabaseContext.cs
index 69484547a..9d64ffadf 100644
--- a/src/Core/Grand.Data/IDatabaseContext.cs
+++ b/src/Core/Grand.Data/IDatabaseContext.cs
@@ -3,10 +3,7 @@
namespace Grand.Data;
public interface IDatabaseContext
-{
- bool InstallProcessCreateTable { get; }
- bool InstallProcessCreateIndex { get; }
- void SetConnection(string connectionString);
+{
Task<bool> DatabaseExist();
Task CreateTable(string name, string collation);
Task DeleteTable(string name);
diff --git a/src/Core/Grand.Data/LiteDb/LiteDBContext.cs b/src/Core/Grand.Data/LiteDb/LiteDBContext.cs
index 1e0547330..6e70d82f0 100644
--- a/src/Core/Grand.Data/LiteDb/LiteDBContext.cs
+++ b/src/Core/Grand.Data/LiteDb/LiteDBContext.cs
@@ -12,17 +12,7 @@ public class LiteDBContext : IDatabaseContext
{
_database = database;
}
-
- 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;
-
+
public async Task<bool> DatabaseExist()
{
return await Task.FromResult(_database.CollectionExists(nameof(GrandNodeVersion)));
diff --git a/src/Core/Grand.Data/Mongo/MongoDBContext.cs b/src/Core/Grand.Data/Mongo/MongoDBContext.cs
index 4532a9b65..8a1b62b4d 100644
--- a/src/Core/Grand.Data/Mongo/MongoDBContext.cs
+++ b/src/Core/Grand.Data/Mongo/MongoDBContext.cs
@@ -6,45 +6,17 @@ namespace Grand.Data.Mongo;
public class MongoDBContext : IDatabaseContext
{
- private string _connectionString;
protected IMongoDatabase _database;
- public MongoDBContext()
- {
- var connection = DataSettingsManager.Instance.LoadSettings();
- if (!string.IsNullOrEmpty(connection.ConnectionString))
- PrepareMongoDatabase(connection.ConnectionString);
- }
-
-
public MongoDBContext(IMongoDatabase mongodatabase)
{
_database = mongodatabase;
}
-
- public void SetConnection(string connectionString)
- {
- if (string.IsNullOrEmpty(connectionString))
- throw new ArgumentNullException(nameof(connectionString));
-
- PrepareMongoDatabase(connectionString);
- }
-
- public bool InstallProcessCreateTable => true;
- public bool InstallProcessCreateIndex => true;
-
+
public async Task<bool> DatabaseExist()
{
- if (string.IsNullOrEmpty(_connectionString))
- throw new ArgumentNullException(nameof(_connectionString));
-
- var client = new MongoClient(_connectionString);
- var databaseName = new MongoUrl(_connectionString).DatabaseName;
- var database = client.GetDatabase(databaseName);
- await database.RunCommandAsync((Command<BsonDocument>)"{ping:1}");
-
var filter = new BsonDocument("name", "GrandNodeVersion");
- var found = database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter }).Result;
+ var found = await _database.ListCollectionsAsync(new ListCollectionsOptions { Filter = filter });
return await found.AnyAsync();
}
@@ -110,27 +82,4 @@ public class MongoDBContext : IDatabaseContext
}
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.Instance.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 file
diff --git a/src/Core/Grand.Domain/Common/GrandNodeVersion.cs b/src/Core/Grand.Domain/Common/GrandNodeVersion.cs
index 3dff524ad..3f1ce4337 100644
--- a/src/Core/Grand.Domain/Common/GrandNodeVersion.cs
+++ b/src/Core/Grand.Domain/Common/GrandNodeVersion.cs
@@ -2,5 +2,6 @@
public class GrandNodeVersion : BaseEntity
{
+ public string InstalledVersion { get; set; }
public string DataBaseVersion { get; set; }
}
\ No newline at end of file
diff --git a/src/Core/Grand.Domain/Configuration/SettingExtensions.cs b/src/Core/Grand.Domain/Configuration/SettingExtensions.cs
new file mode 100644
index 000000000..6ac6dde3d
--- /dev/null
+++ b/src/Core/Grand.Domain/Configuration/SettingExtensions.cs
@@ -0,0 +1,16 @@
+using System.Text.Json;
+
+namespace Grand.Domain.Configuration;
+
+public static class SettingExtensions
+{
+ public static Setting CreateSetting<T>(T settings, string storeId = "") where T : ISettings, new()
+ {
+ var setting = new Setting {
+ Name = typeof(T).Name.ToLowerInvariant(),
+ Metadata = JsonSerializer.Serialize(settings),
+ StoreId = storeId
+ };
+ return setting;
+ }
+}
diff --git a/src/Core/Grand.Domain/MigrationDb.cs b/src/Core/Grand.Domain/MigrationDb.cs
index 0f3c4886d..d83cfdda6 100644
--- a/src/Core/Grand.Domain/MigrationDb.cs
+++ b/src/Core/Grand.Domain/MigrationDb.cs
@@ -16,9 +16,4 @@ public class MigrationDb : BaseEntity
/// Db Version
/// </summary>
public string Version { get; set; }
-
- /// <summary>
- /// Gets or sets the migration creation from installation
- /// </summary>
- public bool InstallApp { get; set; }
}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
index 2d570887c..7e09449bb 100644
--- a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
@@ -10,11 +10,6 @@ public class AppConfig
/// </summary>
public bool DisableHostedService { get; set; }
- /// <summary>
- /// A value indicating whether to ignore the migration process
- /// </summary>
- public bool SkipMigrationProcess { get; set; }
-
/// <summary>
/// A value indicating whether SEO friendly URLs with multiple languages are enabled
/// </summary>
diff --git a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs b/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
index 238133288..7180c2ef7 100644
--- a/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/IMigration.cs
@@ -15,5 +15,5 @@ public interface IMigration : IBaseMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider);
+ bool UpgradeProcess(IServiceProvider serviceProvider);
}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Migrations/IMigrationProcess.cs b/src/Core/Grand.Infrastructure/Migrations/IMigrationProcess.cs
index afdbcaa75..b95ee6d38 100644
--- a/src/Core/Grand.Infrastructure/Migrations/IMigrationProcess.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/IMigrationProcess.cs
@@ -3,6 +3,5 @@
public interface IMigrationProcess
{
void RunMigrationProcess();
- void InstallApplication();
MigrationResult RunProcess(IMigration migration);
}
\ No newline at end of file
diff --git a/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs b/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
index 0e481ac21..5c4c9c59f 100644
--- a/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
+++ b/src/Core/Grand.Infrastructure/Migrations/MigrationManager.cs
@@ -29,13 +29,10 @@ public class MigrationManager
/// Get current migrations
/// </summary>
/// <returns></returns>
- public IEnumerable<IMigration> GetCurrentMigrations()
+ public IEnumerable<IMigration> GetCurrentMigrations(DbVersion installedVersion)
{
- var currentDbVersion =
- new DbVersion(int.Parse(GrandVersion.MajorVersion), int.Parse(GrandVersion.MinorVersion));
-
return GetAllMigrations()
- .Where(x => currentDbVersion.CompareTo(x.Version) >= 0)
+ .Where(x => x.Version.CompareTo(installedVersion) > 0)
.OrderBy(mg => mg.Version.ToString())
.ThenBy(mg => mg.Priority)
.ToList();
diff --git a/src/Core/Grand.SharedKernel/Extensions/XmlExtensions.cs b/src/Core/Grand.SharedKernel/Extensions/XmlExtensions.cs
new file mode 100644
index 000000000..874071ca4
--- /dev/null
+++ b/src/Core/Grand.SharedKernel/Extensions/XmlExtensions.cs
@@ -0,0 +1,52 @@
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Grand.SharedKernel.Extensions;
+
+public static class XmlExtensions
+{
+ public static XmlDocument LanguageXmlDocument(string xml)
+ {
+ var schemas = new XmlSchemaSet();
+ schemas.Add("", XmlReader.Create(new StringReader(LanguageSchema.SchemaXsd)));
+
+ var xmlDoc = new XmlDocument { Schemas = schemas, XmlResolver = null };
+ xmlDoc.LoadXml(xml);
+
+ // Validate XML.
+ xmlDoc.Validate((_, e) => throw new XmlException("XML data does not conform to the schema", e.Exception));
+ return xmlDoc;
+ }
+
+ public static List<(string Name, string Value, string Area)> ParseTranslationResources(XmlDocument xmlDoc)
+ {
+ var resources = new List<(string Name, string Value, string Area)>();
+ var nodes = xmlDoc.SelectNodes("//Language/Resource");
+
+ if (nodes != null)
+ {
+ foreach (XmlNode node in nodes)
+ {
+ var name = node.Attributes?["Name"]?.InnerText.Trim();
+ var area = node.Attributes?["Area"]?.InnerText.Trim();
+ var value = "";
+ var valueNode = node.SelectSingleNode("Value");
+ if (valueNode != null)
+ value = valueNode.InnerText;
+
+ if (string.IsNullOrEmpty(name))
+ continue;
+
+ var resourceTuple = (
+ Name: name.ToLowerInvariant(),
+ Value: value,
+ Area: area
+ );
+
+ resources.Add(resourceTuple);
+ }
+ }
+ return resources;
+ }
+
+}
diff --git a/src/Modules/Grand.Module.Installer/Controllers/InstallController.cs b/src/Modules/Grand.Module.Installer/Controllers/InstallController.cs
index 16658e7d2..966d86e82 100644
--- a/src/Modules/Grand.Module.Installer/Controllers/InstallController.cs
+++ b/src/Modules/Grand.Module.Installer/Controllers/InstallController.cs
@@ -6,7 +6,6 @@ using Grand.Infrastructure.Plugins;
using Grand.Module.Installer.Interfaces;
using Grand.Module.Installer.Models;
using Grand.SharedKernel.Extensions;
-using MediatR;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
@@ -19,33 +18,14 @@ namespace Grand.Module.Installer.Controllers;
public class InstallController : Controller
{
- #region Ctor
-
- public InstallController(
- ICacheBase cacheBase,
- IHostApplicationLifetime applicationLifetime,
- IServiceProvider serviceProvider,
- IMediator mediator,
- DatabaseConfig litedbConfig,
- ILogger<InstallController> logger)
- {
- _cacheBase = cacheBase;
- _applicationLifetime = applicationLifetime;
- _serviceProvider = serviceProvider;
- _mediator = mediator;
- _dbConfig = litedbConfig;
- _logger = logger;
- }
-
- #endregion
#region Fields
private readonly ICacheBase _cacheBase;
- private readonly IServiceProvider _serviceProvider;
private readonly IHostApplicationLifetime _applicationLifetime;
- private readonly IMediator _mediator;
private readonly DatabaseConfig _dbConfig;
+ private readonly IDatabaseFactoryContext _databaseFactory;
+ private readonly IInstallationLocalizedService _installationLocalizedService;
private readonly ILogger<InstallController> _logger;
/// <summary>
@@ -55,6 +35,26 @@ public class InstallController : Controller
#endregion
+ #region Ctor
+
+ public InstallController(
+ ICacheBase cacheBase,
+ IHostApplicationLifetime applicationLifetime,
+ IDatabaseFactoryContext databaseFactory,
+ IInstallationLocalizedService installationLocalizedService,
+ DatabaseConfig dbConfig,
+ ILogger<InstallController> logger)
+ {
+ _cacheBase = cacheBase;
+ _applicationLifetime = applicationLifetime;
+ _installationLocalizedService = installationLocalizedService;
+ _dbConfig = dbConfig;
+ _databaseFactory = databaseFactory;
+ _logger = logger;
+ }
+
+ #endregion
+
#region Methods
protected virtual string? GetLanguage()
@@ -70,8 +70,6 @@ public class InstallController : Controller
private InstallModel PrepareModel(InstallModel? model)
{
- var locService = _serviceProvider.GetRequiredService<IInstallationLocalizedService>();
-
model ??= new InstallModel {
AdminEmail = "[email protected]",
InstallSampleData = false,
@@ -87,10 +85,10 @@ public class InstallController : Controller
model.SelectedLanguage = GetLanguage();
- foreach (var lang in locService.GetAvailableLanguages())
+ foreach (var lang in _installationLocalizedService.GetAvailableLanguages())
{
var selected = false;
- if (locService.GetCurrentLanguage(model.SelectedLanguage).Code == lang.Code)
+ if (_installationLocalizedService.GetCurrentLanguage(model.SelectedLanguage).Code == lang.Code)
{
selected = true;
model.SelectedLanguage = lang.Code;
@@ -104,11 +102,11 @@ public class InstallController : Controller
}
//prepare collation list
- foreach (var col in locService.GetAvailableCollations())
+ foreach (var col in _installationLocalizedService.GetAvailableCollations())
model.AvailableCollation.Add(new SelectListItem {
Value = col.Value,
Text = col.Name,
- Selected = locService.GetCurrentLanguage().Code == col.Value
+ Selected = _installationLocalizedService.GetCurrentLanguage().Code == col.Value
});
return model;
@@ -187,8 +185,7 @@ public class InstallController : Controller
{
if (model.DataProvider != DbProvider.LiteDB)
{
- var mdb = _serviceProvider.GetRequiredService<IDatabaseContext>();
- mdb.SetConnection(connectionString);
+ var mdb = _databaseFactory.GetDatabaseContext(connectionString, DbProvider.MongoDB);
if (await mdb.DatabaseExist())
ModelState.AddModelError("",
locService.GetResource(model.SelectedLanguage, "AlreadyInstalled"));
@@ -212,7 +209,7 @@ public class InstallController : Controller
if (installed)
return View(new InstallModel { Installed = true, AdminEmail = "", AdminPassword = "", ConfirmPassword = "" });
- var locService = _serviceProvider.GetRequiredService<IInstallationLocalizedService>();
+ var locService = HttpContext.RequestServices.GetRequiredService<IInstallationLocalizedService>();
if (model.DatabaseConnectionString != null)
model.DatabaseConnectionString = model.DatabaseConnectionString.Trim();
@@ -233,7 +230,7 @@ public class InstallController : Controller
await DataSettingsManager.Instance.SaveSettings(settings);
DataSettingsManager.Instance.LoadSettings(true);
- var installationService = _serviceProvider.GetRequiredService<IInstallationService>();
+ var installationService = HttpContext.RequestServices.GetRequiredService<IInstallationService>();
await installationService.InstallData(
HttpContext.Request.Scheme, HttpContext.Request.Host,
model.AdminEmail, model.AdminPassword, model.Collation,
@@ -252,7 +249,7 @@ public class InstallController : Controller
foreach (var pluginInfo in pluginsInfo)
try
{
- var plugin = pluginInfo.Instance<IPlugin>(_serviceProvider);
+ var plugin = pluginInfo.Instance<IPlugin>(HttpContext.RequestServices.CreateScope().ServiceProvider);
await plugin.Install();
_logger.LogInformation($"Plugin {plugin.PluginInfo.FriendlyName} has been installed");
}
@@ -262,12 +259,6 @@ public class InstallController : Controller
ex.Message + " " + ex.InnerException?.Message);
}
- //install migration process - install only header
- var migrationProcess = _serviceProvider.GetRequiredService<IMigrationProcess>();
- migrationProcess.InstallApplication();
-
- _logger.LogInformation("Migration process has been executed");
-
//restart application
await _cacheBase.SetAsync("Installed", async () => await Task.FromResult(true));
return View(new InstallModel { Installed = true, AdminEmail = "", AdminPassword = "", ConfirmPassword = "" });
diff --git a/src/Modules/Grand.Module.Installer/Extensions/SettingExtensions.cs b/src/Modules/Grand.Module.Installer/Extensions/SettingExtensions.cs
index 16fc355b9..958a350ca 100644
--- a/src/Modules/Grand.Module.Installer/Extensions/SettingExtensions.cs
+++ b/src/Modules/Grand.Module.Installer/Extensions/SettingExtensions.cs
@@ -1,6 +1,5 @@
using Grand.Data;
using Grand.Domain.Configuration;
-using System.Text.Json;
namespace Grand.Module.Installer.Extensions;
@@ -8,12 +7,7 @@ public static class SettingExtensions
{
public static async Task SaveSetting<T>(this IRepository<Setting> repository, T settings, string storeId = "") where T : ISettings, new()
{
- var setting = new Setting {
- Name = typeof(T).Name.ToLowerInvariant(),
- Metadata = JsonSerializer.Serialize(settings),
- StoreId = storeId
- };
+ var setting = Domain.Configuration.SettingExtensions.CreateSetting<T>(settings, storeId);
await repository.InsertAsync(setting);
-
}
}
diff --git a/src/Modules/Grand.Module.Installer/Interfaces/IDatabaseFactoryContext.cs b/src/Modules/Grand.Module.Installer/Interfaces/IDatabaseFactoryContext.cs
new file mode 100644
index 000000000..d0417b41c
--- /dev/null
+++ b/src/Modules/Grand.Module.Installer/Interfaces/IDatabaseFactoryContext.cs
@@ -0,0 +1,7 @@
+using Grand.Data;
+
+namespace Grand.Module.Installer.Interfaces;
+public interface IDatabaseFactoryContext
+{
+ IDatabaseContext GetDatabaseContext(string? connectionString = null, DbProvider? dbProvider = null);
+}
diff --git a/src/Modules/Grand.Module.Installer/Services/DatabaseFactoryContext.cs b/src/Modules/Grand.Module.Installer/Services/DatabaseFactoryContext.cs
new file mode 100644
index 000000000..991f06e43
--- /dev/null
+++ b/src/Modules/Grand.Module.Installer/Services/DatabaseFactoryContext.cs
@@ -0,0 +1,31 @@
+using Grand.Data;
+using Grand.Data.LiteDb;
+using Grand.Data.Mongo;
+using Grand.Module.Installer.Interfaces;
+using MongoDB.Driver;
+
+namespace Grand.Module.Installer.Services;
+
+public class DatabaseFactoryContext : IDatabaseFactoryContext
+{
+ public IDatabaseContext GetDatabaseContext(string? connectionString = null, DbProvider? dbProvider = null)
+ {
+ var dataSettings = string.IsNullOrEmpty(connectionString) ? DataSettingsManager.Instance.LoadSettings(true) :
+ new DataSettings() { ConnectionString = connectionString, DbProvider = dbProvider!.Value };
+ if (dataSettings != null && !string.IsNullOrEmpty(dataSettings.ConnectionString))
+ {
+ if (dataSettings.DbProvider != DbProvider.LiteDB)
+ {
+ var databaseName = new MongoUrl(dataSettings.ConnectionString).DatabaseName;
+ var database = new MongoClient(dataSettings.ConnectionString).GetDatabase(databaseName);
+ return new MongoDBContext(database);
+ }
+ else
+ {
+ var dbContext = new LiteDB.LiteDatabase(dataSettings.ConnectionString);
+ return new LiteDBContext(dbContext);
+ }
+ }
+ throw new Exception("No database provider was found");
+ }
+}
diff --git a/src/Modules/Grand.Module.Installer/Services/InstallDataLocaleResources.cs b/src/Modules/Grand.Module.Installer/Services/InstallDataLocaleResources.cs
index af5944cf6..674b2dcf2 100644
--- a/src/Modules/Grand.Module.Installer/Services/InstallDataLocaleResources.cs
+++ b/src/Modules/Grand.Module.Installer/Services/InstallDataLocaleResources.cs
@@ -1,7 +1,5 @@
using Grand.Domain.Localization;
using Grand.SharedKernel.Extensions;
-using System.Xml;
-using System.Xml.Schema;
namespace Grand.Module.Installer.Services;
@@ -16,46 +14,21 @@ public partial class InstallationService
var filePath = Path.Combine(_hostingEnvironment.ContentRootPath, "App_Data/Resources/DefaultLanguage.xml");
var localesXml = File.ReadAllText(filePath);
- var xmlDoc = LanguageXmlDocument(localesXml);
+ var xmlDoc = XmlExtensions.LanguageXmlDocument(localesXml);
- var translateResources = new List<TranslationResource>();
+ var translateResources = XmlExtensions.ParseTranslationResources(xmlDoc);
- var nodes = xmlDoc.SelectNodes("//Language/Resource");
- if (nodes != null)
- foreach (XmlNode node in nodes)
- {
- var name = node.Attributes?["Name"]?.InnerText.Trim();
- var area = node.Attributes?["Area"]?.InnerText.Trim();
- var value = "";
- var valueNode = node.SelectSingleNode("Value");
- if (valueNode != null)
- value = valueNode.InnerText;
+ foreach (var item in translateResources)
+ {
+ _ = Enum.TryParse(item.Area, out TranslationResourceArea areaEnum);
- if (string.IsNullOrEmpty(name))
- continue;
-
- _ = Enum.TryParse(area, out TranslationResourceArea areaEnum);
-
- await _lsrRepository.InsertAsync(new TranslationResource {
- LanguageId = language.Id,
- Name = name.ToLowerInvariant(),
- Value = value,
- Area = areaEnum,
- CreatedBy = "System"
- });
- }
-
- }
- private static XmlDocument LanguageXmlDocument(string xml)
- {
- var schemas = new XmlSchemaSet();
- schemas.Add("", XmlReader.Create(new StringReader(LanguageSchema.SchemaXsd)));
-
- var xmlDoc = new XmlDocument { Schemas = schemas, XmlResolver = null };
- xmlDoc.LoadXml(xml);
-
- // Validate XML.
- xmlDoc.Validate((_, e) => throw new XmlException("XML data does not conform to the schema", e.Exception));
- return xmlDoc;
+ await _lsrRepository.InsertAsync(new TranslationResource {
+ LanguageId = language.Id,
+ Name = item.Name.ToLowerInvariant(),
+ Value = item.Value,
+ Area = areaEnum,
+ CreatedBy = "System"
+ });
+ }
}
}
\ No newline at end of file
diff --git a/src/Modules/Grand.Module.Installer/Services/InstallationService.cs b/src/Modules/Grand.Module.Installer/Services/InstallationService.cs
index ed6c1e61c..e35a98db4 100644
--- a/src/Modules/Grand.Module.Installer/Services/InstallationService.cs
+++ b/src/Modules/Grand.Module.Installer/Services/InstallationService.cs
@@ -418,6 +418,7 @@ public partial class InstallationService : IInstallationService
protected virtual async Task InstallVersion()
{
var version = new GrandNodeVersion {
+ InstalledVersion = GrandVersion.SupportedDBVersion,
DataBaseVersion = GrandVersion.SupportedDBVersion
};
await _versionRepository.InsertAsync(version);
@@ -1006,10 +1007,8 @@ public partial class InstallationService : IInstallationService
try
{
var dataSettings = DataSettingsManager.Instance.LoadSettings(true);
- var dbContext = _serviceProvider.GetRequiredService<IDatabaseContext>();
- dbContext.SetConnection(dataSettings.ConnectionString);
-
- if (dbContext.InstallProcessCreateTable)
+ var dbContext = _serviceProvider.GetRequiredService<IDatabaseFactoryContext>().GetDatabaseContext();
+ if (dataSettings.DbProvider != DbProvider.LiteDB)
{
var typeSearcher = _serviceProvider.GetRequiredService<ITypeSearcher>();
var q = typeSearcher.GetAssemblies().FirstOrDefault(x => x.GetName().Name == "Grand.Domain");
@@ -1019,7 +1018,7 @@ public partial class InstallationService : IInstallationService
await dbContext.CreateTable(item.Name, local);
}
- if (dbContext.InstallProcessCreateIndex)
+ if (dataSettings.DbProvider != DbProvider.LiteDB)
await CreateIndexes(dbContext, dataSettings);
}
catch (Exception ex)
diff --git a/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs b/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs
index c86276400..07608fb91 100644
--- a/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs
+++ b/src/Modules/Grand.Module.Installer/Startup/StartupApplication.cs
@@ -31,6 +31,7 @@ public class StartupApplication : IStartupApplication
//installation service
serviceCollection.AddScoped<IInstallationLocalizedService, InstallationLocalizedService>();
serviceCollection.AddScoped<IInstallationService, InstallationService>();
+ serviceCollection.AddTransient<IDatabaseFactoryContext, DatabaseFactoryContext>();
}
}
}
\ No newline at end of file
diff --git a/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj b/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj
new file mode 100644
index 000000000..521571d15
--- /dev/null
+++ b/src/Modules/Grand.Module.Migration/Grand.Module.Migration.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <PropertyGroup>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ </PropertyGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>False</Private>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>False</Private>
+ </ProjectReference>
+ </ItemGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+
+
+</Project>
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationSystemPermission.cs
similarity index 75%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationSystemPermission.cs
index 21d216f91..83b8545dd 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationSystemPermission.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationSystemPermission.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Core.Interfaces.Common.Directory;
-using Grand.Data;
+using Grand.Data;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationSystemPermission : IMigration
{
@@ -21,12 +20,12 @@ public class MigrationSystemPermission : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<Permission>>();
- var groupService = serviceProvider.GetRequiredService<IGroupService>();
+ var customerGroupRepository = serviceProvider.GetRequiredService<IRepository<CustomerGroup>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationSystemPermission>>();
-
+ var administrator = customerGroupRepository.Table.FirstOrDefault(x => x.SystemName == SystemCustomerGroupNames.Administrators);
try
{
var permission = repository.Table.FirstOrDefault(x => x.SystemName == PermissionSystemName.System);
@@ -38,8 +37,7 @@ public class MigrationSystemPermission : IMigration
Area = "Admin area",
Category = "System"
};
- permission.CustomerGroups.Add(groupService
- .GetCustomerGroupBySystemName(SystemCustomerGroupNames.Administrators).GetAwaiter().GetResult().Id);
+ permission.CustomerGroups.Add(administrator!.Id);
repository.Insert(permission);
}
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
similarity index 96%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
index 82585c85e..b92d02eac 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateAdminSiteMap.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationUpdateAdminSiteMap : IMigration
{
@@ -20,7 +20,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<AdminSiteMap>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateAdminSiteMap>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateMediaSettings.cs
similarity index 74%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateMediaSettings.cs
index 627834fbe..1ed5b4585 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateMediaSettings.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateMediaSettings.cs
@@ -1,5 +1,4 @@
-using Grand.Business.Core.Interfaces.Common.Configuration;
-using Grand.Data;
+using Grand.Data;
using Grand.Domain.Configuration;
using Grand.Domain.Media;
using Grand.Infrastructure.Migrations;
@@ -7,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using System.Text.Json;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationUpdateMediaSettings : IMigration
{
@@ -22,11 +21,10 @@ public class MigrationUpdateMediaSettings : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<Setting>>();
- var mediaSettings = repository.Table.FirstOrDefault(x => x.Name == "mediasettings");
- var settingService = serviceProvider.GetRequiredService<ISettingService>();
+ var mediaSettings = repository.Table.FirstOrDefault(x => x.Name == "mediasettings");
var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateMediaSettings>>();
try
@@ -36,8 +34,10 @@ public class MigrationUpdateMediaSettings : IMigration
var metadata = mediaSettings.Metadata;
var settingsLogo = JsonSerializer.Deserialize<SettingsMedia>(metadata);
if (settingsLogo != null)
- settingService.SaveSetting(new StorageSettings { PictureStoreInDb = settingsLogo.StoreInDb })
- .GetAwaiter().GetResult();
+ {
+ var setting = SettingExtensions.CreateSetting(new StorageSettings { PictureStoreInDb = settingsLogo.StoreInDb }, "");
+ repository.Insert(setting);
+ }
}
}
catch (Exception ex)
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateResourceString.cs
similarity index 80%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateResourceString.cs
index ccbc50b2b..bbd015497 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateResourceString.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Infrastructure.Migrations;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationUpdateResourceString : IMigration
{
@@ -16,7 +16,7 @@ public class MigrationUpdateResourceString : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_110.xml");
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateStore.cs
similarity index 91%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateStore.cs
index 114a72600..6c9e5cddb 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateStore.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpdateStore.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationUpdateStore : IMigration
{
@@ -19,7 +19,7 @@ public class MigrationUpdateStore : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<Store>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateStore>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
similarity index 72%
rename from src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
rename to src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
index 96d3c8991..64881c80b 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/1.1/MigrationUpgradeDbVersion_11.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-namespace Grand.Business.System.Services.Migrations._1._1;
+namespace Grand.Module.Migration.Migrations._1._1;
public class MigrationUpgradeDbVersion_11 : IMigration
{
@@ -22,12 +22,12 @@ public class MigrationUpgradeDbVersion_11 : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
- var dbversion = repository.Table.ToList().FirstOrDefault();
- dbversion.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
+ var dbversion = repository.Table.FirstOrDefault();
+ dbversion!.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
repository.Update(dbversion);
return true;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs b/src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpdateResourceString.cs
similarity index 80%
rename from src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpdateResourceString.cs
index 45fc341c9..f3e0393d1 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpdateResourceString.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Infrastructure.Migrations;
-namespace Grand.Business.System.Services.Migrations._2._0;
+namespace Grand.Module.Migration.Migrations._2._0;
public class MigrationUpdateResourceString : IMigration
{
@@ -16,7 +16,7 @@ public class MigrationUpdateResourceString : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_200.xml");
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs b/src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
similarity index 72%
rename from src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
index 8974fbc13..90cca5034 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.0/MigrationUpgradeDbVersion_20.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-namespace Grand.Business.System.Services.Migrations._2._0;
+namespace Grand.Module.Migration.Migrations._2._0;
public class MigrationUpgradeDbVersion_20 : IMigration
{
@@ -22,12 +22,12 @@ public class MigrationUpgradeDbVersion_20 : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
- var dbversion = repository.Table.ToList().FirstOrDefault();
- dbversion.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
+ var dbversion = repository.Table.FirstOrDefault();
+ dbversion!.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
repository.Update(dbversion);
return true;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationProductRating.cs
similarity index 90%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationProductRating.cs
index c7112e9a1..375e1d1df 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationProductRating.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationProductRating.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationProductRating : IMigration
{
@@ -19,7 +19,7 @@ public class MigrationProductRating : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var productRepository = serviceProvider.GetRequiredService<IRepository<Product>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationProductRating>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationScheduleTasks.cs
similarity index 91%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationScheduleTasks.cs
index 0e9bbcbef..0b262f8d2 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationScheduleTasks.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationScheduleTasks.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationScheduleTasks : IMigration
{
@@ -19,7 +19,7 @@ public class MigrationScheduleTasks : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<ScheduleTask>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationScheduleTasks>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationSystemPermission.cs
similarity index 90%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationSystemPermission.cs
index 03cb483d0..ec0fb7a59 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationSystemPermission.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationSystemPermission.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationSystemPermission : IMigration
{
@@ -19,7 +19,7 @@ public class MigrationSystemPermission : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<Permission>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationSystemPermission>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateAdminSiteMap.cs
similarity index 93%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateAdminSiteMap.cs
index 323d17008..a027b2e53 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateAdminSiteMap.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateAdminSiteMap.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationUpdateAdminSiteMap : IMigration
{
@@ -20,7 +20,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<AdminSiteMap>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateAdminSiteMap>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateResourceString.cs
similarity index 80%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateResourceString.cs
index 966b55f5a..451774fb0 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpdateResourceString.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpdateResourceString.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Infrastructure.Migrations;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationUpdateResourceString : IMigration
{
@@ -16,7 +16,7 @@ public class MigrationUpdateResourceString : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_210.xml");
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpgradeDbVersion_21.cs
similarity index 72%
rename from src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpgradeDbVersion_21.cs
index 25928e75f..f17ef9e4a 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.1/MigrationUpgradeDbVersion_21.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.1/MigrationUpgradeDbVersion_21.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-namespace Grand.Business.System.Services.Migrations._2._1;
+namespace Grand.Module.Migration.Migrations._2._1;
public class MigrationUpgradeDbVersion_21 : IMigration
{
@@ -22,12 +22,12 @@ public class MigrationUpgradeDbVersion_21 : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
- var dbversion = repository.Table.ToList().FirstOrDefault();
- dbversion.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
+ var dbversion = repository.Table.FirstOrDefault();
+ dbversion!.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
repository.Update(dbversion);
return true;
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationAddLandingPage.cs
similarity index 90%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationAddLandingPage.cs
index 532198a59..a04b4bcbd 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationAddLandingPage.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationAddLandingPage.cs
@@ -3,7 +3,7 @@ using Grand.Domain.Pages;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationAddLandingPage : IMigration
{
@@ -12,7 +12,7 @@ public class MigrationAddLandingPage : IMigration
public Guid Identity => new("0833f104-54d5-41d0-83da-375d2520f709");
public string Name => "Add new landing page - VendorPortalInfo";
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var pageLayoutRepository = serviceProvider.GetRequiredService<IRepository<PageLayout>>();
var defaultPageLayout =
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationScheduleTasks.cs
similarity index 88%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationScheduleTasks.cs
index f0750f66c..3293e7aa6 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationScheduleTasks.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationScheduleTasks.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationScheduleTasks : IMigration
{
@@ -19,7 +19,7 @@ public class MigrationScheduleTasks : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<ScheduleTask>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationScheduleTasks>>();
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationSystemPermission.cs
similarity index 77%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationSystemPermission.cs
index 1c967b3f0..631d3bfd9 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationSystemPermission.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationSystemPermission.cs
@@ -1,12 +1,11 @@
-using Grand.Business.Core.Interfaces.Common.Directory;
-using Grand.Data;
+using Grand.Data;
using Grand.Domain.Customers;
using Grand.Domain.Permissions;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationSystemPermission : IMigration
{
@@ -23,22 +22,22 @@ public class MigrationSystemPermission : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<Permission>>();
- var groupService = serviceProvider.GetRequiredService<IGroupService>();
+ var customerGroupRepository = serviceProvider.GetRequiredService<IRepository<CustomerGroup>>();
+ var vendor = customerGroupRepository.Table.FirstOrDefault(x => x.SystemName == SystemCustomerGroupNames.Vendors);
+
var logService = serviceProvider.GetRequiredService<ILogger<MigrationSystemPermission>>();
try
{
- var customerGroupVendorId = groupService.GetCustomerGroupBySystemName(SystemCustomerGroupNames.Vendors)
- .GetAwaiter().GetResult().Id;
var permissionAccessVendor =
repository.Table.FirstOrDefault(x => x.SystemName == PermissionSystemName.AccessVendorPanel);
if (permissionAccessVendor == null)
{
permissionAccessVendor = StandardPermission.ManageAccessVendorPanel;
- permissionAccessVendor.CustomerGroups.Add(customerGroupVendorId);
+ permissionAccessVendor.CustomerGroups.Add(vendor!.Id);
repository.Insert(permissionAccessVendor);
}
@@ -46,7 +45,7 @@ public class MigrationSystemPermission : IMigration
repository.Table.FirstOrDefault(x => x.SystemName == PermissionSystemName.AccessAdminPanel);
if (permissionAccessAdmin != null)
{
- permissionAccessAdmin.CustomerGroups.Remove(customerGroupVendorId);
+ permissionAccessAdmin.CustomerGroups.Remove(vendor!.Id);
repository.Update(permissionAccessAdmin);
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
similarity index 90%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
index 58f24c950..52bc37c32 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateAdminSiteMap.cs
@@ -5,7 +5,7 @@ using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationUpdateAdminSiteMap : IMigration
{
@@ -20,7 +20,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<AdminSiteMap>>();
var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateAdminSiteMap>>();
@@ -48,7 +48,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
var log = sitemapSystem?.ChildNodes.FirstOrDefault(x => x.SystemName == "Log");
if (log != null)
{
- sitemapSystem.ChildNodes.Remove(log);
+ sitemapSystem!.ChildNodes.Remove(log);
sitemapSystem.PermissionNames.Remove("ManageSystemLog");
repository.Update(sitemapSystem);
}
@@ -57,7 +57,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
var activityLog = sitemapCustomers?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Log");
if (activityLog != null)
{
- sitemapCustomers.ChildNodes.Remove(activityLog);
+ sitemapCustomers!.ChildNodes.Remove(activityLog);
sitemapCustomers.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapCustomers);
}
@@ -66,7 +66,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
var activityStatLog = sitemapReports?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Stats");
if (activityStatLog != null)
{
- sitemapReports.ChildNodes.Remove(activityStatLog);
+ sitemapReports!.ChildNodes.Remove(activityStatLog);
sitemapReports.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapReports);
}
@@ -75,7 +75,7 @@ public class MigrationUpdateAdminSiteMap : IMigration
var activityTypes = sitemapSettings?.ChildNodes.FirstOrDefault(x => x.SystemName == "Activity Types");
if (activityTypes != null)
{
- sitemapSettings.ChildNodes.Remove(activityTypes);
+ sitemapSettings!.ChildNodes.Remove(activityTypes);
sitemapSettings.PermissionNames.Remove("ManageActivityLog");
repository.Update(sitemapSettings);
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateResourceString.cs
similarity index 80%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateResourceString.cs
index dfcde1d6a..9d55240e2 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpdateResourceString.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpdateResourceString.cs
@@ -1,7 +1,7 @@
using Grand.Data;
using Grand.Infrastructure.Migrations;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationUpdateResourceString : IMigration
{
@@ -16,7 +16,7 @@ public class MigrationUpdateResourceString : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_220.xml");
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpgradeDbVersion_22.cs
similarity index 72%
rename from src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs
rename to src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpgradeDbVersion_22.cs
index 9e96d8cf4..03a3c60a5 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/2.2/MigrationUpgradeDbVersion_22.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.2/MigrationUpgradeDbVersion_22.cs
@@ -4,7 +4,7 @@ using Grand.Infrastructure;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.DependencyInjection;
-namespace Grand.Business.System.Services.Migrations._2._2;
+namespace Grand.Module.Migration.Migrations._2._2;
public class MigrationUpgradeDbVersion_22 : IMigration
{
@@ -22,12 +22,12 @@ public class MigrationUpgradeDbVersion_22 : IMigration
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
var repository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
- var dbversion = repository.Table.ToList().FirstOrDefault();
- dbversion.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
+ var dbversion = repository.Table.FirstOrDefault();
+ dbversion!.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
repository.Update(dbversion);
return true;
diff --git a/src/Modules/Grand.Module.Migration/Migrations/2.3/MigrationUpgradeDbVersion_23.cs b/src/Modules/Grand.Module.Migration/Migrations/2.3/MigrationUpgradeDbVersion_23.cs
new file mode 100644
index 000000000..d9ddae27e
--- /dev/null
+++ b/src/Modules/Grand.Module.Migration/Migrations/2.3/MigrationUpgradeDbVersion_23.cs
@@ -0,0 +1,36 @@
+using Grand.Data;
+using Grand.Domain.Common;
+using Grand.Infrastructure;
+using Grand.Infrastructure.Migrations;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Module.Migration.Migrations._2._3;
+
+public class MigrationUpgradeDbVersion_23 : IMigration
+{
+ public int Priority => 0;
+
+ public DbVersion Version => new(2, 3);
+
+ public Guid Identity => new("689E5BFA-7229-41A5-AF48-07CB58C0D608");
+
+ public string Name => "Upgrade version of the database to 2.3";
+
+ /// <summary>
+ /// Upgrade process
+ /// </summary>
+ /// <param name="database"></param>
+ /// <param name="serviceProvider"></param>
+ /// <returns></returns>
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
+ {
+ var repository = serviceProvider.GetRequiredService<IRepository<GrandNodeVersion>>();
+
+ var dbversion = repository.Table.FirstOrDefault();
+ dbversion!.InstalledVersion = $"{GrandVersion.SupportedDBVersion}";
+ dbversion!.DataBaseVersion = $"{GrandVersion.SupportedDBVersion}";
+ repository.Update(dbversion);
+
+ return true;
+ }
+}
\ No newline at end of file
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs b/src/Modules/Grand.Module.Migration/Migrations/MigrationProcess.cs
similarity index 74%
rename from src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
rename to src/Modules/Grand.Module.Migration/Migrations/MigrationProcess.cs
index fbde9ddfb..145c023e4 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationProcess.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/MigrationProcess.cs
@@ -1,9 +1,10 @@
using Grand.Data;
using Grand.Domain;
+using Grand.Domain.Common;
using Grand.Infrastructure.Migrations;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations;
+namespace Grand.Module.Migration.Migrations;
public class MigrationProcess : IMigrationProcess
{
@@ -11,18 +12,21 @@ public class MigrationProcess : IMigrationProcess
private readonly ILogger<MigrationProcess> _logger;
private readonly IRepository<MigrationDb> _repositoryMigration;
+ private readonly IRepository<GrandNodeVersion> _repositoryVersion;
private readonly IServiceProvider _serviceProvider;
public MigrationProcess(
IDatabaseContext databaseContext,
IServiceProvider serviceProvider,
ILogger<MigrationProcess> logger,
- IRepository<MigrationDb> repositoryMigration)
+ IRepository<MigrationDb> repositoryMigration,
+ IRepository<GrandNodeVersion> repositoryVersion)
{
_databaseContext = databaseContext;
_serviceProvider = serviceProvider;
_logger = logger;
_repositoryMigration = repositoryMigration;
+ _repositoryVersion = repositoryVersion;
}
public virtual MigrationResult RunProcess(IMigration migration)
@@ -52,26 +56,19 @@ public class MigrationProcess : IMigrationProcess
public virtual void RunMigrationProcess()
{
var migrationsDb = GetMigrationDb();
+ var version = _repositoryVersion.Table.FirstOrDefault();
+ var majorVersion = string.IsNullOrEmpty(version?.InstalledVersion) ? int.Parse(version?.DataBaseVersion.Split('.')[0]!) : int.Parse(version?.InstalledVersion.Split('.')[0]!);
+ var minorVersion = string.IsNullOrEmpty(version?.InstalledVersion) ? int.Parse(version?.DataBaseVersion.Split('.')[1]!) : int.Parse(version?.InstalledVersion.Split('.')[1]!);
var migrationManager = new MigrationManager();
- foreach (var item in migrationManager.GetCurrentMigrations())
+ foreach (var item in migrationManager.GetCurrentMigrations(new DbVersion(majorVersion, minorVersion)))
if (migrationsDb.FirstOrDefault(x => x.Identity == item.Identity) == null)
RunProcess(item);
}
- public virtual void InstallApplication()
- {
- var migrationManager = new MigrationManager();
- foreach (var item in migrationManager.GetCurrentMigrations())
- SaveMigration(new MigrationResult {
- Migration = item,
- Success = true
- }, true);
- }
-
private MigrationResult RunProcessInternal(IMigration migration)
{
var model = new MigrationResult {
- Success = migration.UpgradeProcess(_databaseContext, _serviceProvider),
+ Success = migration.UpgradeProcess(_serviceProvider),
Migration = migration
};
return model;
@@ -82,8 +79,7 @@ public class MigrationProcess : IMigrationProcess
_repositoryMigration.Insert(new MigrationDb {
Identity = migrationResult.Migration.Identity,
Name = migrationResult.Migration.Name,
- Version = migrationResult.Migration.Version.ToString(),
- InstallApp = install
+ Version = migrationResult.Migration.Version.ToString()
});
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs b/src/Modules/Grand.Module.Migration/Migrations/MigrationUpdateResource.cs
similarity index 54%
rename from src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
rename to src/Modules/Grand.Module.Migration/Migrations/MigrationUpdateResource.cs
index affc556ae..33356de3b 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
+++ b/src/Modules/Grand.Module.Migration/Migrations/MigrationUpdateResource.cs
@@ -1,11 +1,11 @@
-using Grand.Business.Core.Interfaces.Common.Localization;
-using Grand.Data;
+using Grand.Data;
using Grand.Domain.Localization;
+using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.Migrations;
+namespace Grand.Module.Migration.Migrations;
public static class MigrationUpdateResource
{
@@ -13,18 +13,33 @@ public static class MigrationUpdateResource
string filename)
{
var langRepository = serviceProvider.GetRequiredService<IRepository<Language>>();
+ var lsrRepository = serviceProvider.GetRequiredService<IRepository<TranslationResource>>();
var logService = serviceProvider.GetRequiredService<ILoggerFactory>().CreateLogger("ImportLanguageResourcesFromXml");
var hostingEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
- var translationService = serviceProvider.GetRequiredService<ITranslationService>();
try
{
- var language = langRepository.Table.FirstOrDefault(l => l.Name == "English") ??
- langRepository.Table.FirstOrDefault();
+ var language = langRepository.Table.FirstOrDefault(l => l.Name == "English") ?? langRepository.Table.FirstOrDefault();
var filePath = Path.Combine(hostingEnvironment.ContentRootPath, filename);
var localesXml = File.ReadAllText(filePath);
- translationService.ImportResourcesFromXmlInstall(language, localesXml).GetAwaiter().GetResult();
+
+ var xmlDoc = XmlExtensions.LanguageXmlDocument(localesXml);
+
+ var translateResources = XmlExtensions.ParseTranslationResources(xmlDoc);
+
+ foreach (var item in translateResources)
+ {
+ _ = Enum.TryParse(item.Area, out TranslationResourceArea areaEnum);
+
+ lsrRepository.Insert(new TranslationResource {
+ LanguageId = language!.Id,
+ Name = item.Name.ToLowerInvariant(),
+ Value = item.Value,
+ Area = areaEnum,
+ CreatedBy = "System"
+ });
+ }
}
catch (Exception ex)
{
diff --git a/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs b/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs
new file mode 100644
index 000000000..37eb1fca5
--- /dev/null
+++ b/src/Modules/Grand.Module.Migration/Startup/StartupApplication.cs
@@ -0,0 +1,36 @@
+using Grand.Data;
+using Grand.Infrastructure;
+using Grand.Infrastructure.Configuration;
+using Grand.Infrastructure.Migrations;
+using Grand.Module.Migration.Migrations;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Module.Migration.Startup;
+
+public class StartupApplication : IStartupApplication
+{
+ public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+ {
+ services.AddScoped<IMigrationProcess, MigrationProcess>();
+ }
+
+ public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
+ {
+ if (!DataSettingsManager.DatabaseIsInstalled())
+ return;
+
+ var serviceProvider = application.ApplicationServices;
+ var featureFlagsConfig = serviceProvider.GetRequiredService<FeatureFlagsConfig>();
+ if (featureFlagsConfig.Modules.TryGetValue("Grand.Module.Migration", out var value) && value)
+ {
+ var migrationProcess = serviceProvider.GetRequiredService<IMigrationProcess>();
+ migrationProcess.RunMigrationProcess();
+ }
+ }
+
+ public int Priority => 100;
+ public bool BeforeConfigure => false;
+}
\ No newline at end of file
diff --git a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
index 6243c7c16..89974c34d 100644
--- a/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
+++ b/src/Plugins/Widgets.Slider/SliderWidgetPlugin.cs
@@ -3,7 +3,6 @@ using Grand.Business.Core.Interfaces.Storage;
using Grand.Data;
using Grand.Domain.Common;
using Grand.Infrastructure.Plugins;
-using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Hosting;
using Widgets.Slider.Domain;
@@ -15,7 +14,6 @@ namespace Widgets.Slider;
public class SliderWidgetPlugin(
IPictureService pictureService,
IRepository<PictureSlider> pictureSliderRepository,
- IDatabaseContext databaseContext,
IPluginTranslateResource pluginTranslateResource,
IWebHostEnvironment webHostEnvironment)
: BasePlugin, IPlugin
@@ -26,11 +24,6 @@ public class SliderWidgetPlugin(
/// </summary>
public override async Task Install()
{
- //Create index
- await databaseContext.CreateIndex(pictureSliderRepository,
- OrderBuilder<PictureSlider>.Create().Ascending(x => x.SliderTypeId).Ascending(x => x.DisplayOrder),
- "SliderTypeId_DisplayOrder");
-
//pictures
var sampleImagesPath = Path.Combine(webHostEnvironment.ContentRootPath, "Plugins/Widgets.Slider/Assets/slider/sample-images/");
var byte1 = await File.ReadAllBytesAsync(sampleImagesPath + "banner1.png");
diff --git a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
index 8e4295409..439f17b55 100644
--- a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
+++ b/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
@@ -18,6 +18,7 @@
<ItemGroup>
<ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />
+ <ProjectReference Include="..\..\Modules\Grand.Module.Migration\Grand.Module.Migration.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
index d0510780a..678a87ae3 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
@@ -17,7 +17,7 @@ public class MigrationManagerTests
[TestMethod]
public void GetCurrentMigrations_Exists()
{
- var migrations = _migrationManager.GetCurrentMigrations();
+ var migrations = _migrationManager.GetCurrentMigrations(new DbVersion(2, 2));
Assert.IsTrue(migrations.Count() > 0);
}
}
\ No newline at end of file
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
index 6cf8d7b52..d3415b59f 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
@@ -1,6 +1,7 @@
-using Grand.Business.System.Services.Migrations;
-using Grand.Data;
+using Grand.Data;
using Grand.Domain;
+using Grand.Domain.Common;
+using Grand.Module.Migration.Migrations;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
@@ -13,6 +14,7 @@ public class MigrationProcessTest
private Mock<IDatabaseContext> _dbContext;
private Mock<ILogger<MigrationProcess>> _loggerMock;
private Mock<IRepository<MigrationDb>> _repository;
+ private Mock<IRepository<GrandNodeVersion>> _repositoryVersion;
private MigrationProcess _service;
private IServiceProvider _serviceProvider;
@@ -23,9 +25,10 @@ public class MigrationProcessTest
_serviceProvider = serviceProvider.Object;
_repository = new Mock<IRepository<MigrationDb>>();
+ _repositoryVersion = new Mock<IRepository<GrandNodeVersion>>();
_dbContext = new Mock<IDatabaseContext>();
_loggerMock = new Mock<ILogger<MigrationProcess>>();
- _service = new MigrationProcess(_dbContext.Object, _serviceProvider, _loggerMock.Object, _repository.Object);
+ _service = new MigrationProcess(_dbContext.Object, _serviceProvider, _loggerMock.Object, _repository.Object, _repositoryVersion.Object);
}
//TODO
/*
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
index c75e4ca1c..1b5125091 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
+++ b/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
@@ -1,5 +1,4 @@
-using Grand.Data;
-using Grand.Infrastructure.Migrations;
+using Grand.Infrastructure.Migrations;
namespace Grand.Business.System.Tests.Services.Migrations
{
@@ -20,7 +19,7 @@ namespace Grand.Business.System.Tests.Services.Migrations
/// <param name="database"></param>
/// <param name="serviceProvider"></param>
/// <returns></returns>
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return true;
}
diff --git a/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs b/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs
index c4b5f4339..45709c439 100644
--- a/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/MigrationTest.cs
@@ -1,5 +1,4 @@
-using Grand.Data;
-using Grand.Infrastructure.Migrations;
+using Grand.Infrastructure.Migrations;
namespace Grand.Infrastructure.Tests;
@@ -13,7 +12,7 @@ public class MigrationTest1 : IMigration
public string Name => "SampleMigration";
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return true;
}
@@ -29,7 +28,7 @@ public class MigrationTest2 : IMigration
public string Name => "SampleMigration";
- public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ public bool UpgradeProcess(IServiceProvider serviceProvider)
{
return true;
}
diff --git a/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs b/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs
index 1239d0541..e0e659537 100644
--- a/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs
+++ b/src/Tests/Grand.Infrastructure.Tests/Migrations/MigrationManagerTests.cs
@@ -18,7 +18,7 @@ public class MigrationManagerTests
[TestMethod]
public void GetCurrentMigrationsTest()
{
- var result = migrationManager.GetCurrentMigrations();
+ var result = migrationManager.GetCurrentMigrations(new DbVersion(2,3));
Assert.IsTrue(result.Count() == 1);
}
}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Admin/App_Data/appsettings.json b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
index 1bb20f57e..f42a89685 100644
--- a/src/Web/Grand.Web.Admin/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
@@ -7,9 +7,6 @@
//Value of "Cache-Control" header value for static content
"StaticFilesCacheControl": "public,max-age=31536000",
- //Ignore the migration process
- "SkipMigrationProcess": false,
-
//Enable the session-based TempData provider
"UseSessionStateTempDataProvider": false,
diff --git a/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs b/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs
deleted file mode 100644
index c91473e90..000000000
--- a/src/Web/Grand.Web.Common/Startup/MigrationApplicationStartup.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Grand.Data;
-using Grand.Infrastructure;
-using Grand.Infrastructure.Configuration;
-using Grand.Infrastructure.Migrations;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Grand.Web.Common.Startup;
-
-/// <summary>
-/// Represents object for the configuring/load migration process on application startup
-/// </summary>
-public class MigrationApplicationStartup : IStartupApplication
-{
- /// <summary>
- /// Add and configure any of the middleware
- /// </summary>
- /// <param name="services">Collection of service descriptors</param>
- /// <param name="configuration">Configuration root of the application</param>
- public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
- {
- }
-
- /// <summary>
- /// Configure the using
- /// </summary>
- /// <param name="application">Builder for configuring an application's request pipeline</param>
- /// <param name="webHostEnvironment">WebHostEnvironment</param>
- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
- {
- if (!DataSettingsManager.DatabaseIsInstalled())
- return;
-
- var serviceProvider = application.ApplicationServices;
- var appConfig = serviceProvider.GetRequiredService<AppConfig>();
- if (appConfig.SkipMigrationProcess) return;
- var migrationProcess = serviceProvider.GetRequiredService<IMigrationProcess>();
- migrationProcess.RunMigrationProcess();
- }
-
- /// <summary>
- /// Gets order of this startup configuration implementation
- /// </summary>
- public int Priority => 1000;
-
- public bool BeforeConfigure => false;
-}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
index 1bb20f57e..f42a89685 100644
--- a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
@@ -7,9 +7,6 @@
//Value of "Cache-Control" header value for static content
"StaticFilesCacheControl": "public,max-age=31536000",
- //Ignore the migration process
- "SkipMigrationProcess": false,
-
//Enable the session-based TempData provider
"UseSessionStateTempDataProvider": false,
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index 6a0e1b05b..f781787b5 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -7,9 +7,6 @@
//Value of "Cache-Control" header value for static content
"StaticFilesCacheControl": "public,max-age=31536000",
- //Ignore the migration process
- "SkipMigrationProcess": false,
-
//Enable the session-based TempData provider
"UseSessionStateTempDataProvider": false,
@@ -149,7 +146,8 @@
},
"FeatureFlags": {
"Modules": {
- "Grand.Module.Installer": true
+ "Grand.Module.Installer": true,
+ "Grand.Module.Migration": true
}
},
"Redis": {