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

20
PARR.API/Controllers/V1/Statistics/StatRobotHistoryController.cs
View File

@@ -3,11 +3,13 @@ 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.Requests.Queries;
using PARR.API.Contracts.V1.Responses;
using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base;
using PARR.API.Helpers;
using PARR.Constants;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
@@ -40,10 +42,10 @@ namespace PARR.API.Controllers.V1.Statistics
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatRobotHistory.Get)]
public async Task<IActionResult> Get([FromQuery] StatRobotHistoryQuery request)
public async Task<IActionResult> Get([FromQuery] StatRobotHistoryQuery request, [FromQuery] TimeZoneOffsetClient timeZoneQuery)
{
if (!request.Date.HasValue)
request.Date = DateTime.Now.Date;
request.Date = DateOnly.FromDateTime(DateTimeOffset.UtcNow.Date);
// всего
var allStat = await robotHistoryService.Get()
@@ -51,9 +53,19 @@ namespace PARR.API.Controllers.V1.Statistics
.Select(t => new { HistoryLevel = t.Key, Count = t.Count() })
.ToListAsync();
// Формируем диапазон в пользовательском времени
var userDateStart = new DateTimeOffset(request.Date.Value.Year, request.Date.Value.Month, request.Date.Value.Day, 0, 0, 0, timeZoneQuery.TimeZoneOffset);
var userDateEnd = userDateStart.AddDays(1);
// Конвертируем в UTC для сравнения с БД
var utcStart = userDateStart.UtcDateTime;
var utcEnd = userDateEnd.UtcDateTime;
// за дату
var dateStat = await robotHistoryService.Get()
.Where(t => t.DateCreated.DateTime.Date == request.Date.Value.Date)
//.Where(t => t.DateCreated.DateTime.Date == request.Date.Value.Date)
//.Where(t => t.DateCreated.UtcDateTime >= utcStart && t.DateCreated.UtcDateTime < utcEnd)
.FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd)
.GroupBy(t => t.HistoryLevel)
.Select(t => new { HistoryLevel = t.Key, Count = t.Count() })
.ToListAsync();
@@ -73,7 +85,7 @@ namespace PARR.API.Controllers.V1.Statistics
{
AllCount = allStat.FirstOrDefault(t => t.HistoryLevel == level.Level)?.Count ?? 0,
DateCount = dateStat.FirstOrDefault(t => t.HistoryLevel == level.Level)?.Count ?? 0,
Date = request.Date.Value.Date,
Date = request.Date.Value,
Level = mapper.Map<RobotHistoryLevelResponse>(level)
});
}