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

feat(api): статистика отображается в часовом поясе клиента

Browse Source
This commit is contained in:
Mikhail Trubnikov
2026-03-05 10:19:54 +10:00
parent 7c9d9b34e5
commit b2b5516326
30 changed files with 1333 additions and 2011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
PARR.API/Controllers/V1/Statistics/StatTemplateAutoControlController.cs
View File

@@ -5,8 +5,9 @@ using PARR.API.Contracts.V1.Requests.BaseRequests;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.BLL.Services.Interfaces;
using PARR.API.Helpers;
using PARR.Constants;
using PARR.DAL.NextRunServices;
using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics
@@ -15,17 +16,17 @@ namespace PARR.API.Controllers.V1.Statistics
{
private readonly ITemplateService templateService;
private readonly ITemplateHistoryService templateHistoryService;
private readonly ICalendarService calendarService;
private readonly INextRunService nextRunService;
public StatTemplateAutoControlController(
ITemplateService templateService,
ITemplateHistoryService templateHistoryService,
ICalendarService calendarService
INextRunService nextRunService
)
{
this.templateService = templateService;
this.templateHistoryService = templateHistoryService;
this.calendarService = calendarService;
this.nextRunService = nextRunService;
}
@@ -38,8 +39,14 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatTemplateAutoControl.GetForPeriod)]
public async Task<IActionResult> GetForPeriod([FromQuery] TimeZoneOffsetClient timeZoneQuery, [FromQuery] int startPeriodDays = 3)
{
var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.Now, timeZoneQuery.TimeZoneOffsetHours);
var startPeriod = endPeriod.AddDays(-startPeriodDays);
//var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.Now, timeZoneQuery.TimeZoneOffsetHours);
//var startPeriod = endPeriod.AddDays(-startPeriodDays);
var userEndPeriod = DateTimeOffset.UtcNow.Add(timeZoneQuery.TimeZoneOffset);
var userStartPeriod = userEndPeriod.AddDays(-startPeriodDays);
var utcEndPeriod = userEndPeriod.UtcDateTime;
var utcStartPeriod = userStartPeriod.UtcDateTime;
var templates = await templateService.Get()
.Where(t =>
@@ -48,12 +55,16 @@ namespace PARR.API.Controllers.V1.Statistics
((
// измененные
t.DateModified.HasValue
&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
//&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
//&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
&& t.DateModified.Value.UtcDateTime >= utcStartPeriod
&& t.DateModified.Value.UtcDateTime <= utcEndPeriod
) || (
// созданные
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
//t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
//&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
t.DateCreated.UtcDateTime >= utcStartPeriod
&& t.DateCreated.UtcDateTime <= utcEndPeriod
&& t.InitiatorComment != null
&& !t.InitiatorComment.Contains(TemplateActivatorActionsEnum.ActivateAllForAutoControl.ToString())
&& !t.InitiatorComment.Contains(TemplateActivatorActionsEnum.DeactivateAllForAutoControl.ToString())
@@ -72,8 +83,10 @@ namespace PARR.API.Controllers.V1.Statistics
#region ищем созданные, но уже перемещенные в историю
var createdTemplatesAndMoveToHistory = await templateService.Get().Include(t => t.TemplateHistories)
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
//t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
//&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
t.DateCreated.UtcDateTime >= utcStartPeriod
&& t.DateCreated.UtcDateTime <= utcEndPeriod
&& t.TemplateHistories.Any(x => x.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl)
)
.ToListAsync();
@@ -93,8 +106,10 @@ namespace PARR.API.Controllers.V1.Statistics
.Where(t =>
t.InitiatorParrComponentId == Constants.ParrComponentsEnum.JobAutoControl
&& t.DateModified.HasValue
&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
//&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
//&& t.DateModified.Value.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
&& t.DateModified.Value.UtcDateTime >= utcStartPeriod
&& t.DateModified.Value.UtcDateTime <= utcEndPeriod
)
.Select(t => new QueryResult
{
@@ -112,31 +127,36 @@ namespace PARR.API.Controllers.V1.Statistics
objs.AddRange(createdTemplatesAndMoveToHistory.Select(t => new QueryResult { DateCreated = t.DateCreated }));
// создано
var creations = objs.Where(t => t.DateCreated.HasValue).GroupBy(t => t.DateCreated!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new { Date = t.Key, Created = t.Count() });
var creations = objs.Where(t => t.DateCreated.HasValue)
//.GroupBy(t => t.DateCreated!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
//.GroupBy(t => DateOnly.FromDateTime(t.DateCreated!.Value.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime))
//.ToDictionary(t => t.Key, t => t.Count());
.GroupByUserDate(t => t.DateCreated!.Value, timeZoneQuery.TimeZoneOffset);
// активаций (сколько раз, а не сколько объектов)
var activations = objs.Where(t => t.DateModified.HasValue && t.InitiatorComment != null && t.InitiatorComment.Contains(TemplateActivatorActionsEnum.ActivateAllForAutoControl.ToString()))
.GroupBy(t => t.DateModified!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new { Date = t.Key, Actiovations = t.Count() });
//.GroupBy(t => t.DateModified!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
//.GroupBy(t => DateOnly.FromDateTime(t.DateModified!.Value.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime))
//.ToDictionary(t => t.Key, t => t.Count());
.GroupByUserDate(t => t.DateModified!.Value, timeZoneQuery.TimeZoneOffset);
// деактиваций (сколько раз, а не сколько объектов)
var deactivations = objs.Where(t => t.DateModified.HasValue && t.InitiatorComment != null && t.InitiatorComment.Contains(TemplateActivatorActionsEnum.DeactivateAllForAutoControl.ToString()))
.GroupBy(t => t.DateModified!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new { Date = t.Key, Deactivations = t.Count() });
//.GroupBy(t => t.DateModified!.Value.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
//.GroupBy(t => DateOnly.FromDateTime(t.DateModified!.Value.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime))
//.ToDictionary(t => t.Key, t => t.Count());
.GroupByUserDate(t => t.DateModified!.Value, timeZoneQuery.TimeZoneOffset);
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var response = new List<StatTemplateAutoControlResponse>();
//var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var daysList = await nextRunService.GetWorkDaysAsync(DateOnly.FromDateTime(userStartPeriod.DateTime), DateOnly.FromDateTime(userEndPeriod.DateTime), false);
daysList.ForEach(date => response.Add(new StatTemplateAutoControlResponse
var response = daysList.Select(date => new StatTemplateAutoControlResponse
{
Date = date,
Activations = activations.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Actiovations ?? 0,
Creations = creations.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Created ?? 0,
Deactivations = deactivations.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.Deactivations ?? 0,
}));
response = response.OrderBy(t => t.Date).ToList();
Activations = activations.TryGetValue(date, out var countAct) ? countAct : 0,
Creations = creations.TryGetValue(date, out var countCrt) ? countCrt : 0,
Deactivations = deactivations.TryGetValue(date, out var countDeact) ? countDeact : 0
}).OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatTemplateAutoControlResponse>>(response, true));
}