on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Переписан метод ValidateWithDbAsync

Browse Source
This commit is contained in:
Olga Nemt 2024-01-24 11:18:58 +05:00
parent 6738a30592
commit f9504aea21
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
AsbCloudInfrastructure/Repository/WellOperationRepository.cs
View File

@ -22,6 +22,8 @@ namespace AsbCloudInfrastructure.Repository;
public class WellOperationRepository : IWellOperationRepository public class WellOperationRepository : IWellOperationRepository
{ {
private const string KeyCacheSections = "OperationsBySectionSummarties"; private const string KeyCacheSections = "OperationsBySectionSummarties";
private const int Gap = 90;
private readonly IAsbCloudDbContext db; private readonly IAsbCloudDbContext db;
private readonly IMemoryCache memoryCache; private readonly IMemoryCache memoryCache;
private readonly IWellService wellService; private readonly IWellService wellService;
@ -344,21 +346,31 @@ public class WellOperationRepository : IWellOperationRepository
OperationType = firstOperation.IdType, OperationType = firstOperation.IdType,
}; };
var operationWithMaxDateStart = await BuildQuery(request) var entities = await BuildQuery(request)
.OrderByDescending(o => o.DateStart) .AsNoTracking()
.FirstOrDefaultAsync(token); .ToArrayAsync(token)
.ConfigureAwait(false);
if (operationWithMaxDateStart is null) if (!entities.Any())
return Validate(wellOperationDtos); return Validate(wellOperationDtos);
var maxOperationDateStart = operationWithMaxDateStart.DateStart; var wellOperationsUnion = entities.Union(wellOperationDtos).OrderBy(o => o.DateStart).ToArray();
foreach (var dto in wellOperationDtos)
{
var currentOperationDateStart = dto.DateStart.ToUniversalTime();
if (maxOperationDateStart!.AddMonths(3) < currentOperationDateStart)
return false;
maxOperationDateStart = currentOperationDateStart; for(var i = 1; i < wellOperationsUnion.Count(); i++)
{
var prevOperation = wellOperationsUnion[i - 1];
var currentOperation = wellOperationsUnion[i];
var prevOperationDateStart = prevOperation.DateStart.ToUniversalTime();
var currentOperationDateStart = currentOperation.DateStart.ToUniversalTime();
var prevOperationDateEnd = prevOperation.DateStart.AddHours(prevOperation.DurationHours).ToUniversalTime();
var currrentOperationDateEnd = currentOperation.DateStart.AddHours(currentOperation.DurationHours).ToUniversalTime();
if (currentOperation.Id == 0 && ((prevOperationDateStart.AddDays(Gap) < currentOperationDateStart) || (prevOperationDateEnd >= currrentOperationDateEnd)))
{
return false;
}
} }
return true; return true;
} }
@ -375,7 +387,7 @@ public class WellOperationRepository : IWellOperationRepository
foreach (var dto in wellOperationDtos) foreach (var dto in wellOperationDtos)
{ {
var currentOperationDateStart = dto.DateStart.ToUniversalTime(); var currentOperationDateStart = dto.DateStart.ToUniversalTime();
if (maxOperationDateStart.AddMonths(3) < currentOperationDateStart) if (maxOperationDateStart.AddDays(Gap) < currentOperationDateStart)
return false; return false;
maxOperationDateStart = currentOperationDateStart; maxOperationDateStart = currentOperationDateStart;