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

fix(api): StatApplication, StatHost берутся правильные значения за период согласно таймзоны клиента

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-09-04 09:30:57 +10:00
parent db4d3354aa
commit 86af90f560
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
PARR.API/Controllers/V1/Statistics/StatApplicationController.cs
View File

@@ -60,8 +60,11 @@ namespace PARR.API.Controllers.V1.Statistics
var startPeriod = endPeriod.AddDays(-startPeriodDays); var startPeriod = endPeriod.AddDays(-startPeriodDays);
var query = applicationService.Get() var query = applicationService.Get()
.Where(t => t.DateCreated.DateTime.Date >= startPeriod.Date && t.DateCreated.DateTime.Date <= endPeriod.Date) .Where(t =>
.GroupBy(t => t.DateCreated.Date) 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 .Select(t => new
{ {
Date = t.Key, Date = t.Key,

7
PARR.API/Controllers/V1/Statistics/StatHostController.cs
View File

@@ -60,8 +60,11 @@ namespace PARR.API.Controllers.V1.Statistics
var startPeriod = endPeriod.AddDays(-startPeriodDays); var startPeriod = endPeriod.AddDays(-startPeriodDays);
var query = hostService.Get() var query = hostService.Get()
.Where(t => t.DateCreated.DateTime.Date >= startPeriod.Date && t.DateCreated.DateTime.Date <= endPeriod.Date) .Where(t =>
.GroupBy(t => t.DateCreated.Date) 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 .Select(t => new
{ {
Date = t.Key, Date = t.Key,