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

feat(api): StatTemplateDistributor дополнена статистика активированными, деактивированными шаблонами

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-08-22 14:32:48 +10:00
parent af28c8477e
commit 7ffc5f10e1
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PARR.API/Contracts/V1/Responses/Statistics/StatTemplateDistributorResponse.cs
View File

@@ -4,7 +4,12 @@
{ {
public WorkGroupResponse? WorkGroup { get; set; } public WorkGroupResponse? WorkGroup { get; set; }
public int CountTemplates { get; set; } public int AllCount { get; set; }
public int IsActivatedAllCount { get; set; }
public int IsDeactivatedAllCount { get; set; }
public List<StatTemplateDistributorDateStat>? Stat { get; set; } public List<StatTemplateDistributorDateStat>? Stat { get; set; }
} }
@@ -12,6 +17,8 @@
public class StatTemplateDistributorDateStat public class StatTemplateDistributorDateStat
{ {
public DateTimeOffset Date { get; set; } public DateTimeOffset Date { get; set; }
public int Count { get; set; } public int AllCount { get; set; }
public int IsActivatedCount { get; set; }
public int IsDeactivatedCount { get;set; }
} }
} }

21
PARR.API/Controllers/V1/Statistics/StatTemplateDistributionController.cs
View File

@@ -52,12 +52,19 @@ namespace PARR.API.Controllers.V1.Statistics
{ {
WorkGroupId = x.Key, WorkGroupId = x.Key,
CountTemplates = x.Count(), CountTemplates = x.Count(),
IsActivatedAllCount = x.Count(t => t.IsActiveTemplate && t.IsActiveSchedule),
IsDeactivatedAllCount = x.Count(t => !t.IsActiveTemplate || !t.IsActiveSchedule || (!t.IsActiveTemplate && !t.IsActiveSchedule)),
GroupingByDate = GroupingByDate =
x.GroupBy(d => d.NextRun).OrderBy(d => d.Key).Select(d => x.GroupBy(d => d.NextRun).OrderBy(d => d.Key).Select(d =>
new new
{ {
Date = d.Key, Date = d.Key,
Count = d.Count() //Всего
Count = d.Count(),
//Только активированных
IsActivatedCount = d.Count(t => t.IsActiveTemplate && t.IsActiveSchedule),
//Только деактивированных
IsDeactivatedCount = d.Count(t => !t.IsActiveTemplate || !t.IsActiveSchedule || (!t.IsActiveTemplate && !t.IsActiveSchedule))
} }
) )
@@ -74,8 +81,16 @@ namespace PARR.API.Controllers.V1.Statistics
var response = statResult.Select(stat => new StatTemplateDistributorResponse var response = statResult.Select(stat => new StatTemplateDistributorResponse
{ {
WorkGroup = mapper.Map<WorkGroupResponse>(workGroups.FirstOrDefault(x => x.Id == stat.WorkGroupId)), WorkGroup = mapper.Map<WorkGroupResponse>(workGroups.FirstOrDefault(x => x.Id == stat.WorkGroupId)),
CountTemplates = stat.CountTemplates, AllCount = stat.CountTemplates,
Stat = stat.GroupingByDate.Select(x => new StatTemplateDistributorDateStat { Count = x.Count, Date = x.Date }).ToList() IsActivatedAllCount = stat.IsActivatedAllCount,
IsDeactivatedAllCount = stat.IsDeactivatedAllCount,
Stat = stat.GroupingByDate.Select(x => new StatTemplateDistributorDateStat
{
AllCount = x.Count,
Date = x.Date,
IsActivatedCount = x.IsActivatedCount,
IsDeactivatedCount = x.IsDeactivatedCount
}).ToList()
}) })
.OrderBy(t => t.WorkGroup?.Name) .OrderBy(t => t.WorkGroup?.Name)
.ToList(); .ToList();