Skip to content

Commit 90e4fed

Browse files
committed
changes after convo
1 parent 8797e9d commit 90e4fed

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

DotNet/DataAcquisition.Domain/Application/Managers/DataAcquisitionLogManager.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public async Task UpdateTailFlagForFacilityCorrelationIdReportTrackingId(List<lo
208208

209209
public async Task ThrottleFacilityAcquisitions(string facilityId, DateTime executionDate, CancellationToken cancellationToken = default)
210210
{
211-
var lastId = 0;
211+
long? lastId = null;
212212
var batchSize = 1000;
213213
while (true)
214214
{
@@ -227,6 +227,8 @@ public async Task ThrottleFacilityAcquisitions(string facilityId, DateTime execu
227227
}
228228

229229
await _database.DataAcquisitionLogRepository.SaveChangesAsync();
230+
231+
lastId = toThrottle.Max(l => l.Id);
230232
}
231233
}
232234
}

DotNet/DataAcquisition.Domain/Application/Queries/DataAcquisitionLogQueries.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,9 +575,7 @@ public async Task<List<DataAcquisitionLogModel>> GetNextEligibleBatchForFacility
575575
&& (lastId == null || log.Id > lastId)
576576
&& (log.ExecutionDate == null || log.ExecutionDate <= designagtedExecutionTime)
577577
&& (log.Status == null || statuses.Contains(log.Status.Value))
578-
orderby log.Priority ascending,
579-
log.ExecutionDate ascending,
580-
log.Id ascending
578+
orderby log.Id
581579
select new DataAcquisitionLogModel
582580
{
583581
Id = log.Id,

DotNet/DataAcquisition.Domain/Application/Services/PatientDataService.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,7 @@ public async Task CreateLogEntries(GetPatientDataRequest request, CancellationTo
227227
{
228228
if (request.QueryPlanType == QueryPlanType.Initial)
229229
{
230-
var priority = schedReport.ReportTypes?.Any(t => t.Equals("Daily", StringComparison.OrdinalIgnoreCase)) == true
231-
? AcquisitionPriority.High : AcquisitionPriority.Normal;
230+
var priority = schedReport.Frequency == Frequency.Daily ? AcquisitionPriority.High : AcquisitionPriority.Normal;
232231

233232
try
234233
{
@@ -325,8 +324,7 @@ public async Task ExecuteLogRequest(AcquisitionRequest request, CancellationToke
325324
throw new ArgumentException($"Log with ID {request.logId} does not exist.");
326325
}
327326

328-
var now = DateTime.UtcNow;
329-
if(log.ExecutionDate > DateTime.UtcNow)
327+
if(log.ExecutionDate > DateTime.UtcNow)
330328
{
331329
throw new ProcessingDelayException(@$"Log Exection Date {log.ExecutionDate} indicates a future processing time.");
332330
}
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
using LantanaGroup.Link.Shared.Application.Utilities;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Linq;
5-
using System.Text;
6-
using System.Threading.Tasks;
72

83
namespace LantanaGroup.Link.DataAcquisition.Domain.Infrastructure.Models.Enums;
94
public enum AcquisitionPriority
@@ -14,4 +9,4 @@ public enum AcquisitionPriority
149
High = 1,
1510
[StringValue("Critical")]
1611
Critical = 0
17-
}
12+
}

0 commit comments

Comments
 (0)