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

feat(api): StatWorkWorkLoadController переделал методы для избранного

Browse Source
This commit is contained in:
Mikhail Trubnikov
2024-08-27 17:07:31 +10:00
parent e2f0591b22
commit 5d50a7f2d3
3 changed files with 52 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PARR.API/Contracts/V1/Requests/StatWorkWorkLoadRequest.cs
View File

@@ -4,8 +4,14 @@ namespace PARR.API.Contracts.V1.Requests
{ {
public class StatWorkWorkLoadRequest public class StatWorkWorkLoadRequest
{ {
public List<Guid> Jobs { get; set; } = new List<Guid>(); public List<StatWorkWorkLoadJobRequest> JobsRequests { get; set; } = new List<StatWorkWorkLoadJobRequest>();
public required WorkloadBaseQuery Filter { get; set; } public required WorkloadBaseQuery Filter { get; set; }
} }
public class StatWorkWorkLoadJobRequest
{
public Guid JobId { get; set; }
public Guid WorkGroupId { get; set; }
}
} }

2
PARR.API/Contracts/V1/Responses/Statistics/StatWorkWorkLoadResponse.cs
View File

@@ -3,5 +3,7 @@
public class StatWorkWorkLoadResponse : StatWorkLoadDataBaseResponse public class StatWorkWorkLoadResponse : StatWorkLoadDataBaseResponse
{ {
public required ApplicationInWorkBaseResponse Job { get; set; } public required ApplicationInWorkBaseResponse Job { get; set; }
public required WorkGroupResponse WorkGroup { get; set; }
} }
} }

64
PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs
View File

@@ -9,6 +9,7 @@ using PARR.API.Contracts.V1.Responses.Base;
using PARR.API.Contracts.V1.Responses.Statistics; using PARR.API.Contracts.V1.Responses.Statistics;
using PARR.API.Controllers.V1.Base; using PARR.API.Controllers.V1.Base;
using PARR.API.Services.Interfaces; using PARR.API.Services.Interfaces;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces; using PARR.DAL.Services.Interfaces;
namespace PARR.API.Controllers.V1.Statistics namespace PARR.API.Controllers.V1.Statistics
@@ -22,18 +23,21 @@ namespace PARR.API.Controllers.V1.Statistics
private readonly IWorkLoadService workLoadService; private readonly IWorkLoadService workLoadService;
private readonly IMapper mapper; private readonly IMapper mapper;
private readonly ILogger<StatWorkWorkLoadController> logger; private readonly ILogger<StatWorkWorkLoadController> logger;
private readonly IWorkGroupService workGroupService;
public StatWorkWorkLoadController( public StatWorkWorkLoadController(
ITemplateService templateService, ITemplateService templateService,
IWorkLoadService workLoadService, IWorkLoadService workLoadService,
IMapper mapper, IMapper mapper,
ILogger<StatWorkWorkLoadController> logger ILogger<StatWorkWorkLoadController> logger,
IWorkGroupService workGroupService
) )
{ {
this.templateService = templateService; this.templateService = templateService;
this.workLoadService = workLoadService; this.workLoadService = workLoadService;
this.mapper = mapper; this.mapper = mapper;
this.logger = logger; this.logger = logger;
this.workGroupService = workGroupService;
} }
@@ -60,18 +64,18 @@ namespace PARR.API.Controllers.V1.Statistics
[HttpPost(ApiRoutes.StatWorkWorkLoad.GetByApplicationInWork)] [HttpPost(ApiRoutes.StatWorkWorkLoad.GetByApplicationInWork)]
public async Task<IActionResult> GetByApplicationInWork([FromBody] StatWorkWorkLoadRequest requestBody) public async Task<IActionResult> GetByApplicationInWork([FromBody] StatWorkWorkLoadRequest requestBody)
{ {
var response = await GetStatisticsAsync(null, requestBody.Filter, requestBody.Jobs); var response = await GetStatisticsAsync(null, requestBody.Filter, requestBody.JobsRequests);
return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true)); return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
} }
private async Task<List<StatWorkWorkLoadResponse>> GetStatisticsAsync(Guid? workGroupId, WorkloadBaseQuery requestQuery, List<Guid>? applicationInWorks = null) private async Task<List<StatWorkWorkLoadResponse>> GetStatisticsAsync(Guid? workGroupId, WorkloadBaseQuery requestQuery, List<StatWorkWorkLoadJobRequest>? jobsRequests = null)
{ {
//защита от дурака, чтоб не выгрузить всю БД //защита от дурака, чтоб не выгрузить всю БД
if (workGroupId == null && (applicationInWorks == null || applicationInWorks.Count() == 0)) if (workGroupId == null && (jobsRequests == null || jobsRequests.Count() == 0))
{ {
logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(workGroupId)}, {nameof(applicationInWorks)}. Controller {nameof(StatWorkWorkLoadController)}"); logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(workGroupId)}, {nameof(jobsRequests)}. Controller {nameof(StatWorkWorkLoadController)}");
return new List<StatWorkWorkLoadResponse>(); return new List<StatWorkWorkLoadResponse>();
} }
@@ -81,18 +85,20 @@ namespace PARR.API.Controllers.V1.Statistics
IQueryable<DAL.Models.Template> query = templateService.Get() IQueryable<DAL.Models.Template> query = templateService.Get()
.Include(t => t.Host); .Include(t => t.Host);
query = workLoadService.FilterTemplatesQuery(query, requestQuery);//.Where(t => t.Host!.WorkGroupId == workGroupId); query = workLoadService.FilterTemplatesQuery(query, requestQuery);
if (workGroupId.HasValue) if (workGroupId.HasValue)
query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value); query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value);
if (applicationInWorks != null && applicationInWorks.Count() > 0) if (jobsRequests != null && jobsRequests.Count() > 0)
query = query.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId)); //query = query.Where(t => jobsRequests.Any(x => x.JobId == t.ApplicationInWorkId && x.WorkGroupId == t.Host!.WorkGroupId.Value)); /*&& x.WorkGroupId == t.Host!.WorkGroupId.Value*/
query = query.Where(t => jobsRequests.Select(t => t.JobId).Any(x => x == t.ApplicationInWorkId) && jobsRequests.Select(t => t.WorkGroupId).Any(x => x == t.Host!.WorkGroupId.Value));
var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.ApplicationInWorkId }) var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.ApplicationInWorkId, t.Host.WorkGroupId })
.Select(t => new .Select(t => new
{ {
ApplicationInWorkId = t.Key.ApplicationInWorkId, ApplicationInWorkId = t.Key.ApplicationInWorkId,
WorkGroupId = t.Key.WorkGroupId,
Date = t.Key.Date, Date = t.Key.Date,
TemplateCount = t.Count() TemplateCount = t.Count()
}); });
@@ -105,37 +111,53 @@ namespace PARR.API.Controllers.V1.Statistics
.Include(t => t.Host) .Include(t => t.Host)
.Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType); .Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType);
IQueryable<WorkGroup> workGroupsQuery = workGroupService.Get()
.Include(t => t.ResponseArea);
if (workGroupId.HasValue) if (workGroupId.HasValue)
{
appInWorksQuery = appInWorksQuery.Where(t => t.Host.WorkGroupId == workGroupId); appInWorksQuery = appInWorksQuery.Where(t => t.Host.WorkGroupId == workGroupId);
workGroupsQuery = workGroupsQuery.Where(t => t.Id == workGroupId.Value);
}
if (applicationInWorks != null && applicationInWorks.Count() > 0) if (jobsRequests != null && jobsRequests.Count() > 0)
appInWorksQuery = appInWorksQuery.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId)); {
//appInWorksQuery = appInWorksQuery.Where(t => jobsRequests.Any(x => x.JobId == t.ApplicationInWorkId));
appInWorksQuery = appInWorksQuery.Where(t => jobsRequests.Select(j=>j.JobId).Any(x => x == t.ApplicationInWorkId));
workGroupsQuery = workGroupsQuery.Where(t => jobsRequests.Select(w=>w.WorkGroupId).Any(x => x == t.Id));
}
var appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork) var appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork)
.Distinct() .Distinct()
.ToListAsync(); .ToListAsync();
var workGroups = await workGroupsQuery.Distinct().ToListAsync();
var response = new List<StatWorkWorkLoadResponse>(); var response = new List<StatWorkWorkLoadResponse>();
appInWorks.ForEach(appInWork => appInWorks.ForEach(appInWork =>
{ {
var workLoads = daysList.Select(t => new StatWorkLoadDataResponse workGroups.ForEach(workGroup =>
{ {
Date = t, var workLoads = daysList.Select(t => new StatWorkLoadDataResponse
TemplateCount = queryResult.FirstOrDefault(x => x.ApplicationInWorkId == appInWork.Id && x.Date.Date == t.Date)?.TemplateCount ?? 0 {
}).OrderBy(t => t.Date).ToList(); Date = t,
TemplateCount = queryResult.FirstOrDefault(x => x.ApplicationInWorkId == appInWork.Id && x.Date.Date == t.Date && x.WorkGroupId == workGroup.Id)?.TemplateCount ?? 0
}).OrderBy(t => t.Date).ToList();
response.Add(new StatWorkWorkLoadResponse response.Add(new StatWorkWorkLoadResponse
{ {
Job = mapper.Map<ApplicationInWorkBaseResponse>(appInWork), Job = mapper.Map<ApplicationInWorkBaseResponse>(appInWork),
WorkLoad = workLoads WorkGroup = mapper.Map<WorkGroupResponse>(workGroup),
WorkLoad = workLoads
});
}); });
}); });
response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t => t.Job.Application?.Name).ToList(); response = response.OrderBy(t => t.Job.ShortDescription).ThenBy(t => t.Job.Application?.Name).ThenBy(t => t.WorkGroup.Name).ToList();
return response; return response;
} }