kshkulev/hcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scope mishandling

Browse Source
This commit is contained in:
HOME-LAPTOP\kshkulev
2025-10-28 16:32:15 +09:00
parent 529bceb598
commit 1a097a8f7b
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Hcs.WebApp/BackgroundServices/CampaignManagementService.cs
View File

@ -29,8 +29,8 @@ namespace Hcs.WebApp.BackgroundServices
using var scope = scopeFactory.CreateScope(); using var scope = scopeFactory.CreateScope();
try try
{ {
var manager = managerFactory.CreateManager(scope, campaign); var manager = managerFactory.CreateManager(campaign);
await manager.StartAsync(); await manager.StartAsync(scope);
managers.Add(manager); managers.Add(manager);
} }
@ -43,7 +43,8 @@ namespace Hcs.WebApp.BackgroundServices
foreach (var manager in managers) foreach (var manager in managers)
{ {
await manager.CheckStateAsync(); using var scope = scopeFactory.CreateScope();
await manager.CheckStateAsync(scope);
} }
managers.RemoveAll(x => x.State == IManager.ManagerState.Ended); managers.RemoveAll(x => x.State == IManager.ManagerState.Ended);

6
Hcs.WebApp/BackgroundServices/CampaignManagers/ExportCommonRegistryElementsManager_15_7_0_1.cs
View File

@ -3,9 +3,9 @@ using Hcs.WebApp.Services;
namespace Hcs.WebApp.BackgroundServices.CampaignManagers namespace Hcs.WebApp.BackgroundServices.CampaignManagers
{ {
public class ExportCommonRegistryElementsManager_15_7_0_1(IServiceScope scope, OperationExecutionState operationExecutionState, Campaign campaign) : ManagerBase(scope, operationExecutionState, campaign) public class ExportCommonRegistryElementsManager_15_7_0_1(OperationExecutionState operationExecutionState, Campaign campaign) : ManagerBase(operationExecutionState, campaign)
{ {
public override async Task StartAsync() public override async Task StartAsync(IServiceScope scope)
{ {
if (campaign.Step > 0) return; if (campaign.Step > 0) return;
@ -41,7 +41,7 @@ namespace Hcs.WebApp.BackgroundServices.CampaignManagers
State = IManager.ManagerState.Started; State = IManager.ManagerState.Started;
} }
public override async Task CheckStateAsync() public override async Task CheckStateAsync(IServiceScope scope)
{ {
if (State == IManager.ManagerState.Started) if (State == IManager.ManagerState.Started)
{ {

4
Hcs.WebApp/BackgroundServices/CampaignManagers/IManager.cs
View File

@ -11,8 +11,8 @@
public ManagerState State { get; } public ManagerState State { get; }
Task StartAsync(); Task StartAsync(IServiceScope scope);
Task CheckStateAsync(); Task CheckStateAsync(IServiceScope scope);
} }
} }

7
Hcs.WebApp/BackgroundServices/CampaignManagers/ManagerBase.cs
View File

@ -2,16 +2,15 @@
namespace Hcs.WebApp.BackgroundServices.CampaignManagers namespace Hcs.WebApp.BackgroundServices.CampaignManagers
{ {
public abstract class ManagerBase(IServiceScope scope, OperationExecutionState operationExecutionState, Campaign campaign) : IManager public abstract class ManagerBase(OperationExecutionState operationExecutionState, Campaign campaign) : IManager
{ {
protected readonly IServiceScope scope = scope;
protected readonly OperationExecutionState operationExecutionState = operationExecutionState; protected readonly OperationExecutionState operationExecutionState = operationExecutionState;
protected readonly Campaign campaign = campaign; protected readonly Campaign campaign = campaign;
public IManager.ManagerState State { get; protected set; } = IManager.ManagerState.Created; public IManager.ManagerState State { get; protected set; } = IManager.ManagerState.Created;
public abstract Task StartAsync(); public abstract Task StartAsync(IServiceScope scope);
public abstract Task CheckStateAsync(); public abstract Task CheckStateAsync(IServiceScope scope);
} }
} }

4
Hcs.WebApp/BackgroundServices/CampaignManagers/ManagerFactory.cs
View File

@ -6,12 +6,12 @@ namespace Hcs.WebApp.BackgroundServices.CampaignManagers
{ {
protected readonly OperationExecutionState state = state; protected readonly OperationExecutionState state = state;
public IManager CreateManager(IServiceScope scope, Campaign campaign) public IManager CreateManager(Campaign campaign)
{ {
switch (campaign.Type) switch (campaign.Type)
{ {
case Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1: case Campaign.CampaignType.ExportCommonRegistryElements_15_7_0_1:
return new ExportCommonRegistryElementsManager_15_7_0_1(scope, state, campaign); return new ExportCommonRegistryElementsManager_15_7_0_1(state, campaign);
} }
throw new NotImplementedException(); throw new NotImplementedException();