Skip to content

Commit 883af94

Browse files
committed
change back to fix tests
Signed-off-by: Neil South <[email protected]>
1 parent f55ef05 commit 883af94

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,14 @@ internal sealed partial class PayloadAssembler : IPayloadAssembler, IDisposable,
5151
private readonly Task _intializedTask;
5252
private readonly BlockingCollection<Payload> _workItems;
5353
private readonly System.Timers.Timer _timer;
54-
private readonly IPayloadRepository _repository;
54+
//private readonly IPayloadRepository _repository;
5555

5656
public PayloadAssembler(
5757
ILogger<PayloadAssembler> logger,
5858
IServiceScopeFactory serviceScopeFactory)
5959
{
6060
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
6161
_serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
62-
var scope = _serviceScopeFactory.CreateScope();
63-
_repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
6462

6563
_workItems = [];
6664
_tokenSource = new CancellationTokenSource();
@@ -85,7 +83,9 @@ public PayloadAssembler(
8583
private async Task RemovePendingPayloads()
8684
{
8785
_logger.RemovingPendingPayloads();
88-
var removed = await _repository.RemovePendingPayloadsAsync().ConfigureAwait(false);
86+
var scope = _serviceScopeFactory.CreateScope();
87+
var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
88+
var removed = await repository.RemovePendingPayloadsAsync().ConfigureAwait(false);
8989

9090
_logger.TotalNumberOfPayloadsRemoved(removed);
9191
}
@@ -200,7 +200,9 @@ private async Task QueueBucketForNotification(string key, Payload payload)
200200
{
201201
payload.State = Payload.PayloadState.Move;
202202
var scope = _serviceScopeFactory.CreateScope();
203-
await _repository.UpdateAsync(payload).ConfigureAwait(false);
203+
204+
var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
205+
await repository.UpdateAsync(payload).ConfigureAwait(false);
204206
_logger.PayloadSaved(payload.PayloadId);
205207
_workItems.Add(payload);
206208
_logger.BucketReady(key, payload.Count);
@@ -227,7 +229,9 @@ private async Task<Payload> CreateOrGetPayload(string key, string correlationId,
227229
private async Task<Payload> PayloadFactory(string key, string correlationId, string? workflowInstanceId, string? taskId, Messaging.Events.DataOrigin dataOrigin, uint timeout, CancellationToken cancellationToken)
228230
{
229231
var newPayload = new Payload(key, correlationId, workflowInstanceId, taskId, dataOrigin, timeout, null);
230-
await _repository.AddAsync(newPayload, cancellationToken).ConfigureAwait(false);
232+
var scope = _serviceScopeFactory.CreateScope();
233+
var repository = scope.ServiceProvider.GetRequiredService<IPayloadRepository>();
234+
await repository.AddAsync(newPayload, cancellationToken).ConfigureAwait(false);
231235
_logger.BucketCreated(key, timeout);
232236
return newPayload;
233237
}

0 commit comments

Comments
 (0)