From 80325acfadabd426895b542b067a4212d4fe1bae Mon Sep 17 00:00:00 2001
From: Mikhail Trubnikov <ivc_trubnikovme@dvgd.rzd>
Date: Mon, 26 Aug 2024 16:08:09 +1000
Subject: [PATCH] =?UTF-8?q?feat(api):=20=D1=81=D1=82=D0=B0=D1=82=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BA=D0=B0=20=D0=BF=D0=BE=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D0=A0=D0=A0.=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8=D0=BA=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D1=83=20=D0=98=D0=94=20=D0=BE?=
 =?UTF-8?q?=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PARR.API/Contracts/V1/ApiRoutes.cs            |  3 +
 .../StatResponseAreaWorkloadRequest.cs        | 11 +++
 .../Requests/StatWorkGroupsWorkLoadRequest.cs | 11 +++
 .../V1/Requests/StatWorkWorkLoadRequest.cs    | 11 +++
 .../StatResponseAreaWorkLoadController.cs     | 41 ++++++++--
 .../StatWorkGroupWorkLoadController.cs        | 78 ++++++++++++++----
 .../Statistics/StatWorkWorkLoadController.cs  | 79 +++++++++++++++----
 7 files changed, 196 insertions(+), 38 deletions(-)
 create mode 100644 PARR.API/Contracts/V1/Requests/StatResponseAreaWorkloadRequest.cs
 create mode 100644 PARR.API/Contracts/V1/Requests/StatWorkGroupsWorkLoadRequest.cs
 create mode 100644 PARR.API/Contracts/V1/Requests/StatWorkWorkLoadRequest.cs

diff --git a/PARR.API/Contracts/V1/ApiRoutes.cs b/PARR.API/Contracts/V1/ApiRoutes.cs
index d271d4ac..4fd7de7f 100644
--- a/PARR.API/Contracts/V1/ApiRoutes.cs
+++ b/PARR.API/Contracts/V1/ApiRoutes.cs
@@ -254,16 +254,19 @@
         public static class StatResponseAreaWorkLoad
         {
             public const string GetAll = BaseStat + "/response-area-workloads/";
+            public const string GetByResponseAreas = BaseStat + "/response-area-workloads/";
         }
 
         public static class StatWorkGroupWorkLoad
         {
             public const string Get = BaseStat + "/work-group-workloads/{responseAreaCode}";
+            public const string GetByWorkGroups= BaseStat + "/work-group-workloads/";
         }
 
         public static class StatWorkWorkLoad
         {
             public const string Get = BaseStat + "/work-workloads/{workGroupId}";
+            public const string GetByApplicationInWork = BaseStat + "/work-workloads/";
         }
 
         #endregion
diff --git a/PARR.API/Contracts/V1/Requests/StatResponseAreaWorkloadRequest.cs b/PARR.API/Contracts/V1/Requests/StatResponseAreaWorkloadRequest.cs
new file mode 100644
index 00000000..090bc5eb
--- /dev/null
+++ b/PARR.API/Contracts/V1/Requests/StatResponseAreaWorkloadRequest.cs
@@ -0,0 +1,11 @@
+using PARR.API.Contracts.V1.Requests.Queries;
+
+namespace PARR.API.Contracts.V1.Requests
+{
+    public class StatResponseAreaWorkloadRequest
+    {
+        public List<int> ResponseAreas { get; set; } = new List<int>();
+
+        public required WorkloadBaseQuery Filter { get; set; }
+    }
+}
diff --git a/PARR.API/Contracts/V1/Requests/StatWorkGroupsWorkLoadRequest.cs b/PARR.API/Contracts/V1/Requests/StatWorkGroupsWorkLoadRequest.cs
new file mode 100644
index 00000000..039511a8
--- /dev/null
+++ b/PARR.API/Contracts/V1/Requests/StatWorkGroupsWorkLoadRequest.cs
@@ -0,0 +1,11 @@
+using PARR.API.Contracts.V1.Requests.Queries;
+
+namespace PARR.API.Contracts.V1.Requests
+{
+    public class StatWorkGroupsWorkLoadRequest
+    {
+        public List<Guid> WorkGroups { get; set; } = new List<Guid>();
+
+        public required WorkloadBaseQuery Filter { get; set; }
+    }
+}
diff --git a/PARR.API/Contracts/V1/Requests/StatWorkWorkLoadRequest.cs b/PARR.API/Contracts/V1/Requests/StatWorkWorkLoadRequest.cs
new file mode 100644
index 00000000..851729aa
--- /dev/null
+++ b/PARR.API/Contracts/V1/Requests/StatWorkWorkLoadRequest.cs
@@ -0,0 +1,11 @@
+using PARR.API.Contracts.V1.Requests.Queries;
+
+namespace PARR.API.Contracts.V1.Requests
+{
+    public class StatWorkWorkLoadRequest
+    {
+        public List<Guid> Jobs { get; set; } = new List<Guid>();
+
+        public required WorkloadBaseQuery Filter { get; set; }
+    }
+}
diff --git a/PARR.API/Controllers/V1/Statistics/StatResponseAreaWorkLoadController.cs b/PARR.API/Controllers/V1/Statistics/StatResponseAreaWorkLoadController.cs
index ec91737d..cdca4666 100644
--- a/PARR.API/Controllers/V1/Statistics/StatResponseAreaWorkLoadController.cs
+++ b/PARR.API/Controllers/V1/Statistics/StatResponseAreaWorkLoadController.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests;
 using PARR.API.Contracts.V1.Requests.Queries;
 using PARR.API.Contracts.V1.Responses;
 using PARR.API.Contracts.V1.Responses.Base;
@@ -10,7 +11,6 @@ using PARR.API.Contracts.V1.Responses.Statistics;
 using PARR.API.Controllers.V1.Base;
 using PARR.API.Services.Interfaces;
 using PARR.Constants;
-using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 
 namespace PARR.API.Controllers.V1.Statistics
@@ -46,14 +46,38 @@ namespace PARR.API.Controllers.V1.Statistics
         /// <returns></returns>
         [HttpGet(ApiRoutes.StatResponseAreaWorkLoad.GetAll)]
         public async Task<IActionResult> GetAll([FromQuery] WorkloadBaseQuery requestQuery)
+        {
+            var response = await GetStatisticsAsync(requestQuery);
+
+            return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
+        }
+
+
+        /// <summary>
+        /// Статистика загрузки РР по списку ЗО
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost(ApiRoutes.StatResponseAreaWorkLoad.GetByResponseAreas)]
+        public async Task<IActionResult> GetByResponseAreas([FromBody] StatResponseAreaWorkloadRequest request)
+        {
+            var response = await GetStatisticsAsync(request.Filter, request.ResponseAreas);
+
+            return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
+        }
+
+
+        private async Task<List<StatResponseAreaWorkLoadResponse>> GetStatisticsAsync(WorkloadBaseQuery requestQuery, List<int>? responseAreas = null)
         {
             var daysList = workLoadService.GetDatesForPeriod(requestQuery);
 
-            IQueryable<Template> query = templateService.Get()
+            IQueryable<DAL.Models.Template> query = templateService.Get()
                 .Include(t => t.Host).ThenInclude(t => t.WorkGroup);
 
             query = workLoadService.FilterTemplatesQuery(query, requestQuery);
 
+            if (responseAreas != null && responseAreas.Count() > 0)
+                query = query.Where(t => responseAreas.Any(x => x == t.Host.WorkGroup.ResponseAreaCode));
+
 
             var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.Host!.WorkGroup!.ResponseAreaCode })
                 .Select(t => new
@@ -66,10 +90,15 @@ namespace PARR.API.Controllers.V1.Statistics
 
             var queryResult = await groupedQuery.ToListAsync();
 
-            var allResponseArea = await responseAreaService.Get().ToListAsync();
+            var responseAreaQuery = responseAreaService.Get();
 
-            if (!allResponseArea.Any())
-                return NoContent();
+            if (responseAreas != null && responseAreas.Count() > 0)
+                responseAreaQuery = responseAreaQuery.Where(t => responseAreas.Any(x => x == t.Code));
+
+            var allResponseArea = await responseAreaQuery.ToListAsync();
+
+            //if (!allResponseArea.Any())
+            //    return NoContent();
 
             var response = new List<StatResponseAreaWorkLoadResponse>();
 
@@ -91,7 +120,7 @@ namespace PARR.API.Controllers.V1.Statistics
 
             response = response.OrderBy(t => t.ResponseArea.Code).ToList();
 
-            return Ok(new Response<List<StatResponseAreaWorkLoadResponse>>(response, true));
+            return response;
         }
 
     }
diff --git a/PARR.API/Controllers/V1/Statistics/StatWorkGroupWorkLoadController.cs b/PARR.API/Controllers/V1/Statistics/StatWorkGroupWorkLoadController.cs
index aa297551..96d11ad5 100644
--- a/PARR.API/Controllers/V1/Statistics/StatWorkGroupWorkLoadController.cs
+++ b/PARR.API/Controllers/V1/Statistics/StatWorkGroupWorkLoadController.cs
@@ -2,13 +2,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests;
 using PARR.API.Contracts.V1.Requests.Queries;
 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.API.Services.Interfaces;
-using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 
 namespace PARR.API.Controllers.V1.Statistics
@@ -22,18 +22,21 @@ namespace PARR.API.Controllers.V1.Statistics
         private readonly IWorkLoadService workLoadService;
         private readonly IWorkGroupService workGroupService;
         private readonly IMapper mapper;
+        private readonly ILogger<StatWorkGroupWorkLoadController> logger;
 
         public StatWorkGroupWorkLoadController(
             ITemplateService templateService,
             IWorkLoadService workLoadService,
             IWorkGroupService workGroupService,
-            IMapper mapper
+            IMapper mapper,
+            ILogger<StatWorkGroupWorkLoadController> logger
             )
         {
             this.templateService = templateService;
             this.workLoadService = workLoadService;
             this.workGroupService = workGroupService;
             this.mapper = mapper;
+            this.logger = logger;
         }
 
 
@@ -46,31 +49,71 @@ namespace PARR.API.Controllers.V1.Statistics
         [HttpGet(ApiRoutes.StatWorkGroupWorkLoad.Get)]
         public async Task<IActionResult> Get([FromRoute] int responseAreaCode, [FromQuery] WorkloadBaseQuery requestQuery)
         {
+            var response = await GetStatisticsAsync(responseAreaCode, requestQuery);
+
+            return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
+        }
+
+
+        /// <summary>
+        /// Статистика загрузки РГ по списку РГ
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost(ApiRoutes.StatWorkGroupWorkLoad.GetByWorkGroups)]
+        public async Task<IActionResult> GetByWorkGroups([FromBody] StatWorkGroupsWorkLoadRequest request)
+        {
+            var response = await GetStatisticsAsync(null, request.Filter, request.WorkGroups);
+
+            return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
+        }
+
+
+        private async Task<List<StatWorkGroupWorkLoadResponse>> GetStatisticsAsync(int? responseAreaCode, WorkloadBaseQuery requestQuery, List<Guid>? workGroups = null)
+        {
+            //защита от дурака, чтоб не выгрузить всю БД
+            if (responseAreaCode == null && (workGroups == null || workGroups.Count() == 0))
+            {
+                logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(responseAreaCode)}, {nameof(workGroups)}. Controller {nameof(StatWorkGroupWorkLoadController)}");
+                return new List<StatWorkGroupWorkLoadResponse>();
+            }
+
+
             var daysList = workLoadService.GetDatesForPeriod(requestQuery);
 
-            IQueryable<Template> query = templateService.Get()
+            IQueryable<DAL.Models.Template> query = templateService.Get()
                                             .Include(t => t.Host);
 
-            query = workLoadService.FilterTemplatesQuery(query, requestQuery).Where(t => t.Host!.WorkGroup!.ResponseAreaCode == responseAreaCode);
+            query = workLoadService.FilterTemplatesQuery(query, requestQuery);
+
+            if (responseAreaCode.HasValue)
+                query = query.Where(t => t.Host!.WorkGroup!.ResponseAreaCode == responseAreaCode.Value);
+
+            if (workGroups != null && workGroups.Count() > 0)
+                query = query.Where(t => workGroups.Any(x => x == t.Host!.WorkGroupId.Value));
+
 
             var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.Host!.WorkGroupId })
-                                        .Select(t => new
-                                        {
-                                            WorkGroupId = t.Key.WorkGroupId,
-                                            Date = t.Key.Date,
-                                            TemplateCount = t.Count()
-                                        });
+                                    .Select(t => new
+                                    {
+                                        WorkGroupId = t.Key.WorkGroupId,
+                                        Date = t.Key.Date,
+                                        TemplateCount = t.Count()
+                                    });
 
             var queryResult = await groupedQuery.ToListAsync();
 
-            //if (!queryResult.Any())
-            //    return NoContent();
+
+            IQueryable<DAL.Models.WorkGroup> workGroupsQuery = workGroupService.Get()
+                                            .Include(t => t.ResponseArea);
+
+            if (responseAreaCode.HasValue)
+                workGroupsQuery = workGroupsQuery.Where(t => t.ResponseAreaCode == responseAreaCode);
+
+            if (workGroups != null && workGroups.Count() > 0)
+                workGroupsQuery = workGroupsQuery.Where(t => workGroups.Any(x => x == t.Id));
 
 
-            var allWorkGroups = await workGroupService.Get()
-                                            .Include(t => t.ResponseArea)
-                                            .Where(t => t.ResponseAreaCode == responseAreaCode)
-                                            .ToListAsync();
+            var allWorkGroups = await workGroupsQuery.ToListAsync();
 
             var response = new List<StatWorkGroupWorkLoadResponse>();
 
@@ -91,7 +134,8 @@ namespace PARR.API.Controllers.V1.Statistics
 
             response = response.OrderBy(t => t.WorkGroup.Name).ToList();
 
-            return Ok(new Response<List<StatWorkGroupWorkLoadResponse>>(response, true));
+            return response;
         }
+
     }
 }
diff --git a/PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs b/PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs
index a8ac50c6..62f1db4d 100644
--- a/PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs
+++ b/PARR.API/Controllers/V1/Statistics/StatWorkWorkLoadController.cs
@@ -2,40 +2,43 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using PARR.API.Contracts.V1;
+using PARR.API.Contracts.V1.Requests;
 using PARR.API.Contracts.V1.Requests.Queries;
 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.API.Services.Interfaces;
-using PARR.DAL.Models;
 using PARR.DAL.Services.Interfaces;
 
 namespace PARR.API.Controllers.V1.Statistics
 {
     /// <summary>
-    /// Статистика загрузки регламентными работами по Видам работ(works)
+    /// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
     /// </summary>
     public class StatWorkWorkLoadController : BaseApiController
     {
         private readonly ITemplateService templateService;
         private readonly IWorkLoadService workLoadService;
         private readonly IMapper mapper;
+        private readonly ILogger<StatWorkWorkLoadController> logger;
 
         public StatWorkWorkLoadController(
                 ITemplateService templateService,
                 IWorkLoadService workLoadService,
-                IMapper mapper
+                IMapper mapper,
+                ILogger<StatWorkWorkLoadController> logger
             )
         {
             this.templateService = templateService;
             this.workLoadService = workLoadService;
             this.mapper = mapper;
+            this.logger = logger;
         }
 
 
         /// <summary>
-        /// Статистика загрузки регламентными работами по Видам работ(works)
+        /// Статистика загрузки регламентными работами по Видам работ(ApplicationInWorks)
         /// </summary>
         /// <param name="workGroupId"></param>
         /// <param name="requestQuery"></param>
@@ -43,12 +46,48 @@ namespace PARR.API.Controllers.V1.Statistics
         [HttpGet(ApiRoutes.StatWorkWorkLoad.Get)]
         public async Task<IActionResult> Get([FromRoute] Guid workGroupId, [FromQuery] WorkloadBaseQuery requestQuery)
         {
+            var response = await GetStatisticsAsync(workGroupId, requestQuery);
+
+            return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
+        }
+
+
+        /// <summary>
+        /// Статистика загрузки РР по списку РР
+        /// </summary>
+        /// <param name="requestBody"></param>
+        /// <returns></returns>
+        [HttpPost(ApiRoutes.StatWorkWorkLoad.GetByApplicationInWork)]
+        public async Task<IActionResult> GetByApplicationInWork([FromBody] StatWorkWorkLoadRequest requestBody)
+        {
+            var response = await GetStatisticsAsync(null, requestBody.Filter, requestBody.Jobs);
+
+            return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
+        }
+
+
+        private async Task<List<StatWorkWorkLoadResponse>> GetStatisticsAsync(Guid? workGroupId, WorkloadBaseQuery requestQuery, List<Guid>? applicationInWorks = null)
+        {
+            //защита от дурака, чтоб не выгрузить всю БД
+            if (workGroupId == null && (applicationInWorks == null || applicationInWorks.Count() == 0))
+            {
+                logger.LogWarning($"Пытались выполнить запрос получения статситики с нулевыми параметрами {nameof(workGroupId)}, {nameof(applicationInWorks)}. Controller {nameof(StatWorkWorkLoadController)}");
+                return new List<StatWorkWorkLoadResponse>();
+            }
+
+
             var daysList = workLoadService.GetDatesForPeriod(requestQuery);
 
-            IQueryable<Template> query = templateService.Get()
+            IQueryable<DAL.Models.Template> query = templateService.Get()
                                             .Include(t => t.Host);
 
-            query = workLoadService.FilterTemplatesQuery(query, requestQuery).Where(t => t.Host!.WorkGroupId == workGroupId);
+            query = workLoadService.FilterTemplatesQuery(query, requestQuery);//.Where(t => t.Host!.WorkGroupId == workGroupId);
+
+            if (workGroupId.HasValue)
+                query = query.Where(t => t.Host!.WorkGroupId == workGroupId.Value);
+
+            if (applicationInWorks != null && applicationInWorks.Count() > 0)
+                query = query.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId));
 
             var groupedQuery = query.GroupBy(t => new { t.NextRun.DateTime.Date, t.ApplicationInWorkId })
                                     .Select(t => new
@@ -62,17 +101,25 @@ namespace PARR.API.Controllers.V1.Statistics
 
 
             // получаем только работы по которым есть шаблоны (активированные/деакт) и за любой период
-            var allAppInWorks = await templateService.Get()
+            IQueryable<DAL.Models.Template> appInWorksQuery = templateService.Get()
                                                     .Include(t => t.Host)
-                                                    .Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType)
-                                                    .Where(t => t.Host.WorkGroupId == workGroupId)
-                                                    .Select(t => t.ApplicationsInWork)
-                                                    .Distinct()
-                                                    .ToListAsync();
+                                                    .Include(t => t.ApplicationsInWork).ThenInclude(t => t.Application).ThenInclude(t => t.ApplicationType);
+
+
+            if (workGroupId.HasValue)
+                appInWorksQuery = appInWorksQuery.Where(t => t.Host.WorkGroupId == workGroupId);
+
+            if (applicationInWorks != null && applicationInWorks.Count() > 0)
+                appInWorksQuery = appInWorksQuery.Where(t => applicationInWorks.Any(x => x == t.ApplicationInWorkId));
+
+
+            var appInWorks = await appInWorksQuery.Select(t => t.ApplicationsInWork)
+                                                .Distinct()
+                                                .ToListAsync();
 
             var response = new List<StatWorkWorkLoadResponse>();
 
-            allAppInWorks.ForEach(appInWork =>
+            appInWorks.ForEach(appInWork =>
             {
                 var workLoads = daysList.Select(t => new StatWorkLoadDataResponse
                 {
@@ -87,9 +134,11 @@ namespace PARR.API.Controllers.V1.Statistics
                 });
             });
 
-            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).ToList();
 
-            return Ok(new Response<List<StatWorkWorkLoadResponse>>(response, true));
+
+            return response;
         }
+
     }
 }