From ddbd84e933587954bc145cbf415391113c0d4cb4 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Tue, 2 Apr 2024 14:16:40 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BD=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=BA=20=D0=BF=D0=BE=20=D0=BC=D0=B0=D1=81=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B2=D1=83=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9=20=D0=B1?=
 =?UTF-8?q?=D1=83=D1=80=D0=B8=D0=BB=D1=8C=D1=89=D0=B8=D0=BA=D0=BE=D0=B2=20?=
 =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20=D1=81?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20=D0=B1=D1=83=D1=80=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=89=D0=B8=D0=BA=D0=BE=D0=B2=20=D0=B2=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=BE?=
 =?UTF-8?q?=D1=82=20=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=B9=20=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=B6=D0=B8=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AsbCloudApp/Requests/GetStatRequest.cs        |  4 +-
 .../Repository/ScheduleRepository.cs          |  6 +--
 .../Controllers/DrillerController.cs          | 40 ++++++++++++++++++-
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/AsbCloudApp/Requests/GetStatRequest.cs b/AsbCloudApp/Requests/GetStatRequest.cs
index 5ebb9550..fbc53dd0 100644
--- a/AsbCloudApp/Requests/GetStatRequest.cs
+++ b/AsbCloudApp/Requests/GetStatRequest.cs
@@ -14,7 +14,7 @@ public class GetStatRequest: RequestBase
     public IEnumerable<int> IdsWells { get; set; } = new List<int>();
 
     /// <summary>
-    /// id Ασπθλόωθκΰ
+    /// ροθρξκ κλώχει ασπθλόωθκξβ
     /// </summary>
-    public int? IdDriller { get; set; }
+    public IEnumerable<int> IdsDrillers { get; set; } = new List<int>();
 }
\ No newline at end of file
diff --git a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
index e7c2aa1f..29bf4f5b 100644
--- a/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
+++ b/AsbCloudInfrastructure/Repository/ScheduleRepository.cs
@@ -57,11 +57,11 @@ namespace AsbCloudInfrastructure.Repository
         public async Task<IEnumerable<ScheduleDto>> GetPageAsync(GetStatRequest request, CancellationToken token)
         {
             var idWell = request.IdsWells;
-            var idDriller = request.IdDriller;
+            var idsDrillers = request.IdsDrillers;
             var query =  GetQuery().Where(s =>  request.IdsWells.Contains(s.IdWell));
-            if (idDriller is not null)
+            if (idsDrillers.Any())
             {
-                query.Where(s => s.IdDriller == idDriller);
+                query = query.Where(s => idsDrillers.Contains(s.IdDriller));
             }
 
             var result = await query.ToArrayAsync(token);
diff --git a/AsbCloudWebApi/Controllers/DrillerController.cs b/AsbCloudWebApi/Controllers/DrillerController.cs
index 0fa84e4a..48efca2c 100644
--- a/AsbCloudWebApi/Controllers/DrillerController.cs
+++ b/AsbCloudWebApi/Controllers/DrillerController.cs
@@ -1,7 +1,13 @@
 ο»Ώusing AsbCloudApp.Data;
+using AsbCloudApp.Requests;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {
@@ -13,8 +19,38 @@ namespace AsbCloudWebApi.Controllers
     [Authorize]
     public class DrillerController : CrudController<DrillerDto, ICrudRepository<DrillerDto>>
     {
-        public DrillerController(ICrudRepository<DrillerDto> service)
+        private IScheduleRepository scheduleRepository;
+
+        public DrillerController(ICrudRepository<DrillerDto> service, IScheduleRepository scheduleRepository)
             : base(service)
-        { }
+        {
+            this.scheduleRepository = scheduleRepository;
+        }
+
+        /// <summary>
+        /// ΠŸΠΎΠ»ΡƒΡ‡ΠΈΡ‚ΡŒ список Π±ΡƒΡ€ΠΈΠ»ΡŒΡ‰ΠΈΠΊΠΎΠ² ΠΏΠΎ ΠΊΠ»ΡŽΡ‡Π°ΠΌ скваТин
+        /// </summary>
+        /// <param name="idsWells">массив ΠΊΠ»ΡŽΡ‡Π΅ΠΉ скваТин</param>
+        /// <param name="token">token</param>
+        /// <returns>всС записи</returns>
+        [HttpGet("/api/drillers")]
+        [Permission]
+        [ProducesResponseType(typeof(IEnumerable<DrillerDto>), StatusCodes.Status200OK)]
+        public async Task<IActionResult> GetAsync([FromQuery] IEnumerable<int> idsWells, CancellationToken token)
+        {
+            var request = new GetStatRequest()
+            {
+                IdsWells = idsWells,
+            };
+            var schedulePage = await scheduleRepository.GetPageAsync(request, token);
+            var drillers = schedulePage
+                .Select(s => s.Driller)
+                .Where(d => d is not null)
+                .GroupBy(d => d.Id)
+                .Select(group => group.First())
+                .OrderBy(d => d.Surname);
+
+            return Ok(drillers);
+        }
     }
 }