mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(orderLoader): generationDate берется из nextRun/lastRun

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-02-27 09:20:57 +10:00
parent 883d2d69f0
commit 7197d96ab9
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
PARR.EsppOrderLoader/Services/OrderItemService.cs
View File

@@ -53,8 +53,8 @@ namespace PARR.EsppOrderLoader.Services
StatusCode = (int)orderStatusService.GetOrderStatusByName(esppOrder.Status), StatusCode = (int)orderStatusService.GetOrderStatusByName(esppOrder.Status),
GenerateDate = template == null ? GenerateDate = template == null ?
null null
: CalcGenerationDate(template.ApplicationsInWork!.NextRun), : CalcGenerationDate(template.ApplicationsInWork!.NextRun, template.ApplicationsInWork!.LastRun),
//CalcGenerationDate(esppOrder.ExpirationDateUTC, template.ApplicationsInWork!.TemplateDurationTimeSpan), //CalcGenerationDate(esppOrder.ExpirationDateUTC, template.ApplicationsInWork!.TemplateDurationTimeSpan),
ExpirationDate = esppOrder.ExpirationDateUTC ExpirationDate = esppOrder.ExpirationDateUTC
}; };
@@ -100,24 +100,16 @@ namespace PARR.EsppOrderLoader.Services
/// <summary> /// <summary>
/// Рассчет GenerationDate относительно текущей даты и nextRun из ApplicationInWorks /// Рассчет GenerationDate относительно текущей даты и nextRun из ApplicationInWorks
/// </summary> /// </summary>
/// <param name="expirationDateUTC"></param>
/// <param name="nextRun"></param>
/// <returns></returns> /// <returns></returns>
private DateTimeOffset? CalcGenerationDate(DateTimeOffset nextRun) private DateTimeOffset? CalcGenerationDate(DateTimeOffset nextRun, DateTimeOffset? lastRun)
{ {
var date = DateTimeOffset.UtcNow; if (DateTimeOffset.UtcNow < nextRun)
return nextRun;
if (lastRun.HasValue)
return lastRun.Value;
return null;
// подумать о переходе суток.
// подумать о NextRun, если он уже пересчитался
//DateCreated = dtUtcNow
var generationDate = new DateTimeOffset(2024, 2, 26, 12, 36, 0, new TimeSpan(0));
return generationDate;
} }
} }