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

86
PARR.API/Controllers/V1/Statistics/StatOrderController.cs
View File

@@ -8,8 +8,9 @@ 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.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
@@ -23,34 +24,37 @@ namespace PARR.API.Controllers.V1.Statistics
private readonly IOrderService orderService;
private readonly IOrderStatusService orderStatusService;
private readonly IMapper mapper;
private readonly ICalendarService calendarService;
private readonly INextRunService nextRunService;
public StatOrderController(
IOrderService orderService,
IOrderStatusService orderStatusService,
IMapper mapper,
ICalendarService calendarService
INextRunService nextRunService
)
{
this.orderService = orderService;
this.orderStatusService = orderStatusService;
this.mapper = mapper;
this.calendarService = calendarService;
this.nextRunService = nextRunService;
}
/// <summary>
/// Статистика по нарядам - всего в ПАРР / загружено за последние сутки
/// Статистика по нарядам - всего в ПАРР / загружено за сегодня
/// </summary>
/// <returns></returns>
[HttpGet(ApiRoutes.StatOrder.Get)]
public async Task<IActionResult> Get()
public async Task<IActionResult> Get([FromQuery] TimeZoneOffsetClient timeZoneQuery)
{
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
var todayStartUtc = TimeZoneDateHelper.GetUtcSartOfDay(
DateOnly.FromDateTime(DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime),
timeZoneQuery.TimeZoneOffset
);
var response = new StatOrderResponse
{
AllCount = await orderService.Get().CountAsync(),
DownloadedLastDayCount = await orderService.Get().CountAsync(t => t.DateCreated >= queryDate)
AllCount = await orderService.Get().AsNoTracking().CountAsync(),
DownloadedLastDayCount = await orderService.Get().AsNoTracking().CountAsync(t => t.DateCreated.UtcDateTime >= todayStartUtc)
};
return Ok(new Response<StatOrderResponse>(response, true));
@@ -66,9 +70,9 @@ namespace PARR.API.Controllers.V1.Statistics
{
var response = new StatTaskToEsppResponse
{
AllCount = await orderService.Get().CountAsync(),
AllCount = await orderService.Get().AsNoTracking().CountAsync(),
// такая же логика в PARR.Master
TaskCount = await orderService.Get().CountAsync(t => t.NextStatusCode.HasValue && t.NextStatusCode.Value != t.StatusCode)
TaskCount = await orderService.Get().AsNoTracking().CountAsync(t => t.NextStatusCode.HasValue && t.NextStatusCode.Value != t.StatusCode)
};
return Ok(new Response<StatTaskToEsppResponse>(response, true));
@@ -82,8 +86,7 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatOrder.Statuses)]
public async Task<IActionResult> Statuses()
{
var statuses = await orderStatusService.Get().OrderBy(t => t.Code).ToListAsync();
var statuses = await orderStatusService.Get().AsNoTracking().OrderBy(t => t.Code).ToListAsync();
var response = new List<StatOrderStatusesResponse>();
foreach (var stat in statuses)
@@ -91,7 +94,7 @@ namespace PARR.API.Controllers.V1.Statistics
response.Add(new StatOrderStatusesResponse
{
Status = mapper.Map<OrderStatusResponse>(stat),
Count = await orderService.Get().CountAsync(t => t.StatusCode == stat.Code)
Count = await orderService.Get().AsNoTracking().CountAsync(t => t.StatusCode == stat.Code)
});
}
@@ -100,23 +103,26 @@ namespace PARR.API.Controllers.V1.Statistics
/// <summary>
/// Статистика по нарядам - по статусу за последние сутки
/// Статистика по нарядам - по статусу за сегодня
/// </summary>
/// <param name="statusCode">1,2,3,4,5</param>
/// <returns></returns>
[HttpGet(ApiRoutes.StatOrder.GetStatusesLastDay)]
public async Task<IActionResult> GetStatusesLastDay([FromRoute] int statusCode)
public async Task<IActionResult> GetStatusesLastDay([FromRoute] int statusCode, [FromQuery] TimeZoneOffsetClient timeZoneQuery)
{
var status = await orderStatusService.Get().FirstOrDefaultAsync(t => t.Code == statusCode);
var status = await orderStatusService.Get().AsNoTracking().FirstOrDefaultAsync(t => t.Code == statusCode);
if (status == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не найден статус с кодом: {statusCode}" } }));
var queryDate = DateTimeOffset.UtcNow.AddDays(-1);
var todayStartUtc = TimeZoneDateHelper.GetUtcSartOfDay(
DateOnly.FromDateTime(DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime),
timeZoneQuery.TimeZoneOffset
);
var response = new StatGetStatusesLastDayResponse
{
Count = await orderService.Get().CountAsync(t => t.DateModified >= queryDate && t.StatusCode == statusCode),
Count = await orderService.Get().CountAsync(t => (t.DateModified.HasValue && t.DateModified.Value >= todayStartUtc) && t.StatusCode == statusCode),
Status = mapper.Map<OrderStatusResponse>(status)
};
@@ -133,36 +139,30 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpGet(ApiRoutes.StatOrder.GetForPeriod)]
public async Task<IActionResult> GetForPeriod([FromQuery] TimeZoneOffsetClient timeZoneQuery, [FromQuery] int startPeriodDays = 3)
{
var endPeriod = calendarService.GetDateWithTimeZoneOffset(DateTimeOffset.UtcNow, timeZoneQuery.TimeZoneOffsetHours);
var startPeriod = endPeriod.AddDays(-startPeriodDays);
// Формируем период
var userEnd = DateOnly.FromDateTime(DateTimeOffset.UtcNow.ToOffset(timeZoneQuery.TimeZoneOffset).DateTime);
var userStart = userEnd.AddDays(-startPeriodDays);
var query = orderService.Get()
.Where(t =>
t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date >= startPeriod.Date
&& t.DateCreated.DateTime.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date <= endPeriod.Date
).GroupBy(t => t.DateCreated.AddHours(timeZoneQuery.TimeZoneOffsetHours).Date)
.Select(t => new
{
Date = t.Key,
OrderCount = t.Count()
});
var (utcStart, utcEnd) = TimeZoneDateHelper.GetUtcDateRange(
userStart,
userEnd.AddDays(1),
timeZoneQuery.TimeZoneOffset);
var result = await query.ToListAsync();
var allRecords = await orderService.Get()
.AsNoTracking()
.FilterByDateRangeUtc(t => t.DateCreated, utcStart, utcEnd)
.Select(t => new { t.Id, t.DateCreated })
.ToListAsync(); ;
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
var resultDict = allRecords.GroupByUserDate(t => t.DateCreated, timeZoneQuery.TimeZoneOffset);
var response = new List<StatOrderGetForPeriodResponse>();
var daysList = await nextRunService.GetWorkDaysAsync(userStart, userEnd, false);
daysList.ForEach(date =>
var response = daysList.Select(date => new StatOrderGetForPeriodResponse
{
response.Add(new StatOrderGetForPeriodResponse
{
Date = date,
OrderCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.OrderCount ?? 0
});
});
response = response.OrderBy(t => t.Date).ToList();
Date = date,
OrderCount = resultDict.TryGetValue(date, out var cnt) ? cnt : 0
}).OrderBy(t => t.Date).ToList();
return Ok(new Response<List<StatOrderGetForPeriodResponse>>(response, true));
}