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

feat(api): templateResponse переименовано поле

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-04 09:11:35 +10:00
parent e88818104b
commit 4a864bd18b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PARR.API/Contracts/V1/Responses/TemplateResponse.cs
View File

@@ -19,7 +19,7 @@
/// <summary> /// <summary>
/// NextRun с учетом ЗО /// NextRun с учетом ЗО
/// </summary> /// </summary>
public DateTimeOffset? NextRunWithResponseAreaOffset { get; set; } public DateTimeOffset? NextRunResponseAreaInLocal { get; set; }
public bool IsResponseAreaTimezone { get; set; } public bool IsResponseAreaTimezone { get; set; }

12
PARR.API/Controllers/V1/TemplateController.cs
View File

@@ -146,7 +146,7 @@ namespace PARR.API.Controllers.V1
{ {
//await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id)); //await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id));
await ApplyTemplateShortcodesAsync(responseItem, templatesDict[responseItem.Id]); await ApplyTemplateShortcodesAsync(responseItem, templatesDict[responseItem.Id]);
FillNextRunWithResponseAreaOffset(responseItem); FillNextRunWithResponseAreaInLocal(responseItem);
} }
//logger.LogDebug("Получение шорткодов: {ElapsedMs} мс", sw.ElapsedMilliseconds); //logger.LogDebug("Получение шорткодов: {ElapsedMs} мс", sw.ElapsedMilliseconds);
//sw.Stop(); //sw.Stop();
@@ -191,7 +191,7 @@ namespace PARR.API.Controllers.V1
var response = mapper.Map<TemplateResponse>(template); var response = mapper.Map<TemplateResponse>(template);
await ApplyTemplateShortcodesAsync(response, template); await ApplyTemplateShortcodesAsync(response, template);
FillNextRunWithResponseAreaOffset(response); FillNextRunWithResponseAreaInLocal(response);
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id }); var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0; response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
@@ -285,7 +285,7 @@ namespace PARR.API.Controllers.V1
var response = mapper.Map<TemplateListResponse>(templateToResponse); var response = mapper.Map<TemplateListResponse>(templateToResponse);
await ApplyTemplateShortcodesAsync(response, templateToResponse); await ApplyTemplateShortcodesAsync(response, templateToResponse);
FillNextRunWithResponseAreaOffset(response); FillNextRunWithResponseAreaInLocal(response);
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id }); var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0; response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
@@ -332,12 +332,12 @@ namespace PARR.API.Controllers.V1
/// <summary> /// <summary>
/// Заполнить NextRunWithResponseAreaOffset /// Заполнить NextRunResponseAreaInLocal
/// </summary> /// </summary>
/// <param name="response"></param> /// <param name="response"></param>
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) ? nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, response.ResponseArea)
: response.NextRun; : response.NextRun;
} }