feat(api, bll): StatHostController, StatApplicationController добавлена статистика за период. ICalendarService - публичный метод для получения списка дат, метод получения даты с учетом часового пояса.
This commit is contained in:
@@ -2,9 +2,11 @@
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using PARR.API.Contracts.V1;
|
||||
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.Constants;
|
||||
using PARR.DAL.Services.Interfaces;
|
||||
|
||||
@@ -17,10 +19,12 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
public class StatHostController : BaseApiController
|
||||
{
|
||||
private readonly IHostService hostService;
|
||||
private readonly ICalendarService calendarService;
|
||||
|
||||
public StatHostController(IHostService hostService)
|
||||
public StatHostController(IHostService hostService, ICalendarService calendarService)
|
||||
{
|
||||
this.hostService = hostService;
|
||||
this.calendarService = calendarService;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -43,6 +47,48 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Получить статистику за период
|
||||
/// </summary>
|
||||
/// <param name="timeZoneQuery"></param>
|
||||
/// <param name="startPeriodDays"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet(ApiRoutes.StatHost.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 query = hostService.Get()
|
||||
.Where(t => t.DateCreated.DateTime.Date >= startPeriod.Date && t.DateCreated.DateTime.Date <= endPeriod.Date)
|
||||
.GroupBy(t => t.DateCreated.Date)
|
||||
.Select(t => new
|
||||
{
|
||||
Date = t.Key,
|
||||
HostCount = t.Count()
|
||||
});
|
||||
|
||||
var result = await query.ToListAsync();
|
||||
|
||||
var daysList = calendarService.GetDatesForPeriod(startPeriod, endPeriod);
|
||||
|
||||
var response = new List<StatHostPeriodResponse>();
|
||||
|
||||
daysList.ForEach(date =>
|
||||
{
|
||||
response.Add(new StatHostPeriodResponse
|
||||
{
|
||||
Date = date,
|
||||
CreatedHostsCount = result.FirstOrDefault(t => DateOnly.FromDateTime(t.Date) == date)?.HostCount ?? 0
|
||||
});
|
||||
});
|
||||
|
||||
response = response.OrderBy(t => t.Date).ToList();
|
||||
|
||||
return Ok(new Response<List<StatHostPeriodResponse>>(response, true));
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Количество хостов в шаблонах
|
||||
/// </summary>
|
||||
@@ -55,7 +101,7 @@ namespace PARR.API.Controllers.V1.Statistics
|
||||
var response = new StatHostTemplateResponse
|
||||
{
|
||||
AllHosts = await hostService.Get().CountAsync(),
|
||||
HostsInTemplates = await hostService.Get().Include(t => t.Templates).CountAsync(t =>t.Templates.Any())
|
||||
HostsInTemplates = await hostService.Get().Include(t => t.Templates).CountAsync(t => t.Templates.Any())
|
||||
};
|
||||
|
||||
return Ok(new Response<StatHostTemplateResponse>(response, true));
|
||||
|
||||
Reference in New Issue
Block a user