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

feat(api): в StatTemplateDistribution добавлен query с таймзоной

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-01-27 16:36:40 +10:00
parent a59ad27e90
commit e60fbfdc3a
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
View File

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1; using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests.BaseRequests;
using PARR.API.Contracts.V1.Responses; using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base; using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics; using PARR.API.Contracts.V1.Responses.Statistics;
@@ -54,7 +55,7 @@ namespace PARR.API.Controllers.V1.Statistics
/// <param name="jobGroupId"></param> /// <param name="jobGroupId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet(ApiRoutes.StatTemplateDistribution.Get)] [HttpGet(ApiRoutes.StatTemplateDistribution.Get)]
public async Task<IActionResult> Get([FromRoute] Guid jobGroupId) public async Task<IActionResult> Get([FromRoute] Guid jobGroupId, [FromQuery] TimeZoneOffsetClient timeZoneQuery)
{ {
// eadc5498-dba6-4f10-9b4b-a1653e3c3e61 // eadc5498-dba6-4f10-9b4b-a1653e3c3e61
@@ -113,7 +114,7 @@ namespace PARR.API.Controllers.V1.Statistics
foreach (var groupedItem in grouped) 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); responseItemsList.Add(statResult);
} }
} }
@@ -122,7 +123,7 @@ namespace PARR.API.Controllers.V1.Statistics
// не нужно группировать по рабочим группам // не нужно группировать по рабочим группам
// сразу формируем response // сразу формируем 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 var response = new StatTemplateDistributorResponse
@@ -159,7 +160,7 @@ namespace PARR.API.Controllers.V1.Statistics
return await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, jobGroup.DistributionConfig!.IsExcludeWeekends); return await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, jobGroup.DistributionConfig!.IsExcludeWeekends);
} }
private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<Template> templates, List<DateOnly> workDays) private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<Template> templates, List<DateOnly> workDays, int timeZoneOffsetHours)
{ {
var result = new StatDistributorItemResponse var result = new StatDistributorItemResponse
{ {
@@ -174,7 +175,9 @@ namespace PARR.API.Controllers.V1.Statistics
}).ToList() }).ToList()
}; };
foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.Date))) //foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.Date)))
// смещаем по часовой зоне и группируем по дате
foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.AddHours(timeZoneOffsetHours).Date)))
{ {
var statisticsForDate = result.Statistics.FirstOrDefault(t => t.Date == templatesFromDate.Key); var statisticsForDate = result.Statistics.FirstOrDefault(t => t.Date == templatesFromDate.Key);
if (statisticsForDate == null) if (statisticsForDate == null)