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 Scheduled Task to Grand.Module.ScheduledTasks (#530)

Krzysztof Pajak44b0ffec6c39
diff --git a/.github/workflows/aspnetcore.yml b/.github/workflows/aspnetcore.yml
index 9faac2493..751593c2b 100644
--- a/.github/workflows/aspnetcore.yml
+++ b/.github/workflows/aspnetcore.yml
@@ -38,7 +38,7 @@ jobs:
- name: Grand.Business.Storage Unit Tests
run: dotnet test ./src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj
- name: Grand.Business.System Unit Tests
- run: dotnet test ./src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
+ run: dotnet test ./src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
- name: Grand.Business.Data Unit Tests
run: dotnet test ./src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj
- name: Grand.Domain.Domain.Tests Unit Tests
diff --git a/.github/workflows/grandnode.yml b/.github/workflows/grandnode.yml
index f76384244..ee3a279ec 100644
--- a/.github/workflows/grandnode.yml
+++ b/.github/workflows/grandnode.yml
@@ -45,7 +45,7 @@ jobs:
- name: Grand.Business.Storage Unit Tests
run: dotnet test ./src/Tests/Grand.Business.Storage.Tests/Grand.Business.Storage.Tests.csproj
- name: Grand.Business.System Unit Tests
- run: dotnet test ./src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
+ run: dotnet test ./src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
- name: Grand.Business.Data Unit Tests
run: dotnet test ./src/Tests/Grand.Data.Tests/Grand.Data.Tests.csproj
- name: Grand.Domain.Domain.Tests Unit Tests
diff --git a/GrandNode.sln b/GrandNode.sln
index 9f2684668..84831acb7 100644
--- a/GrandNode.sln
+++ b/GrandNode.sln
@@ -31,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Storage", "s
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Catalog", "src\Business\Grand.Business.Catalog\Grand.Business.Catalog.csproj", "{6925EF20-C289-482E-855E-DAFCE62BE16A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.System", "src\Business\Grand.Business.System\Grand.Business.System.csproj", "{9B4BF192-F99A-4969-8472-A0C36B615DB3}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Authentication", "src\Business\Grand.Business.Authentication\Grand.Business.Authentication.csproj", "{6F9902AA-DBCE-4BB8-AEBE-47264A10D933}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Messages", "src\Business\Grand.Business.Messages\Grand.Business.Messages.csproj", "{D2E8AC42-2751-4AF9-87E4-54A8B2034360}"
@@ -89,7 +87,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Messages.Tes
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Storage.Tests", "src\Tests\Grand.Business.Storage.Tests\Grand.Business.Storage.Tests.csproj", "{E0CDC8F3-2F79-40ED-AD7C-EF3F7B056BEA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.System.Tests", "src\Tests\Grand.Business.System.Tests\Grand.Business.System.Tests.csproj", "{3CCCC424-B13F-479B-94A2-A0A6B05C0858}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Modules.Tests", "src\Tests\Grand.Modules.Tests\Grand.Modules.Tests.csproj", "{3CCCC424-B13F-479B-94A2-A0A6B05C0858}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Grand.Business.Checkout.Tests", "src\Tests\Grand.Business.Checkout.Tests\Grand.Business.Checkout.Tests.csproj", "{B34CA673-578B-46D8-BEC0-2C32BF6997F9}"
EndProject
@@ -139,6 +137,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Migration", "s
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.Api", "src\Modules\Grand.Module.Api\Grand.Module.Api.csproj", "{E0B26803-010B-4198-8016-002242076B61}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grand.Module.ScheduledTasks", "src\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj", "{136F1E35-8B20-465C-8D42-30A5A0D0DA1F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -185,10 +185,6 @@ Global
{6925EF20-C289-482E-855E-DAFCE62BE16A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6925EF20-C289-482E-855E-DAFCE62BE16A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6925EF20-C289-482E-855E-DAFCE62BE16A}.Release|Any CPU.Build.0 = Release|Any CPU
- {9B4BF192-F99A-4969-8472-A0C36B615DB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9B4BF192-F99A-4969-8472-A0C36B615DB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9B4BF192-F99A-4969-8472-A0C36B615DB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9B4BF192-F99A-4969-8472-A0C36B615DB3}.Release|Any CPU.Build.0 = Release|Any CPU
{6F9902AA-DBCE-4BB8-AEBE-47264A10D933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6F9902AA-DBCE-4BB8-AEBE-47264A10D933}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6F9902AA-DBCE-4BB8-AEBE-47264A10D933}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -368,6 +364,10 @@ Global
{E0B26803-010B-4198-8016-002242076B61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0B26803-010B-4198-8016-002242076B61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E0B26803-010B-4198-8016-002242076B61}.Release|Any CPU.Build.0 = Release|Any CPU
+ {136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {136F1E35-8B20-465C-8D42-30A5A0D0DA1F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -383,7 +383,6 @@ Global
{35427306-7271-456A-A337-F7D7E79FB027} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
{B93A72CF-18A9-40E1-8902-63EEA6094905} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
{6925EF20-C289-482E-855E-DAFCE62BE16A} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
- {9B4BF192-F99A-4969-8472-A0C36B615DB3} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
{6F9902AA-DBCE-4BB8-AEBE-47264A10D933} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
{D2E8AC42-2751-4AF9-87E4-54A8B2034360} = {6EAC4D2C-4A86-4C9F-8427-CB374F69F08C}
{1A6A0104-F610-4DD3-88BE-C4029034E5DA} = {BF4543A8-0731-4FDD-BB6B-0ADB9561F981}
@@ -429,6 +428,7 @@ Global
{62460E0C-D4D1-4606-9716-965267B77BA3} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
{75F9D855-026B-4BCB-90CE-3800F02FA0A7} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
{E0B26803-010B-4198-8016-002242076B61} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
+ {136F1E35-8B20-465C-8D42-30A5A0D0DA1F} = {583FFBBD-421C-4FB7-BBDA-F9CAF35A354A}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {88B478F4-FD3B-4C24-9E84-4FAAF0254397}
diff --git a/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
index eec3f4906..89f7d02d9 100644
--- a/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
+++ b/src/Business/Grand.Business.Core/Interfaces/System/ScheduleTasks/IScheduleTaskService.cs
@@ -14,9 +14,9 @@ public interface IScheduleTaskService
/// <summary>
/// Gets a task by its type
/// </summary>
- /// <param name="type">Task type</param>
+ /// <param name="name">Task name</param>
/// <returns>Task</returns>
- Task<ScheduleTask> GetTaskByType(string type);
+ Task<ScheduleTask> GetTaskByName(string name);
/// <summary>
/// Gets all tasks
diff --git a/src/Business/Grand.Business.System/Grand.Business.System.csproj b/src/Business/Grand.Business.System/Grand.Business.System.csproj
deleted file mode 100644
index 8666c3f46..000000000
--- a/src/Business/Grand.Business.System/Grand.Business.System.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
- <Import Project="..\..\Build\Grand.Common.props" />
- <ItemGroup>
- <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" />
- <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" />
- <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />
- <ProjectReference Include="..\Grand.Business.Core\Grand.Business.Core.csproj" />
- </ItemGroup>
-</Project>
diff --git a/src/Business/Grand.Business.System/Startup/StartupApplication.cs b/src/Business/Grand.Business.System/Startup/StartupApplication.cs
deleted file mode 100644
index d185668b6..000000000
--- a/src/Business/Grand.Business.System/Startup/StartupApplication.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Grand.Business.Core.Interfaces.System.ScheduleTasks;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
-using Grand.Infrastructure;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Grand.Business.System.Startup;
-
-public class StartupApplication : IStartupApplication
-{
- public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
- {
- RegisterTask(services);
- }
-
- public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
- {
- }
-
- public int Priority => 100;
- public bool BeforeConfigure => false;
-
- private void RegisterTask(IServiceCollection serviceCollection)
- {
- serviceCollection.AddScoped<IScheduleTaskService, ScheduleTaskService>();
-
- serviceCollection.AddScoped<IScheduleTask, QueuedMessagesSendScheduleTask>();
- serviceCollection.AddScoped<IScheduleTask, ClearCacheScheduleTask>();
- serviceCollection.AddScoped<IScheduleTask, GenerateSitemapXmlTask>();
- serviceCollection.AddScoped<IScheduleTask, DeleteGuestsScheduleTask>();
- serviceCollection.AddScoped<IScheduleTask, UpdateExchangeRateScheduleTask>();
- serviceCollection.AddScoped<IScheduleTask, EndAuctionsTask>();
- serviceCollection.AddScoped<IScheduleTask, CancelOrderScheduledTask>();
- }
-}
\ No newline at end of file
diff --git a/src/Core/Grand.Domain/Tasks/ScheduleTask.cs b/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
index ae6ea19c5..d19979140 100644
--- a/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
+++ b/src/Core/Grand.Domain/Tasks/ScheduleTask.cs
@@ -2,8 +2,7 @@
public class ScheduleTask : BaseEntity
{
- public string ScheduleTaskName { get; set; }
- public string Type { get; set; }
+ public string ScheduleTaskName { get; set; }
public bool Enabled { get; set; }
public bool StopOnError { get; set; }
public DateTime? LastStartUtc { get; set; }
diff --git a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
index 7e09449bb..735ac8f01 100644
--- a/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
+++ b/src/Core/Grand.Infrastructure/Configuration/AppConfig.cs
@@ -5,11 +5,6 @@ namespace Grand.Infrastructure.Configuration;
/// </summary>
public class AppConfig
{
- /// <summary>
- /// Indicates whether we should Disable HostedService - BackgroundServiceTask
- /// </summary>
- public bool DisableHostedService { get; set; }
-
/// <summary>
/// A value indicating whether SEO friendly URLs with multiple languages are enabled
/// </summary>
diff --git a/src/Modules/Grand.Module.Installer/Services/InstallDataScheduleTasks.cs b/src/Modules/Grand.Module.Installer/Services/InstallDataScheduleTasks.cs
index 18b5eb97f..c5ec64e53 100644
--- a/src/Modules/Grand.Module.Installer/Services/InstallDataScheduleTasks.cs
+++ b/src/Modules/Grand.Module.Installer/Services/InstallDataScheduleTasks.cs
@@ -12,56 +12,42 @@ public partial class InstallationService
var tasks = new List<ScheduleTask> {
new() {
ScheduleTaskName = "Send emails",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.QueuedMessagesSendScheduleTask, Grand.Business.System",
Enabled = true,
StopOnError = false,
TimeInterval = 1
},
new() {
ScheduleTaskName = "Delete guests",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.DeleteGuestsScheduleTask, Grand.Business.System",
Enabled = true,
StopOnError = false,
TimeInterval = 1440
},
new() {
ScheduleTaskName = "Clear cache",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.ClearCacheScheduleTask, Grand.Business.System",
Enabled = false,
StopOnError = false,
TimeInterval = 120
},
new() {
ScheduleTaskName = "Update currency exchange rates",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.UpdateExchangeRateScheduleTask, Grand.Business.System",
Enabled = true,
StopOnError = false,
TimeInterval = 1440
},
new() {
ScheduleTaskName = "Generate sitemap XML file",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.GenerateSitemapXmlTask, Grand.Business.System",
Enabled = false,
StopOnError = false,
TimeInterval = 10080
},
new() {
ScheduleTaskName = "End of the auctions",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.EndAuctionsTask, Grand.Business.System",
Enabled = false,
StopOnError = false,
TimeInterval = 60
},
new() {
ScheduleTaskName = "Cancel unpaid and pending orders",
- Type =
- "Grand.Business.System.Services.BackgroundServices.ScheduleTasks.CancelOrderScheduledTask, Grand.Business.System",
Enabled = false,
StopOnError = false,
TimeInterval = 1440
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/CancelOrderScheduledTask.cs
similarity index 92%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/CancelOrderScheduledTask.cs
index 7cb53fc2b..0548db3b3 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/CancelOrderScheduledTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/CancelOrderScheduledTask.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Common;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
public class CancelOrderScheduledTask : IScheduleTask
{
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ClearCacheScheduleTask.cs
similarity index 87%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ClearCacheScheduleTask.cs
index 9968458e4..13b86b1b3 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ClearCacheScheduleTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ClearCacheScheduleTask.cs
@@ -1,7 +1,7 @@
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Infrastructure.Caching;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Clear cache scheduled task implementation
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/DeleteGuestsScheduleTask.cs
similarity index 93%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/DeleteGuestsScheduleTask.cs
index a9919c7b8..d0d0927a9 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/DeleteGuestsScheduleTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/DeleteGuestsScheduleTask.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Common;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Represents a task for deleting guest customers
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/EndAuctionsTask.cs
similarity index 97%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/EndAuctionsTask.cs
index b94f340aa..82faf4f22 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/EndAuctionsTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/EndAuctionsTask.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Localization;
using Grand.Domain.Orders;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Represents a task end auctions
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
similarity index 96%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
index 13d082884..2eee3feff 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/GenerateSitemapXmlTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/GenerateSitemapXmlTask.cs
@@ -5,7 +5,7 @@ using Grand.Business.Core.Interfaces.Storage;
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using MediatR;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Represents a task end auctions
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/QueuedMessagesSendScheduleTask.cs
similarity index 97%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/QueuedMessagesSendScheduleTask.cs
index 9bf2d435b..dcba15071 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/QueuedMessagesSendScheduleTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/QueuedMessagesSendScheduleTask.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Microsoft.Extensions.Logging;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Represents a task for sending queued message
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ScheduleTaskService.cs
similarity index 81%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ScheduleTaskService.cs
index 04911715e..c17036276 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/ScheduleTaskService.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/ScheduleTaskService.cs
@@ -2,7 +2,7 @@ using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Data;
using Grand.Domain.Tasks;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Task service
@@ -35,17 +35,16 @@ public class ScheduleTaskService : IScheduleTaskService
}
/// <summary>
- /// Gets a task by its type
+ /// Gets a task by its name
/// </summary>
- /// <param name="type">Task type</param>
/// <returns>Task</returns>
- public virtual async Task<ScheduleTask> GetTaskByType(string type)
+ public virtual async Task<ScheduleTask> GetTaskByName(string name)
{
- if (string.IsNullOrWhiteSpace(type))
+ if (string.IsNullOrWhiteSpace(name))
return null;
- var query = _taskRepository.Table.Where(st => st.Type == type).OrderByDescending(t => t.Id);
- return await Task.FromResult(query.FirstOrDefault());
+ var task = _taskRepository.Table.FirstOrDefault(x => x.ScheduleTaskName == name);
+ return await Task.FromResult(task);
}
/// <summary>
diff --git a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/UpdateExchangeRateScheduleTask.cs
similarity index 95%
rename from src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
rename to src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/UpdateExchangeRateScheduleTask.cs
index 87982520a..3d09d73e1 100644
--- a/src/Business/Grand.Business.System/Services/BackgroundServices/ScheduleTasks/UpdateExchangeRateScheduleTask.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/BackgroundServices/UpdateExchangeRateScheduleTask.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Domain.Directory;
using Grand.Domain.Tasks;
-namespace Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
+namespace Grand.Module.ScheduledTasks.BackgroundServices;
/// <summary>
/// Represents a task for updating exchange rates
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
similarity index 98%
rename from src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
index e4bf2af69..e943e7632 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendNotificationsToSubscribersCommandHandler.cs
@@ -8,7 +8,7 @@ using Grand.Domain.Customers;
using Grand.SharedKernel.Extensions;
using MediatR;
-namespace Grand.Business.System.Commands.Handlers.Catalog;
+namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
public class
SendNotificationsToSubscribersCommandHandler : IRequestHandler<SendNotificationsToSubscribersCommand,
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
similarity index 91%
rename from src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
index 45529a990..7b698bb66 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendOutBidCustomerNotificationCommandHandler.cs
@@ -2,7 +2,7 @@
using Grand.Business.Core.Interfaces.Messages;
using MediatR;
-namespace Grand.Business.System.Commands.Handlers.Catalog;
+namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
public class SendOutBidCustomerNotificationCommandHandler : IRequestHandler<SendOutBidCustomerCommand, bool>
{
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
similarity index 94%
rename from src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
index 990e53590..aadec6fe5 100644
--- a/src/Business/Grand.Business.System/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
+++ b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Catalog/SendQuantityBelowStoreOwnerNotificationCommandHandler.cs
@@ -3,7 +3,7 @@ using Grand.Business.Core.Interfaces.Messages;
using Grand.Domain.Localization;
using MediatR;
-namespace Grand.Business.System.Commands.Handlers.Catalog;
+namespace Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
public class
SendQuantityBelowStoreOwnerNotificationCommandHandler : IRequestHandler<SendQuantityBelowStoreOwnerCommand, bool>
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Common/ClearMostViewedCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Common/GetSitemapXMLCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetAttributeCombinationTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetAuctionTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetGiftVoucherTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetMerchandiseReturnTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetOrderTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetShipmentTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetShoppingCartTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetStoreTokensCommandHandler.cs
diff --git a/src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs b/src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
similarity index 100%
rename from src/Business/Grand.Business.System/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
rename to src/Modules/Grand.Module.ScheduledTasks/Commands/Handlers/Messages/GetVendorTokensCommandHandler.cs
diff --git a/src/Modules/Grand.Module.ScheduledTasks/Grand.Module.ScheduledTasks.csproj b/src/Modules/Grand.Module.ScheduledTasks/Grand.Module.ScheduledTasks.csproj
new file mode 100644
index 000000000..33725b7d6
--- /dev/null
+++ b/src/Modules/Grand.Module.ScheduledTasks/Grand.Module.ScheduledTasks.csproj
@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <Import Project="..\..\Build\Grand.Common.props" />
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\Grand.Data\Grand.Data.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj">
+ <Private>False</Private>
+ <ExcludeAssets>runtime</ExcludeAssets>
+ </ProjectReference>
+ </ItemGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.ScheduledTasks\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>..\..\Web\Grand.Web\Modules\Grand.Module.ScheduledTasks\</OutputPath>
+ <OutDir>$(OutputPath)</OutDir>
+ </PropertyGroup>
+</Project>
diff --git a/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs b/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs
new file mode 100644
index 000000000..cd0191149
--- /dev/null
+++ b/src/Modules/Grand.Module.ScheduledTasks/Startup/StartupApplication.cs
@@ -0,0 +1,37 @@
+using Grand.Business.Core.Interfaces.System.ScheduleTasks;
+using Grand.Module.ScheduledTasks.BackgroundServices;
+using Grand.Infrastructure;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Module.ScheduledTasks.Startup;
+
+public class StartupApplication : IStartupApplication
+{
+ public void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+ {
+ RegisterTask(services);
+ }
+
+ public void Configure(IApplicationBuilder application, IWebHostEnvironment webHostEnvironment)
+ {
+ }
+
+ public int Priority => 100;
+ public bool BeforeConfigure => false;
+
+ private void RegisterTask(IServiceCollection serviceCollection)
+ {
+ serviceCollection.AddScoped<IScheduleTaskService, ScheduleTaskService>();
+
+ serviceCollection.AddKeyedScoped<IScheduleTask, QueuedMessagesSendScheduleTask>("Send emails");
+ serviceCollection.AddKeyedScoped<IScheduleTask, ClearCacheScheduleTask>("Clear cache");
+ serviceCollection.AddKeyedScoped<IScheduleTask, GenerateSitemapXmlTask>("Generate sitemap XML file");
+ serviceCollection.AddKeyedScoped<IScheduleTask, DeleteGuestsScheduleTask>("Delete guests");
+ serviceCollection.AddKeyedScoped<IScheduleTask, UpdateExchangeRateScheduleTask>("Update currency exchange rates");
+ serviceCollection.AddKeyedScoped<IScheduleTask, EndAuctionsTask>("End of the auctions");
+ serviceCollection.AddKeyedScoped<IScheduleTask, CancelOrderScheduledTask>("Cancel unpaid and pending orders");
+ }
+}
\ No newline at end of file
diff --git a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs b/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
deleted file mode 100644
index 575560c28..000000000
--- a/src/Tests/Grand.Business.System.Tests/Services/ExportImport/ExportManagerTests.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-//using Grand.Business.Core.Interfaces.Storage;
-//using Grand.Business.System.Services.ExportImport;
-//using Grand.Domain.Catalog;
-//using Microsoft.VisualStudio.TestTools.UnitTesting;
-//using Moq;
-//using NPOI.XSSF.UserModel;
-
-//namespace Grand.Business.System.Tests.Services.ExportImport
-//{
-// [TestClass()]
-// public class ExportManagerTests
-// {
-// private Mock<IServiceProvider> _serviceProviderMock;
-// private Mock<IPictureService> _pictureServiceMock;
-// private ExportManager _exportManager;
-
-// [TestInitialize()]
-// public void TestInitialize()
-// {
-// _serviceProviderMock = new Mock<IServiceProvider>();
-// _pictureServiceMock = new Mock<IPictureService>();
-// _exportManager = new ExportManager(_pictureServiceMock.Object, _serviceProviderMock.Object);
-// }
-
-// [TestMethod]
-// public void ExportBrandsToXlsx_ReturnFilledStreamWithCorrecctStructure()
-// {
-// var brands = new List<Brand>()
-// {
-// new Brand(){Id="id1",Name="brand1"},
-// new Brand(){Id="id2",Name="brand2"}
-// };
-
-// var result = _exportManager.ExportBrandsToXlsx(brands);
-// Assert.IsTrue(result.Length > 0);
-// using (var ms = new MemoryStream(result))
-// {
-// XSSFWorkbook s = new XSSFWorkbook(ms);
-// var sheet = s.GetSheet("Brand");
-// var row1 = sheet.GetRow(0);
-// var row2 = sheet.GetRow(1);
-// Assert.IsNotNull(sheet);
-// Assert.IsNotNull(row1);
-// Assert.IsNotNull(row2);
-// //row1 should contains header- property name
-// Assert.AreEqual(row1.GetCell(0).StringCellValue, "Id");
-// Assert.AreEqual(row2.GetCell(0).StringCellValue, "id1");
-// }
-// }
-
-// [TestMethod]
-// public void ExportCollectionsToXlsx_ReturnFilledStreamWithCorrecctStructure()
-// {
-// var collections = new List<Collection>()
-// {
-// new Collection{Id="id1",Name="collection1"},
-// new Collection{Id="id2",Name="collection2"}
-// };
-
-// var result = _exportManager.ExportCollectionsToXlsx(collections);
-// Assert.IsTrue(result.Length > 0);
-// using (var ms = new MemoryStream(result))
-// {
-// XSSFWorkbook s = new XSSFWorkbook(ms);
-// var sheet = s.GetSheet("Collection");
-// var row1 = sheet.GetRow(0);
-// var row2 = sheet.GetRow(1);
-// var row3 = sheet.GetRow(2);
-// Assert.IsNotNull(sheet);
-// Assert.IsNotNull(row1);
-// Assert.IsNotNull(row2);
-// //row1 should contains header- property name
-// Assert.AreEqual(row1.GetCell(0).StringCellValue, "Id");
-// Assert.AreEqual(row1.GetCell(1).StringCellValue, "Name");
-// Assert.AreEqual(row2.GetCell(0).StringCellValue, "id1");
-// Assert.AreEqual(row2.GetCell(1).StringCellValue, "collection1");
-// Assert.AreEqual(row3.GetCell(0).StringCellValue, "id2");
-// Assert.AreEqual(row3.GetCell(1).StringCellValue, "collection2");
-// }
-// }
-
-// [TestMethod]
-// public void ExportCategoriesToXlsx_ReturnFilledStreamWithCorrecctStructure()
-// {
-// var categories = new List<Category>()
-// {
-// new Category{Id="id1",Name="name1"},
-// new Category{Id="id2",Name="name2"}
-// };
-
-// var result = _exportManager.ExportCategoriesToXlsx(categories);
-// Assert.IsTrue(result.Length > 0);
-// using (var ms = new MemoryStream(result))
-// {
-// XSSFWorkbook s = new XSSFWorkbook(ms);
-// var sheet = s.GetSheet("Category");
-// var row1 = sheet.GetRow(0);
-// var row2 = sheet.GetRow(1);
-// var row3 = sheet.GetRow(2);
-// Assert.IsNotNull(sheet);
-// Assert.IsNotNull(row1);
-// Assert.IsNotNull(row2);
-// //row1 should contains header- property name
-// Assert.AreEqual(row1.GetCell(0).StringCellValue, "Id");
-// Assert.AreEqual(row1.GetCell(1).StringCellValue, "Name");
-// Assert.AreEqual(row2.GetCell(0).StringCellValue, "id1");
-// Assert.AreEqual(row2.GetCell(1).StringCellValue, "name1");
-// Assert.AreEqual(row3.GetCell(0).StringCellValue, "id2");
-// Assert.AreEqual(row3.GetCell(1).StringCellValue, "name2");
-// }
-// }
-
-// [TestMethod]
-// public void ExportProductsToXlsx_ReturnFilledStreamWithCorrecctStructure()
-// {
-// var products = new List<Product>()
-// {
-// new Product{Id="id1",ProductTypeId=ProductType.Auction,Name="name1"},
-// new Product{Id="id2",ProductTypeId=ProductType.SimpleProduct,Name="name2"}
-// };
-
-// var result = _exportManager.ExportProductsToXlsx(products);
-// Assert.IsTrue(result.Length > 0);
-// using (var ms = new MemoryStream(result))
-// {
-// XSSFWorkbook s = new XSSFWorkbook(ms);
-// var sheet = s.GetSheet("Product");
-// var row1 = sheet.GetRow(0);
-// var row2 = sheet.GetRow(1);
-// var row3 = sheet.GetRow(2);
-// Assert.IsNotNull(sheet);
-// Assert.IsNotNull(row1);
-// Assert.IsNotNull(row2);
-// //row1 should contains header- property name
-// var x1 = row1.GetCell(0).StringCellValue;
-// Assert.AreEqual(x1, "Id");
-// var x2 = row1.GetCell(1).StringCellValue;
-// Assert.AreEqual(x2, "ProductTypeId");
-// var x3 = row2.GetCell(0).StringCellValue;
-// Assert.AreEqual(x3, "id1");
-// var x4 = row2.GetCell(1).StringCellValue;
-// Assert.AreEqual(x4, "40");
-// var x5 = row3.GetCell(0).StringCellValue;
-// Assert.AreEqual(x5, "id2");
-// var x6 = row3.GetCell(1).StringCellValue;
-// Assert.AreEqual(x6, "0");
-// }
-// }
-
-// //Temporary disabled -- TODO
-// /*
-// [TestMethod]
-// public void ExportNewsletterSubscribersToTxt_ReturnExpectedResult()
-// {
-// var list = new List<NewsLetterSubscription>()
-// {
-// new NewsLetterSubscription(){Email="[email protected]",Active=true,CreatedOnUtc=new DateTime(2021,04,12),StoreId="s1"},
-// new NewsLetterSubscription(){Email="[email protected]",Active=false,CreatedOnUtc=new DateTime(2021,04,20),StoreId="s2"},
-// new NewsLetterSubscription(){Email="[email protected]",Active=true,CreatedOnUtc=new DateTime(2021,04,21),StoreId="s3"},
-// };
-
-// var result = _exportManager.ExportNewsletterSubscribersToTxt(list);
-// Assert.AreEqual("[email protected],True,12.04.2021 00:00:00,s1,\r\[email protected],False,20.04.2021 00:00:00,s2,\r\[email protected],True,21.04.2021 00:00:00,s3,\r\n", result);
-
-// }
-// */
-// }
-//}
-
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Modules.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
similarity index 91%
rename from src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
rename to src/Tests/Grand.Modules.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
index f9beb8e16..3cc5efef5 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Commands/SendOutBidCustomerNotificationCommandHandlerTests.cs
@@ -1,12 +1,12 @@
using Grand.Business.Core.Commands.Catalog;
using Grand.Business.Core.Interfaces.Messages;
-using Grand.Business.System.Commands.Handlers.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
+using Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Commands;
+namespace Grand.Modules.Tests.Commands;
[TestClass]
public class SendOutBidCustomerNotificationCommandHandlerTests
diff --git a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs b/src/Tests/Grand.Modules.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
similarity index 93%
rename from src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
rename to src/Tests/Grand.Modules.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
index 4fb2c5dcc..d61162167 100644
--- a/src/Tests/Grand.Business.System.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Commands/SendQuantityBelowStoreOwnerNotificationCommandHandlerTests.cs
@@ -1,12 +1,12 @@
using Grand.Business.Core.Commands.Catalog;
using Grand.Business.Core.Interfaces.Messages;
-using Grand.Business.System.Commands.Handlers.Catalog;
using Grand.Domain.Catalog;
using Grand.Domain.Localization;
+using Grand.Module.ScheduledTasks.Commands.Handlers.Catalog;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Commands;
+namespace Grand.Modules.Tests.Commands;
[TestClass]
public class SendQuantityBelowStoreOwnerNotificationCommandHandlerTests
diff --git a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj b/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
similarity index 83%
rename from src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
rename to src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
index 75f68ba4a..9a7b3207f 100644
--- a/src/Tests/Grand.Business.System.Tests/Grand.Business.System.Tests.csproj
+++ b/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj
@@ -2,6 +2,7 @@
<Import Project="..\..\Build\Grand.Common.props" />
<PropertyGroup>
<IsPackable>false</IsPackable>
+ <RootNamespace>Grand.Modules.Tests</RootNamespace>
</PropertyGroup>
<ItemGroup>
@@ -17,8 +18,8 @@
<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" />
+ <ProjectReference Include="..\..\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj" />
</ItemGroup>
</Project>
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
similarity index 88%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
index 5bca3e066..182984c33 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/CancelOrderScheduledTaskTests.cs
@@ -1,10 +1,10 @@
using Grand.Business.Core.Interfaces.Checkout.Orders;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class CancelOrderScheduledTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
similarity index 75%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
index 76e5cb6f0..9cb805bad 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/ClearCacheScheduleTaskTests.cs
@@ -1,9 +1,9 @@
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
-using Grand.Infrastructure.Caching;
+using Grand.Infrastructure.Caching;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class ClearCacheScheduleTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
similarity index 86%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
index 3ab21cd00..7fc297382 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/DeleteGuestsScheduleTaskTests.cs
@@ -1,10 +1,10 @@
using Grand.Business.Core.Interfaces.Customers;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Common;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class DeleteGuestsScheduleTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
similarity index 97%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
index 1ae8003b5..e66c04b43 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/EndAuctionsTaskTests.cs
@@ -3,18 +3,18 @@ using Grand.Business.Core.Interfaces.Checkout.Orders;
using Grand.Business.Core.Interfaces.Customers;
using Grand.Business.Core.Interfaces.Messages;
using Grand.Business.Core.Utilities.Checkout;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain;
using Grand.Domain.Catalog;
using Grand.Domain.Common;
using Grand.Domain.Customers;
using Grand.Domain.Localization;
using Grand.Domain.Orders;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class EndAuctionsTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
similarity index 96%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
index 969089d9b..bc6bae77b 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/QueuedMessagesSendScheduleTaskTests.cs
@@ -1,12 +1,12 @@
using Grand.Business.Core.Interfaces.Messages;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain;
using Grand.Domain.Messages;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class QueuedMessagesSendScheduleTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
similarity index 93%
rename from src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
index 740293bae..3ffef6eda 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/BackgroundService/UpdateExchangeRateScheduleTaskTests.cs
@@ -1,10 +1,10 @@
using Grand.Business.Core.Interfaces.Common.Directory;
-using Grand.Business.System.Services.BackgroundServices.ScheduleTasks;
using Grand.Domain.Directory;
+using Grand.Module.ScheduledTasks.BackgroundServices;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.BackgroundService;
+namespace Grand.Modules.Tests.Services.BackgroundService;
[TestClass]
public class UpdateExchangeRateScheduleTaskTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationManagerTests.cs
similarity index 89%
rename from src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
rename to src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationManagerTests.cs
index 678a87ae3..0bde0c4a1 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationManagerTests.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationManagerTests.cs
@@ -1,7 +1,7 @@
using Grand.Infrastructure.Migrations;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-namespace Grand.Business.System.Tests.Services.Migrations;
+namespace Grand.Modules.Tests.Services.Migrations;
[TestClass]
public class MigrationManagerTests
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationProcessTest.cs
similarity index 95%
rename from src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
rename to src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationProcessTest.cs
index d3415b59f..e395dac28 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationProcessTest.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationProcessTest.cs
@@ -6,7 +6,7 @@ using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
-namespace Grand.Business.System.Tests.Services.Migrations;
+namespace Grand.Modules.Tests.Services.Migrations;
[TestClass]
public class MigrationProcessTest
diff --git a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationUpgrade_Test.cs
similarity index 92%
rename from src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
rename to src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationUpgrade_Test.cs
index 1b5125091..aa9426556 100644
--- a/src/Tests/Grand.Business.System.Tests/Services/Migrations/MigrationUpgrade_Test.cs
+++ b/src/Tests/Grand.Modules.Tests/Services/Migrations/MigrationUpgrade_Test.cs
@@ -1,6 +1,6 @@
using Grand.Infrastructure.Migrations;
-namespace Grand.Business.System.Tests.Services.Migrations
+namespace Grand.Modules.Tests.Services.Migrations
{
public class MigrationUpgrade_Test : IMigration
{
diff --git a/src/Web/Grand.Web.Admin/App_Data/appsettings.json b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
index 27e944dd3..b2cd45740 100644
--- a/src/Web/Grand.Web.Admin/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Admin/App_Data/appsettings.json
@@ -10,9 +10,6 @@
//Enable the session-based TempData provider
"UseSessionStateTempDataProvider": false,
- //Indicates whether to disable hosted service - BackgroundServiceTask
- "DisableHostedService": false,
-
//Note: While use of custom response header encoding may be needed in some cases,
//we discourage the use of non-ASCII encodings to avoid compatibility issues
//with other HTTP clients.
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ScheduleTask/EditScheduler.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ScheduleTask/EditScheduler.cshtml
index 324e0731a..d343197b8 100644
--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/ScheduleTask/EditScheduler.cshtml
+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/ScheduleTask/EditScheduler.cshtml
@@ -43,14 +43,7 @@
<div class="col-md-9 col-sm-9">
<admin-input asp-for="LeasedByMachineName"/>
</div>
- </div>
-
- <div class="form-group">
- <admin-label asp-for="Type"/>
- <div class="col-md-9 col-sm-9">
- <label class="control-label"> @Html.DisplayFor(model => model.Type) </label>
- </div>
- </div>
+ </div>
<div class="form-group">
<admin-label asp-for="Enabled"/>
<div class="col-md-9 col-sm-9">
diff --git a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
index 53e38fcbd..a9164e9e4 100644
--- a/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
+++ b/src/Web/Grand.Web.Admin/Controllers/ScheduleTaskController.cs
@@ -117,8 +117,7 @@ public class ScheduleTaskController : BaseAdminController
return RedirectToAction("List");
}
- model.ScheduleTaskName = scheduleTask.ScheduleTaskName;
- model.Type = scheduleTask.Type;
+ model.ScheduleTaskName = scheduleTask.ScheduleTaskName;
model = await PrepareStores(model);
Error(ModelState);
@@ -132,9 +131,8 @@ public class ScheduleTaskController : BaseAdminController
{
var scheduleTask = await _scheduleTaskService.GetTaskById(id);
if (scheduleTask == null) throw new Exception("Schedule task cannot be loaded");
- var typeofTask = Type.GetType(scheduleTask.Type);
- var task = HttpContext.RequestServices.GetServices<IScheduleTask>()
- .FirstOrDefault(x => x.GetType() == typeofTask);
+
+ var task = HttpContext.RequestServices.GetRequiredKeyedService<IScheduleTask>(scheduleTask.ScheduleTaskName);
if (task != null)
{
scheduleTask.LastStartUtc = DateTime.UtcNow;
@@ -157,7 +155,7 @@ public class ScheduleTaskController : BaseAdminController
}
else
{
- Error($"Task {typeofTask?.Name} has not been registered");
+ Error($"Task {scheduleTask.ScheduleTaskName} has not been registered");
}
}
catch (Exception exc)
diff --git a/src/Web/Grand.Web.Admin/Mapper/ScheduleTaskProfile.cs b/src/Web/Grand.Web.Admin/Mapper/ScheduleTaskProfile.cs
index ffdce8708..cc296e8b4 100644
--- a/src/Web/Grand.Web.Admin/Mapper/ScheduleTaskProfile.cs
+++ b/src/Web/Grand.Web.Admin/Mapper/ScheduleTaskProfile.cs
@@ -14,7 +14,6 @@ public class ScheduleTaskProfile : Profile, IAutoMapperProfile
CreateMap<ScheduleTaskModel, ScheduleTask>()
.ForMember(dest => dest.Id, mo => mo.Ignore())
- .ForMember(dest => dest.Type, mo => mo.Ignore())
.ForMember(dest => dest.ScheduleTaskName, mo => mo.Ignore())
.ForMember(dest => dest.LastNonSuccessEndUtc, mo => mo.Ignore())
.ForMember(dest => dest.LastStartUtc, mo => mo.Ignore())
diff --git a/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs b/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
index db153ca1f..b4c44c4e4 100644
--- a/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
+++ b/src/Web/Grand.Web.Admin/Models/Tasks/ScheduleTaskModel.cs
@@ -10,10 +10,7 @@ public class ScheduleTaskModel : BaseEntityModel
public string ScheduleTaskName { get; set; }
[GrandResourceDisplayName("Admin.System.ScheduleTasks.LeasedByMachineName")]
- public string LeasedByMachineName { get; set; }
-
- [GrandResourceDisplayName("Admin.System.ScheduleTasks.Type")]
- public string Type { get; set; }
+ public string LeasedByMachineName { get; set; }
[GrandResourceDisplayName("Admin.System.ScheduleTasks.Enabled")]
public bool Enabled { get; set; }
diff --git a/src/Web/Grand.Web.Common/Extensions/KeyedServiceHelper.cs b/src/Web/Grand.Web.Common/Extensions/KeyedServiceHelper.cs
new file mode 100644
index 000000000..22bbde9df
--- /dev/null
+++ b/src/Web/Grand.Web.Common/Extensions/KeyedServiceHelper.cs
@@ -0,0 +1,19 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Web.Common.Extensions;
+
+public static class KeyedServiceHelper
+{
+ public static IList<string> GetKeyedServicesForInterface<TInterface>(IServiceCollection services)
+ {
+ ArgumentNullException.ThrowIfNull(services);
+
+ return services
+ .Where(service =>
+ service.ServiceType == typeof(TInterface) &&
+ service.IsKeyedService &&
+ service.ServiceKey != null)
+ .Select(service => service.ServiceKey.ToString())
+ .ToList();
+ }
+}
\ No newline at end of file
diff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
index 4483b7b7c..a2d0b1306 100644
--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj
@@ -28,7 +28,6 @@
<ProjectReference Include="..\..\Business\Grand.Business.Marketing\Grand.Business.Marketing.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Messages\Grand.Business.Messages.csproj" />
<ProjectReference Include="..\..\Business\Grand.Business.Storage\Grand.Business.Storage.csproj" />
- <ProjectReference Include="..\..\Business\Grand.Business.System\Grand.Business.System.csproj" />
</ItemGroup>
diff --git a/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs b/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
index 7c87adc98..01517ebca 100644
--- a/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
+++ b/src/Web/Grand.Web.Common/Infrastructure/BackgroundServiceTask.cs
@@ -10,11 +10,11 @@ namespace Grand.Web.Common.Infrastructure;
public class BackgroundServiceTask : BackgroundService
{
private readonly IServiceProvider _serviceProvider;
- private readonly string _taskType;
+ private readonly string Name;
- public BackgroundServiceTask(string taskType, IServiceProvider serviceProvider)
+ public BackgroundServiceTask(string name, IServiceProvider serviceProvider)
{
- _taskType = taskType;
+ Name = name;
_serviceProvider = serviceProvider;
}
@@ -27,10 +27,10 @@ public class BackgroundServiceTask : BackgroundService
var serviceProvider = scope.ServiceProvider;
var logger = serviceProvider.GetService<ILogger<BackgroundServiceTask>>();
var scheduleTaskService = serviceProvider.GetService<IScheduleTaskService>();
- var task = await scheduleTaskService.GetTaskByType(_taskType);
+ var task = await scheduleTaskService.GetTaskByName(Name);
if (task == null)
{
- logger.LogInformation("Task {TaskType} is not exists in the database", _taskType);
+ logger.LogInformation("Task {TaskName} is not exists in the database", Name);
break;
}
@@ -39,66 +39,55 @@ public class BackgroundServiceTask : BackgroundService
if (task.Enabled && (string.IsNullOrEmpty(task.LeasedByMachineName) ||
machineName == task.LeasedByMachineName))
{
- var typeofTask = Type.GetType(_taskType);
- if (typeofTask != null)
+
+ var scheduleTask = serviceProvider.GetRequiredKeyedService<IScheduleTask>(task.ScheduleTaskName);
+ if (scheduleTask != null)
{
- var scheduleTask = serviceProvider.GetServices<IScheduleTask>()
- .FirstOrDefault(x => x.GetType() == typeofTask);
- if (scheduleTask != null)
+ //assign current customer (background task) / current store (from task)
+ await WorkContext(serviceProvider, task);
+ var runTask = true;
+ if (task.LastStartUtc.HasValue)
{
- //assign current customer (background task) / current store (from task)
- await WorkContext(serviceProvider, task);
- var runTask = true;
- if (task.LastStartUtc.HasValue)
+ var dateTimeNow = DateTime.UtcNow;
+ if (dateTimeNow < task.LastStartUtc.Value.AddMinutes(task.TimeInterval))
{
- var dateTimeNow = DateTime.UtcNow;
- if (dateTimeNow < task.LastStartUtc.Value.AddMinutes(task.TimeInterval))
- {
- runTask = false;
- timeInterval =
- (int)(task.LastStartUtc.Value.AddMinutes(task.TimeInterval) - dateTimeNow)
- .TotalMinutes;
- }
- else
- {
- runTask = true;
- timeInterval = task.TimeInterval > 0 ? task.TimeInterval : 1;
- }
+ runTask = false;
+ timeInterval =
+ (int)(task.LastStartUtc.Value.AddMinutes(task.TimeInterval) - dateTimeNow)
+ .TotalMinutes;
}
-
- if (runTask)
+ else
{
- task.LastStartUtc = DateTime.UtcNow;
- try
- {
- //TODO - add settings
- //logger.Information($"Task {_taskType} execute");
- await scheduleTask.Execute();
- task.LastSuccessUtc = DateTime.UtcNow;
- task.LastNonSuccessEndUtc = null;
- }
- catch (Exception exc)
- {
- task.LastNonSuccessEndUtc = DateTime.UtcNow;
- task.Enabled = !task.StopOnError;
- logger.LogError(exc,
- "Error while running the \'{TaskScheduleTaskName}\' schedule task",
- task.ScheduleTaskName);
- }
+ runTask = true;
+ timeInterval = task.TimeInterval > 0 ? task.TimeInterval : 1;
}
}
- else
+
+ if (runTask)
{
- task.Enabled = !task.StopOnError;
- task.LastNonSuccessEndUtc = DateTime.UtcNow;
- logger.LogError("Type {TaskType} is not registered", _taskType);
+ task.LastStartUtc = DateTime.UtcNow;
+ try
+ {
+ logger.LogInformation($"Task {Name} execute");
+ await scheduleTask.Execute();
+ task.LastSuccessUtc = DateTime.UtcNow;
+ task.LastNonSuccessEndUtc = null;
+ }
+ catch (Exception exc)
+ {
+ task.LastNonSuccessEndUtc = DateTime.UtcNow;
+ task.Enabled = !task.StopOnError;
+ logger.LogError(exc,
+ "Error while running the \'{TaskScheduleTaskName}\' schedule task",
+ task.ScheduleTaskName);
+ }
}
}
else
{
task.Enabled = !task.StopOnError;
task.LastNonSuccessEndUtc = DateTime.UtcNow;
- logger.LogError("Type {TaskType} is null (type not exists)", _taskType);
+ logger.LogError("Type {TaskName} is not registered", Name);
}
await scheduleTaskService.UpdateTask(task);
diff --git a/src/Web/Grand.Web.Common/Startup/TaskHandler.cs b/src/Web/Grand.Web.Common/Startup/TaskHandler.cs
index e33d7105b..234539e35 100644
--- a/src/Web/Grand.Web.Common/Startup/TaskHandler.cs
+++ b/src/Web/Grand.Web.Common/Startup/TaskHandler.cs
@@ -1,8 +1,6 @@
using Grand.Business.Core.Interfaces.System.ScheduleTasks;
using Grand.Data;
-using Grand.Infrastructure.Configuration;
-using Grand.Infrastructure.Plugins;
-using Grand.Infrastructure.TypeSearch;
+using Grand.Web.Common.Extensions;
using Grand.Web.Common.Infrastructure;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
@@ -17,21 +15,11 @@ public static class TaskHandler
//database is already installed, so start scheduled tasks
if (!DataSettingsManager.DatabaseIsInstalled()) return;
- var appConfig = new AppConfig();
- configuration.GetSection("Application").Bind(appConfig);
+ var scheduleTaskKeyedServices = KeyedServiceHelper.GetKeyedServicesForInterface<IScheduleTask>(services);
- if (appConfig.DisableHostedService) return;
- var typeSearcher = new TypeSearcher();
- var scheduleTasks = typeSearcher.ClassesOfType<IScheduleTask>();
-
- var scheduleTasksInstalled = scheduleTasks
- .Where(PluginExtensions.OnlyInstalledPlugins); //ignore not installed plugins
-
- foreach (var task in scheduleTasksInstalled)
+ foreach (var task in scheduleTaskKeyedServices)
{
- var assemblyName = task.Assembly.GetName().Name;
- services.AddSingleton<IHostedService, BackgroundServiceTask>(sp =>
- new BackgroundServiceTask($"{task.FullName}, {assemblyName}", sp));
+ services.AddSingleton<IHostedService, BackgroundServiceTask>(sp => new BackgroundServiceTask(task, sp));
}
}
}
\ 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 27e944dd3..ef3ec6f17 100644
--- a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
+++ b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json
@@ -9,9 +9,6 @@
//Enable the session-based TempData provider
"UseSessionStateTempDataProvider": false,
-
- //Indicates whether to disable hosted service - BackgroundServiceTask
- "DisableHostedService": false,
//Note: While use of custom response header encoding may be needed in some cases,
//we discourage the use of non-ASCII encodings to avoid compatibility issues
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
index 5460b62f0..316459742 100644
--- a/src/Web/Grand.Web/App_Data/appsettings.json
+++ b/src/Web/Grand.Web/App_Data/appsettings.json
@@ -14,9 +14,6 @@
"SeoFriendlyUrlsForLanguagesEnabled": false,
"SeoFriendlyUrlsDefaultCode": "en",
- //Indicates whether to disable hosted service - BackgroundServiceTask
- "DisableHostedService": false,
-
//Note: While use of custom response header encoding may be needed in some cases,
//we discourage the use of non-ASCII encodings to avoid compatibility issues
//with other HTTP clients.
@@ -148,6 +145,7 @@
"Modules": {
"Grand.Module.Installer": true,
"Grand.Module.Migration": true,
+ "Grand.Module.ScheduledTasks": true,
"Grand.Module.Api": false
}
},