diff --git a/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs b/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs index 8df08c08..d724c613 100644 --- a/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs +++ b/PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs @@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; using PARR.API.Contracts.V1; +using PARR.API.Contracts.V1.Requests.BaseRequests; using PARR.API.Contracts.V1.Responses; using PARR.API.Contracts.V1.Responses.Base; using PARR.API.Contracts.V1.Responses.Statistics; @@ -54,7 +55,7 @@ namespace PARR.API.Controllers.V1.Statistics /// /// [HttpGet(ApiRoutes.StatTemplateDistribution.Get)] - public async Task Get([FromRoute] Guid jobGroupId) + public async Task Get([FromRoute] Guid jobGroupId, [FromQuery] TimeZoneOffsetClient timeZoneQuery) { // eadc5498-dba6-4f10-9b4b-a1653e3c3e61 @@ -113,7 +114,7 @@ namespace PARR.API.Controllers.V1.Statistics foreach (var groupedItem in grouped) { - var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value, workDays); + var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value, workDays, timeZoneQuery.TimeZoneOffsetHours); responseItemsList.Add(statResult); } } @@ -122,7 +123,7 @@ namespace PARR.API.Controllers.V1.Statistics // не нужно группировать по рабочим группам // сразу формируем response - responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), workDays)); + responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), workDays, timeZoneQuery.TimeZoneOffsetHours)); } var response = new StatTemplateDistributorResponse @@ -159,7 +160,7 @@ namespace PARR.API.Controllers.V1.Statistics return await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, jobGroup.DistributionConfig!.IsExcludeWeekends); } - private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List