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

fix(api,dal,nextRun): исправлена логика рассчета nextRun для шаблонов с параметром IsResponseAreaTimezone

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-02-05 15:41:36 +10:00
parent 0264ac9d52
commit 930e215089
13 changed files with 352 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
PARR.API/Contracts/V1/Responses/Statistics/StatTemplateDistributorResponse.cs
View File

@@ -56,5 +56,6 @@
public DateTimeOffset NextRun { get; set; }
public bool IsActiveTemplate { get; set; }
public bool IsActiveSchedular { get; set; }
public required ScheduleResponseAreaTimeOffsetResponse ResponseAreaOffset { get; set; }
}
}

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

@@ -16,10 +16,10 @@
public DateTimeOffset NextRun { get; set; }
/// <summary>
/// NextRun с учетом ЗО (локальное время по ЗО, не UTC)
/// </summary>
public DateTimeOffset? NextRunResponseAreaInLocal { get; set; }
///// <summary>
///// NextRun с учетом ЗО (локальное время по ЗО, не UTC)
///// </summary>
//public DateTimeOffset? NextRunResponseAreaInLocal { get; set; }
public bool IsResponseAreaTimezone { get; set; }
@@ -45,7 +45,7 @@
public bool IsAutoDistributionEnabled { get; set; }
public ScheduleResponseAreaTimeOffsetResponse? Timezone { get; set; }
public ScheduleResponseAreaTimeOffsetResponse? ResponseAreaOffset { get; set; }
}

2
PARR.API/Controllers/V1/ResponseAreaController.cs
View File

@@ -3,12 +3,10 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using PARR.API.Contracts.V1;
using PARR.API.Contracts.V1.Requests.Queries;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Controllers.V1.Base;
using PARR.Constants;
using PARR.DAL.DomainModels;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1

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

@@ -15,6 +15,7 @@ using PARR.DAL.Models.Job;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
using PARR.DAL.Services.Interfaces.Job;
using PARR.DAL.Services.Interfaces.Schedule;
namespace PARR.API.Controllers.V1.Statistics
{
@@ -30,6 +31,7 @@ namespace PARR.API.Controllers.V1.Statistics
private readonly IShortcodesService shortcodesService;
private readonly INextRunService nextRunService;
private readonly ILogger<StatTemplateDistributionController> logger;
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
public StatTemplateDistributionController(
ITemplateService templateService,
@@ -37,7 +39,8 @@ namespace PARR.API.Controllers.V1.Statistics
IMapper mapper,
IShortcodesService shortcodesService,
INextRunService nextRunService,
ILogger<StatTemplateDistributionController> logger
ILogger<StatTemplateDistributionController> logger,
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
)
{
this.templateService = templateService;
@@ -46,6 +49,7 @@ namespace PARR.API.Controllers.V1.Statistics
this.shortcodesService = shortcodesService;
this.nextRunService = nextRunService;
this.logger = logger;
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
}
@@ -77,7 +81,8 @@ namespace PARR.API.Controllers.V1.Statistics
.Where(t => t.Job!.GroupId == jobGroupId && t.StatusTypeId == TemplateStatusTypeEnum.Used)
.Select(t => new
{
WorkGroup = t.Job!.WorkGroupMask,
WorkGroupMask = t.Job!.WorkGroupMask,
ResponseAreaMask = t.Job!.ResponseAreaMask,
Template = t
})
.AsNoTracking()
@@ -108,23 +113,24 @@ namespace PARR.API.Controllers.V1.Statistics
// тут группируем по рабочим группам
// Получаем список пар (WorkGroupName, Template)
var templatesWithWorkGroupNames = new List<(string WorkGroupName, Template Template)>();
var templatesWithWorkGroupNames = new List<(string WorkGroupName, (Template Template, string ResponseArea))>();
// получаем названия рабочих групп
// получаем названия рабочих групп и ЗО
foreach (var item in items)
{
var workGroupName = await shortcodesService.ApplyShortcodesAsync(item.WorkGroup, item.Template);
templatesWithWorkGroupNames.Add((workGroupName, item.Template));
var workGroupName = await shortcodesService.ApplyShortcodesAsync(item.WorkGroupMask, item.Template);
var responseArea = await shortcodesService.ApplyShortcodesAsync(item.ResponseAreaMask, item.Template);
templatesWithWorkGroupNames.Add((workGroupName, (item.Template, responseArea)));
}
// Группируем по WorkGroupName
var grouped = templatesWithWorkGroupNames
.GroupBy(x => x.WorkGroupName)
.ToDictionary(g => g.Key, g => g.Select(x => x.Template).ToList());
.ToDictionary(g => g.Key, g => g.Select(x => x.Item2).ToList());
foreach (var groupedItem in grouped)
{
var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value, workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate);
var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value.ToList(), workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate);
responseItemsList.Add(statResult);
}
}
@@ -132,8 +138,16 @@ namespace PARR.API.Controllers.V1.Statistics
{
// не нужно группировать по рабочим группам
// получаем названия ЗО
var templatesWithResponseArea = new List<(Template Template, string ResponseArea)>();
foreach (var item in items)
{
var responseArea = await shortcodesService.ApplyShortcodesAsync(item.ResponseAreaMask, item.Template);
templatesWithResponseArea.Add((item.Template, responseArea));
}
// сразу формируем response
responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate));
responseItemsList.Add(GetResponseByWorkGroup(null, templatesWithResponseArea, workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate));
}
var response = new StatTemplateDistributorResponse
@@ -180,11 +194,11 @@ namespace PARR.API.Controllers.V1.Statistics
/// Заполнить респонс
/// </summary>
/// <param name="workGroupName"></param>
/// <param name="templates"></param>
/// <param name="templateList"></param>
/// <param name="workDays"></param>
/// <param name="timeZoneOffsetHours"></param>
/// <returns></returns>
private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<Template> templates, List<DateOnly> workDays, HashSet<DateOnly> weekends, int timeZoneOffsetHours, DateTimeOffset referenceDate)
private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<(Template Template, string ResponseArea)> templateList, List<DateOnly> workDays, HashSet<DateOnly> weekends, int timeZoneOffsetHours, DateTimeOffset referenceDate)
{
var result = new StatDistributorItemResponse
{
@@ -202,7 +216,8 @@ namespace PARR.API.Controllers.V1.Statistics
//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)))
//foreach (var templatesFromDate in templates.GroupBy(t => DateOnly.FromDateTime(t.NextRun.AddHours(timeZoneOffsetHours).Date)))
foreach (var templatesFromDate in templateList.GroupBy(t => DateOnly.FromDateTime(t.Template.NextRun.AddHours(timeZoneOffsetHours).Date)))
{
var statisticsForDate = result.Statistics.FirstOrDefault(t => DateOnly.FromDateTime(t.Date.AddHours(timeZoneOffsetHours).Date) == templatesFromDate.Key);
if (statisticsForDate == null)
@@ -212,14 +227,15 @@ namespace PARR.API.Controllers.V1.Statistics
}
statisticsForDate.AllCount = templatesFromDate.Count();
statisticsForDate.IsDeactivatedCount = templatesFromDate.Count(t => !t.IsActiveTemplate || !t.IsActiveSchedule);
statisticsForDate.IsActivatedCount = templatesFromDate.Count(t => t.IsActiveTemplate && t.IsActiveSchedule);
statisticsForDate.IsDeactivatedCount = templatesFromDate.Count(t => !t.Template.IsActiveTemplate || !t.Template.IsActiveSchedule);
statisticsForDate.IsActivatedCount = templatesFromDate.Count(t => t.Template.IsActiveTemplate && t.Template.IsActiveSchedule);
statisticsForDate.Templates = templatesFromDate.Select(t => new StatTempleteDistribItem
{
Name = t.Name,
IsActiveSchedular = t.IsActiveSchedule,
IsActiveTemplate = t.IsActiveTemplate,
NextRun = t.NextRun
Name = t.Template.Name,
IsActiveSchedular = t.Template.IsActiveSchedule,
IsActiveTemplate = t.Template.IsActiveTemplate,
NextRun = t.Template.NextRun,
ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(t.ResponseArea))
})
.OrderBy(t => t.Name)
.ToList();

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

@@ -76,21 +76,6 @@ namespace PARR.API.Controllers.V1
{
var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
//IQueryable<Template> query = templateService.GetWithIncludes().AsNoTracking()
// .Include(t => t.Unit).ThenInclude(t => t!.UnitValues).ThenInclude(t => t.Field)
// .Include(t => t.Unit).ThenInclude(t => t!.UnitValues).ThenInclude(t => t.Value)
// .Include(t => t.RobotConfigurations).ThenInclude(t => t.Robot)
// .Include(t => t.RobotConfigurations).ThenInclude(t => t.TaskStatus)
// .Include(t => t.RobotConfigurations).ThenInclude(t => t.RobotStatus)
// .Include(t => t.Orders)
// .Include(t => t.StatusType)
// .Include(t => t.Job).ThenInclude(t => t.Group).ThenInclude(t => t.ScheduleExcludeType)
// .Include(t => t.Job).ThenInclude(t => t.Group).ThenInclude(t => t.ScheduleExcludeTypeCalendar)
// .OrderBy(t => t.Name)
// .AsSplitQuery();
//var sw = Stopwatch.StartNew();
IQueryable<Template> query = templateService.Get()
.Include(t => t.Unit).ThenInclude(t => t!.UnitValues).ThenInclude(t => t.Field)
.Include(t => t.Unit).ThenInclude(t => t!.UnitValues).ThenInclude(t => t.Value)
@@ -153,7 +138,7 @@ namespace PARR.API.Controllers.V1
{
//await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id));
await ApplyTemplateShortcodesAsync(responseItem, templatesDict[responseItem.Id]);
FillNextRunWithResponseAreaInLocal(responseItem);
FillResponseAreaOffset(responseItem);
}
//logger.LogDebug("Получение шорткодов: {ElapsedMs} мс", sw.ElapsedMilliseconds);
//sw.Stop();
@@ -198,7 +183,7 @@ namespace PARR.API.Controllers.V1
var response = mapper.Map<TemplateResponse>(template);
await ApplyTemplateShortcodesAsync(response, template);
FillNextRunWithResponseAreaInLocal(response);
FillResponseAreaOffset(response);
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
@@ -292,7 +277,7 @@ namespace PARR.API.Controllers.V1
var response = mapper.Map<TemplateListResponse>(templateToResponse);
await ApplyTemplateShortcodesAsync(response, templateToResponse);
FillNextRunWithResponseAreaInLocal(response);
FillResponseAreaOffset(response);
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
@@ -339,23 +324,34 @@ namespace PARR.API.Controllers.V1
/// <summary>
/// Заполнить NextRunResponseAreaInLocal
/// Заполнить ResponseAreaOffset
/// </summary>
/// <param name="response"></param>
private void FillNextRunWithResponseAreaInLocal(TemplateBaseResponse response)
private void FillResponseAreaOffset(TemplateBaseResponse response)
{
var responseArea = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
? response.ResponseArea
: settingsFromDb.DefaultResponseAreaToTimeOffset;
// если стоит галка IsResponseAreaTimezone и есть ЗО, то возвращаем оффсет
if (response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea))
{
var responseArea = response.ResponseArea;
response.ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
}
else
{
response.ResponseAreaOffset = null;
}
//var responseArea = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
// ? response.ResponseArea
// : settingsFromDb.DefaultResponseAreaToTimeOffset;
//response.NextRunResponseAreaInLocal = response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea)
// ? nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, response.ResponseArea)
// // возвращаем в дефолтной зоне
// : nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, settingsFromDb.DefaultResponseAreaToTimeOffset);
response.NextRunResponseAreaInLocal = nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, responseArea);
//response.NextRunResponseAreaInLocal = nextRunService.GetNextRunWithResponseAreaOffset(response.NextRun, responseArea);
response.Timezone = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
//response.ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
}
}