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

Fix campaign steps

Browse Source
This commit is contained in:
HOME-LAPTOP\kshkulev
2025-11-01 20:13:20 +09:00
parent 3c3510a8f9
commit e7f646c408
4 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Hcs.WebApp/BackgroundServices/OperationExecutionService.cs
View File

@ -29,6 +29,8 @@ namespace Hcs.WebApp.BackgroundServices
{ {
while (state.TryDequeueOperation(out var operation)) while (state.TryDequeueOperation(out var operation))
{ {
state.SetProcessingOperation(operation);
if (stoppingToken.IsCancellationRequested) return; if (stoppingToken.IsCancellationRequested) return;
var scope = scopeFactory.CreateScope(); var scope = scopeFactory.CreateScope();
@ -49,6 +51,8 @@ namespace Hcs.WebApp.BackgroundServices
{ {
await headquartersService.SetOperationMessageGuidAsync(operation.Id, messageGuid); await headquartersService.SetOperationMessageGuidAsync(operation.Id, messageGuid);
} }
state.UnsetProcessingOperation(operation);
} }
await Task.Delay(SLEEP_TIME, stoppingToken); await Task.Delay(SLEEP_TIME, stoppingToken);

19
Hcs.WebApp/BackgroundServices/OperationExecutionState.cs
View File

@ -5,21 +5,32 @@ namespace Hcs.WebApp.BackgroundServices
{ {
public class OperationExecutionState public class OperationExecutionState
{ {
private readonly ConcurrentQueue<Operation> operations = new(); private readonly ConcurrentQueue<Operation> operationsInQueue = new();
private readonly HashSet<Operation> operationsInProcess = [];
public void EnqueueOperation(Operation operation) public void EnqueueOperation(Operation operation)
{ {
operations.Enqueue(operation); operationsInQueue.Enqueue(operation);
} }
public bool TryDequeueOperation(out Operation operation) public bool TryDequeueOperation(out Operation operation)
{ {
return operations.TryDequeue(out operation); return operationsInQueue.TryDequeue(out operation);
}
public void SetProcessingOperation(Operation operation)
{
operationsInProcess.Add(operation);
}
public void UnsetProcessingOperation(Operation operation)
{
operationsInProcess.Remove(operation);
} }
public bool HasCampaignOperation(int campaignId) public bool HasCampaignOperation(int campaignId)
{ {
return operations.Any(x => x.CampaignId == campaignId); return operationsInProcess.Any(x => x.CampaignId == campaignId);
} }
} }
} }

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

@ -42,6 +42,8 @@ namespace Hcs.WebApp.BackgroundServices
{ {
while (state.TryDequeueOperation(out var operation)) while (state.TryDequeueOperation(out var operation))
{ {
state.SetProcessingOperation(operation);
if (stoppingToken.IsCancellationRequested) return; if (stoppingToken.IsCancellationRequested) return;
entries.Add(new (operation, new WaitState())); entries.Add(new (operation, new WaitState()));
@ -86,6 +88,11 @@ namespace Hcs.WebApp.BackgroundServices
entry.state.attempt++; entry.state.attempt++;
entry.state.timer = 0; entry.state.timer = 0;
} }
if (entry.state.done)
{
state.UnsetProcessingOperation(entry.operation);
}
} }
entries.RemoveAll(x => x.state.done); entries.RemoveAll(x => x.state.done);

19
Hcs.WebApp/BackgroundServices/ResultWaitState.cs
View File

@ -5,21 +5,32 @@ namespace Hcs.WebApp.BackgroundServices
{ {
public class ResultWaitState public class ResultWaitState
{ {
private readonly ConcurrentQueue<Operation> operations = new(); private readonly ConcurrentQueue<Operation> operationsInQueue = new();
private readonly HashSet<Operation> operationsInProcess = [];
public void EnqueueOperation(Operation operation) public void EnqueueOperation(Operation operation)
{ {
operations.Enqueue(operation); operationsInQueue.Enqueue(operation);
} }
public bool TryDequeueOperation(out Operation operation) public bool TryDequeueOperation(out Operation operation)
{ {
return operations.TryDequeue(out operation); return operationsInQueue.TryDequeue(out operation);
}
public void SetProcessingOperation(Operation operation)
{
operationsInProcess.Add(operation);
}
public void UnsetProcessingOperation(Operation operation)
{
operationsInProcess.Remove(operation);
} }
public bool HasCampaignOperation(int campaignId) public bool HasCampaignOperation(int campaignId)
{ {
return operations.Any(x => x.CampaignId == campaignId); return operationsInProcess.Any(x => x.CampaignId == campaignId);
} }
} }
} }