From 4a864bd18bae92670ff9274cd2cb5de31b6ea65f Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 4 Feb 2026 09:11:35 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20templateResponse=20=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B5=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=BB=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Contracts/V1/Responses/TemplateResponse.cs | 2 +- PARR.API/Controllers/V1/TemplateController.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs index 9b027a7f..415e8892 100644 --- a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs +++ b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs @@ -19,7 +19,7 @@ /// /// NextRun с учетом ЗО /// - public DateTimeOffset? NextRunWithResponseAreaOffset { get; set; } + public DateTimeOffset? NextRunResponseAreaInLocal { get; set; } public bool IsResponseAreaTimezone { get; set; } diff --git a/PARR.API/Controllers/V1/TemplateController.cs b/PARR.API/Controllers/V1/TemplateController.cs index 3a093f56..885037e4 100644 --- a/PARR.API/Controllers/V1/TemplateController.cs +++ b/PARR.API/Controllers/V1/TemplateController.cs @@ -146,7 +146,7 @@ namespace PARR.API.Controllers.V1 { //await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id)); await ApplyTemplateShortcodesAsync(responseItem, templatesDict[responseItem.Id]); - FillNextRunWithResponseAreaOffset(responseItem); + FillNextRunWithResponseAreaInLocal(responseItem); } //logger.LogDebug("Получение шорткодов: {ElapsedMs} мс", sw.ElapsedMilliseconds); //sw.Stop(); @@ -191,7 +191,7 @@ namespace PARR.API.Controllers.V1 var response = mapper.Map(template); await ApplyTemplateShortcodesAsync(response, template); - FillNextRunWithResponseAreaOffset(response); + FillNextRunWithResponseAreaInLocal(response); var ordersCountResult = await GetOrdersCountAsync(new List { response.Id }); response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0; @@ -285,7 +285,7 @@ namespace PARR.API.Controllers.V1 var response = mapper.Map(templateToResponse); await ApplyTemplateShortcodesAsync(response, templateToResponse); - FillNextRunWithResponseAreaOffset(response); + FillNextRunWithResponseAreaInLocal(response); var ordersCountResult = await GetOrdersCountAsync(new List { response.Id }); response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0; @@ -332,12 +332,12 @@ namespace PARR.API.Controllers.V1 /// - /// Заполнить NextRunWithResponseAreaOffset + /// Заполнить NextRunResponseAreaInLocal /// /// - private void FillNextRunWithResponseAreaOffset(TemplateBaseResponse response) + private void FillNextRunWithResponseAreaInLocal(TemplateBaseResponse response) { - response.NextRunWithResponseAreaOffset = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea) + response.NextRunResponseAreaInLocal = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea) ? nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, response.ResponseArea) : response.NextRun; }