feat(api,dal): templateController - убрана страрая логика ЗО. StatTemplateDistributorController - обновлена логика отображения статистики
This commit is contained in:
Mikhail Trubnikov
@@ -29,7 +29,7 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
private readonly IJobGroupService jobGroupService;
|
||||
private readonly IMapper mapper;
|
||||
private readonly IShortcodesService shortcodesService;
|
||||
private readonly INextRunService nextRunService;
|
||||
private readonly INextRunServiceV2 nextRunService;
|
||||
private readonly ILogger<StatTemplateDistributionController> logger;
|
||||
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
|
||||
|
||||
@@ -38,7 +38,7 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
IJobGroupService jobGroupService,
|
||||
IMapper mapper,
|
||||
IShortcodesService shortcodesService,
|
||||
INextRunService nextRunService,
|
||||
INextRunServiceV2 nextRunService,
|
||||
ILogger<StatTemplateDistributionController> logger,
|
||||
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
|
||||
)
|
||||
@@ -63,8 +63,6 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
{
|
||||
// eadc5498-dba6-4f10-9b4b-a1653e3c3e61
|
||||
|
||||
//TODO: похоже что timeZoneQuery лишняя
|
||||
|
||||
var jobGroup = await jobGroupService.Get()
|
||||
.Include(t => t.DistributionConfig)
|
||||
.ThenInclude(t => t.DistributionPeriod)
|
||||
@@ -95,65 +93,86 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
ItemsList = null
|
||||
}, true));
|
||||
|
||||
var (dateStart, dateEnd) = GetStartEndPeriod(jobGroup, items.Max(t => t.Template.NextRun), timeZoneQuery.TimeZoneOffsetHours);
|
||||
|
||||
var (dateStart, dateEnd) = GetStartEndPeriod(jobGroup, items.Min(t => t.Template.NextRun), items.Max(t => t.Template.NextRun), timeZoneQuery.TimeZoneOffset);
|
||||
|
||||
// получаем список рабочих дней
|
||||
// получет все дни, даже с выходными, чтоб видеть реальную картину
|
||||
var workDays = await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, false, jobGroup.ReferenceDate);
|
||||
var allDays = await nextRunService.GetWorkDaysAsync(dateStart, dateEnd, false);
|
||||
|
||||
// получить список выходных дней (показываем только если IsExcludeWeekends = true)
|
||||
var weekends = jobGroup.DistributionConfig.IsExcludeWeekends
|
||||
? await nextRunService.GetWeekendsAsync(dateStart, dateEnd, jobGroup.ReferenceDate)
|
||||
? await nextRunService.GetWeekendsAsync(dateStart, dateEnd)
|
||||
: new HashSet<DateOnly>();
|
||||
|
||||
|
||||
var responseItemsList = new List<StatDistributorItemResponse>();
|
||||
|
||||
if (jobGroup.DistributionConfig.IsGroupingByWorkGroup)
|
||||
{
|
||||
// тут группируем по рабочим группам
|
||||
logger.LogDebug("Группируем по рабочим группам");
|
||||
|
||||
// Получаем список пар (WorkGroupName, Template)
|
||||
var templatesWithWorkGroupNames = new List<(string WorkGroupName, (Template Template, string ResponseArea))>();
|
||||
var templatesWithWorkGroupNames = new List<(string WorkGroupName, Template Template)>();
|
||||
|
||||
// получаем названия рабочих групп и ЗО
|
||||
// получаем названия рабочих групп
|
||||
foreach (var item in items)
|
||||
{
|
||||
var workGroupName = await shortcodesService.ApplyShortcodesAsync(item.WorkGroupMask, item.Template);
|
||||
var responseArea = await shortcodesService.ApplyShortcodesAsync(item.ResponseAreaMask, item.Template);
|
||||
templatesWithWorkGroupNames.Add((workGroupName, (item.Template, responseArea)));
|
||||
templatesWithWorkGroupNames.Add((workGroupName, item.Template));
|
||||
}
|
||||
|
||||
// Группируем по WorkGroupName
|
||||
var grouped = templatesWithWorkGroupNames
|
||||
.GroupBy(x => x.WorkGroupName)
|
||||
.ToDictionary(g => g.Key, g => g.Select(x => x.Item2).ToList());
|
||||
.ToDictionary(g => g.Key, g => g.Select(x => x.Template).ToList());
|
||||
|
||||
foreach (var groupedItem in grouped)
|
||||
{
|
||||
var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value.ToList(), workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate);
|
||||
var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value.ToList(), allDays, weekends, timeZoneQuery.TimeZoneOffset);
|
||||
responseItemsList.Add(statResult);
|
||||
}
|
||||
}
|
||||
else if (jobGroup.IsResponseAreaTimezone && !jobGroup.DistributionConfig.IsGroupingByWorkGroup)
|
||||
{
|
||||
// грппируем только по ЗО
|
||||
logger.LogDebug("Группируем по ЗО");
|
||||
|
||||
// Будет группироваться по EsppValue, по MSK, MSK+1...
|
||||
// получаем названия ЗО, из ЗО часовой пояс, формируем список шаблонов с часовым поясом ЗО
|
||||
var templatesWithTimeZone = new List<(Template Template, string MskTimeZone)>();
|
||||
foreach (var item in items)
|
||||
{
|
||||
var responseArea = await shortcodesService.ApplyShortcodesAsync(item.ResponseAreaMask, item.Template);
|
||||
var mskTimeZone = scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea);
|
||||
templatesWithTimeZone.Add((item.Template, mskTimeZone.EsppValue));
|
||||
}
|
||||
|
||||
// Группируем по часовому поясу
|
||||
var grouped = templatesWithTimeZone
|
||||
.GroupBy(x => x.MskTimeZone)
|
||||
.ToDictionary(g => g.Key, g => g.Select(x => x.Template).ToList());
|
||||
|
||||
foreach (var groupedItem in grouped)
|
||||
{
|
||||
var statResult = GetResponseByWorkGroup(groupedItem.Key, groupedItem.Value.ToList(), allDays, weekends, timeZoneQuery.TimeZoneOffset);
|
||||
responseItemsList.Add(statResult);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// не нужно группировать по рабочим группам
|
||||
|
||||
// получаем названия ЗО
|
||||
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));
|
||||
}
|
||||
// не нужно группировать
|
||||
logger.LogDebug("Без группировки");
|
||||
|
||||
// сразу формируем response
|
||||
responseItemsList.Add(GetResponseByWorkGroup(null, templatesWithResponseArea, workDays, weekends, timeZoneQuery.TimeZoneOffsetHours, jobGroup.ReferenceDate));
|
||||
responseItemsList.Add(GetResponseByWorkGroup(null, items.Select(t => t.Template).ToList(), allDays, weekends, timeZoneQuery.TimeZoneOffset));
|
||||
}
|
||||
|
||||
var response = new StatTemplateDistributorResponse
|
||||
{
|
||||
JobGroup = mapper.Map<JobGroupWithDistributionConfigResponse>(jobGroup),
|
||||
ItemsList = responseItemsList.OrderBy(t => t.WorkGroupName).ToList()
|
||||
ItemsList = responseItemsList.OrderBy(t => t.GroupFieldName).ToList()
|
||||
};
|
||||
|
||||
return Ok(new Response<StatTemplateDistributorResponse>(response, true));
|
||||
@@ -163,29 +182,33 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
/// Получить дату начала и конца периода
|
||||
/// </summary>
|
||||
/// <param name="jobGroup"></param>
|
||||
/// <param name="minNextRunTemplate"></param>
|
||||
/// <param name="maxNextRunTemplate"></param>
|
||||
/// <param name="timeZoneOffsetHours"></param>
|
||||
/// <param name="clientOffset"></param>
|
||||
/// <returns></returns>
|
||||
private (DateOnly dateStart, DateOnly dateEnd) GetStartEndPeriod(JobGroup jobGroup, DateTimeOffset maxNextRunTemplate, int timeZoneOffsetHours)
|
||||
private (DateOnly dateStart, DateOnly dateEnd) GetStartEndPeriod(JobGroup jobGroup, DateTimeOffset minNextRunTemplate, DateTimeOffset maxNextRunTemplate, TimeSpan clientOffset)
|
||||
{
|
||||
var durationDays = nextRunService.GetDurationDays(jobGroup.DistributionConfig!);
|
||||
|
||||
var dateStart = DateOnly.FromDateTime(DateTime.UtcNow.AddHours(timeZoneOffsetHours));
|
||||
var dateStart = DateOnly.FromDateTime(DateTime.UtcNow.Add(clientOffset));
|
||||
|
||||
// последний день, не может быть меньше чем durationDays
|
||||
var dateEnd = dateStart.AddDays(durationDays);
|
||||
|
||||
// последний день, не может быть меньше чем refDate+durationDays
|
||||
var sumRefDuration = DateOnly.FromDateTime(jobGroup.ReferenceDate.AddHours(timeZoneOffsetHours).AddDays(durationDays).Date);
|
||||
var sumRefDuration = DateOnly.FromDateTime(jobGroup.ReferenceDate.Add(clientOffset).AddDays(durationDays).Date);
|
||||
if (dateEnd < sumRefDuration)
|
||||
dateEnd = sumRefDuration;
|
||||
|
||||
// с DateEnd вообще какая-то шурпатня :(
|
||||
// как наглядно понять ок не ок распределяется, если на каком-то графике dateEnd может ухеать за период распределения
|
||||
// последний день, не может быть меньше чем дата последнего шаблона maxNextRunTemplate
|
||||
var lastTempalteDate = DateOnly.FromDateTime(maxNextRunTemplate.AddHours(timeZoneOffsetHours).Date);
|
||||
if (dateEnd < lastTempalteDate)
|
||||
dateEnd = lastTempalteDate;
|
||||
var lastTemplateDate = DateOnly.FromDateTime(maxNextRunTemplate.Add(clientOffset).Date);
|
||||
if (dateEnd < lastTemplateDate)
|
||||
dateEnd = lastTemplateDate;
|
||||
|
||||
// Дата начала, не может быть меньше чем minNextRunTemplate
|
||||
var minNextRunDate = DateOnly.FromDateTime(minNextRunTemplate.Add(clientOffset).Date);
|
||||
if (dateStart < minNextRunDate)
|
||||
dateStart = minNextRunDate;
|
||||
|
||||
return (dateStart, dateEnd);
|
||||
}
|
||||
@@ -193,49 +216,49 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
/// <summary>
|
||||
/// Заполнить респонс
|
||||
/// </summary>
|
||||
/// <param name="workGroupName"></param>
|
||||
/// <param name="groupFieldName"></param>
|
||||
/// <param name="templateList"></param>
|
||||
/// <param name="workDays"></param>
|
||||
/// <param name="timeZoneOffsetHours"></param>
|
||||
/// <param name="allDays"></param>
|
||||
/// <param name="weekends"></param>
|
||||
/// <param name="clientOffset"></param>
|
||||
/// <returns></returns>
|
||||
private StatDistributorItemResponse GetResponseByWorkGroup(string? workGroupName, List<(Template Template, string ResponseArea)> templateList, List<DateOnly> workDays, HashSet<DateOnly> weekends, int timeZoneOffsetHours, DateTimeOffset referenceDate)
|
||||
private StatDistributorItemResponse GetResponseByWorkGroup(string? groupFieldName, List<Template> templateList, List<DateOnly> allDays, HashSet<DateOnly> weekends, TimeSpan clientOffset)
|
||||
{
|
||||
var result = new StatDistributorItemResponse
|
||||
{
|
||||
WorkGroupName = workGroupName,
|
||||
Statistics = workDays.OrderBy(t => t).Select(t => new StatTemplateDistributorDateStat
|
||||
GroupFieldName = groupFieldName,
|
||||
Statistics = allDays.OrderBy(t => t).Select(t => new StatTemplateDistributorDateStat
|
||||
{
|
||||
AllCount = 0,
|
||||
Date = new DateTimeOffset(t.Year, t.Month, t.Day, referenceDate.Hour, referenceDate.Minute, referenceDate.Second, referenceDate.Offset),
|
||||
// вычтем clientOffset, чтоб когда на клиенте он прибавился обратно, дата стала верной для клиента
|
||||
Date = new DateTimeOffset(t.Year, t.Month, t.Day, 0, 0, 0, TimeSpan.Zero).Add(-clientOffset),
|
||||
IsWorkDay = !weekends.Contains(t),
|
||||
IsActivatedCount = 0,
|
||||
IsDeactivatedCount = 0,
|
||||
Templates = new List<StatTempleteDistribItem>()
|
||||
Templates = new List<StatTemplateDistribItem>()
|
||||
}).ToList()
|
||||
};
|
||||
|
||||
//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 templateList.GroupBy(t => DateOnly.FromDateTime(t.Template.NextRun.AddHours(timeZoneOffsetHours).Date)))
|
||||
// смещаем по часовой зоне клиента и группируем по дате
|
||||
foreach (var templatesFromDate in templateList.GroupBy(t => DateOnly.FromDateTime(t.NextRun.Add(clientOffset).Date)))
|
||||
{
|
||||
var statisticsForDate = result.Statistics.FirstOrDefault(t => DateOnly.FromDateTime(t.Date.AddHours(timeZoneOffsetHours).Date) == templatesFromDate.Key);
|
||||
var statisticsForDate = result.Statistics.FirstOrDefault(t => DateOnly.FromDateTime(t.Date.Add(clientOffset).Date) == templatesFromDate.Key);
|
||||
if (statisticsForDate == null)
|
||||
{
|
||||
logger.LogWarning("В списке рабочих дней, нет дня для шаблонов {count} шт. выполняющихся в {date}", templatesFromDate.Count(), templatesFromDate.Key);
|
||||
logger.LogWarning("В списке дней, нет дня для шаблонов {count} шт. выполняющихся в {date}", templatesFromDate.Count(), templatesFromDate.Key);
|
||||
continue;
|
||||
}
|
||||
|
||||
statisticsForDate.AllCount = templatesFromDate.Count();
|
||||
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
|
||||
statisticsForDate.IsDeactivatedCount = templatesFromDate.Count(t => !t.IsActiveTemplate || !t.IsActiveSchedule);
|
||||
statisticsForDate.IsActivatedCount = templatesFromDate.Count(t => t.IsActiveTemplate && t.IsActiveSchedule);
|
||||
statisticsForDate.Templates = templatesFromDate.Select(t => new StatTemplateDistribItem
|
||||
{
|
||||
Name = t.Template.Name,
|
||||
IsActiveSchedular = t.Template.IsActiveSchedule,
|
||||
IsActiveTemplate = t.Template.IsActiveTemplate,
|
||||
NextRun = t.Template.NextRun,
|
||||
ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(t.ResponseArea))
|
||||
Id = t.Id,
|
||||
Name = t.Name,
|
||||
IsActiveSchedular = t.IsActiveSchedule,
|
||||
IsActiveTemplate = t.IsActiveTemplate,
|
||||
NextRun = t.NextRun
|
||||
})
|
||||
.OrderBy(t => t.Name)
|
||||
.ToList();
|
||||
|
||||
@@ -36,7 +36,6 @@ namespace PARR.API.Controllers.V1
|
||||
private readonly ILogger<TemplateController> logger;
|
||||
private readonly IShortcodesService shortcodesService;
|
||||
private readonly IOrderService orderService;
|
||||
private readonly INextRunService nextRunService;
|
||||
private readonly SettingsFromDb settingsFromDb;
|
||||
private readonly IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService;
|
||||
|
||||
@@ -48,7 +47,6 @@ namespace PARR.API.Controllers.V1
|
||||
ILogger<TemplateController> logger,
|
||||
IShortcodesService shortcodesService,
|
||||
IOrderService orderService,
|
||||
INextRunService nextRunService,
|
||||
SettingsFromDb settingsFromDb,
|
||||
IScheduleResponseAreaTimeOffsetService scheduleResponseAreaTimeOffsetService
|
||||
)
|
||||
@@ -60,7 +58,6 @@ namespace PARR.API.Controllers.V1
|
||||
this.logger = logger;
|
||||
this.shortcodesService = shortcodesService;
|
||||
this.orderService = orderService;
|
||||
this.nextRunService = nextRunService;
|
||||
this.settingsFromDb = settingsFromDb;
|
||||
this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService;
|
||||
}
|
||||
@@ -138,7 +135,7 @@ namespace PARR.API.Controllers.V1
|
||||
{
|
||||
//await ApplyTemplateShortcodesAsync(responseItem, templates.First(t => t.Id == responseItem.Id));
|
||||
await ApplyTemplateShortcodesAsync(responseItem, templatesDict[responseItem.Id]);
|
||||
FillResponseAreaOffset(responseItem);
|
||||
//FillResponseAreaOffset(responseItem);
|
||||
}
|
||||
//logger.LogDebug("Получение шорткодов: {ElapsedMs} мс", sw.ElapsedMilliseconds);
|
||||
//sw.Stop();
|
||||
@@ -183,7 +180,7 @@ namespace PARR.API.Controllers.V1
|
||||
|
||||
var response = mapper.Map<TemplateResponse>(template);
|
||||
await ApplyTemplateShortcodesAsync(response, template);
|
||||
FillResponseAreaOffset(response);
|
||||
//FillResponseAreaOffset(response);
|
||||
|
||||
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
|
||||
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
|
||||
@@ -277,7 +274,7 @@ namespace PARR.API.Controllers.V1
|
||||
var response = mapper.Map<TemplateListResponse>(templateToResponse);
|
||||
|
||||
await ApplyTemplateShortcodesAsync(response, templateToResponse);
|
||||
FillResponseAreaOffset(response);
|
||||
//FillResponseAreaOffset(response);
|
||||
|
||||
var ordersCountResult = await GetOrdersCountAsync(new List<Guid> { response.Id });
|
||||
response.OrderCount = ordersCountResult.Count > 0 ? ordersCountResult.First().Value : 0;
|
||||
@@ -323,36 +320,36 @@ namespace PARR.API.Controllers.V1
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Заполнить ResponseAreaOffset
|
||||
/// </summary>
|
||||
/// <param name="response"></param>
|
||||
private void FillResponseAreaOffset(TemplateBaseResponse response)
|
||||
{
|
||||
// если стоит галка IsResponseAreaTimezone и есть ЗО, то возвращаем оффсет
|
||||
if (response.IsResponseAreaTimezone && !string.IsNullOrEmpty(response.ResponseArea))
|
||||
{
|
||||
var responseArea = response.ResponseArea;
|
||||
response.ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
|
||||
}
|
||||
else
|
||||
{
|
||||
response.ResponseAreaOffset = null;
|
||||
}
|
||||
///// <summary>
|
||||
///// Заполнить ResponseAreaOffset
|
||||
///// </summary>
|
||||
///// <param name="response"></param>
|
||||
//private void FillResponseAreaOffset(TemplateBaseResponse response)
|
||||
//{
|
||||
// // если стоит галка 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;
|
||||
// //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 = 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.ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
|
||||
}
|
||||
// //response.ResponseAreaOffset = mapper.Map<ScheduleResponseAreaTimeOffsetResponse>(scheduleResponseAreaTimeOffsetService.GetByResponseAreaOrDefault(responseArea));
|
||||
//}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user