From 638d8eb3da9f1b82a6f8472831e7eae712786941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?=
 <nikita.grigorevich@gmail.com>
Date: Tue, 12 Oct 2021 11:26:41 +0500
Subject: [PATCH] Drop useless method

---
 AsbCloudApp/Services/IMeasureService.cs       |  1 -
 .../Services/MeasureService.cs                | 39 +------------------
 .../Controllers/MeasureController.cs          | 11 ------
 3 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/AsbCloudApp/Services/IMeasureService.cs b/AsbCloudApp/Services/IMeasureService.cs
index 25dffbbc..bd74c5f6 100644
--- a/AsbCloudApp/Services/IMeasureService.cs
+++ b/AsbCloudApp/Services/IMeasureService.cs
@@ -10,7 +10,6 @@ namespace AsbCloudApp.Services
         Task<Dictionary<int, string>> GetCategoriesAsync(CancellationToken token);
         Task<MeasureDto> GetLastAsync(int idWell, int idCategory, CancellationToken token);
         Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, CancellationToken token);
-        Task<IEnumerable<MeasureDto>> GetAllLastAsync(int idWell, CancellationToken token);
         Task<int> InsertAsync(int idWell, MeasureDto data, CancellationToken token);
         Task<int> UpdateAsync(int idWell, MeasureDto data, CancellationToken token);
         Task<int> MarkAsDeleteAsync(int idWell, int idData, CancellationToken token);
diff --git a/AsbCloudInfrastructure/Services/MeasureService.cs b/AsbCloudInfrastructure/Services/MeasureService.cs
index c457788b..e2d74479 100644
--- a/AsbCloudInfrastructure/Services/MeasureService.cs
+++ b/AsbCloudInfrastructure/Services/MeasureService.cs
@@ -47,42 +47,6 @@ namespace AsbCloudInfrastructure.Services
             return dtos;
         }
 
-        public async Task<IEnumerable<MeasureDto>> GetAllLastAsync(int idWell, CancellationToken token)
-        {
-            var categories = await cacheCategories.WhereAsync(token).ConfigureAwait(false);
-            if (!categories.Any())
-                return default;
-
-            var queries = categories.Select(c => db.Measures.Include(m => m.Category)
-                .Where(m => m.IdWell == idWell && m.IdCategory == c.Id && !m.IsDeleted)
-                .OrderByDescending(m => m.Timestamp)
-                .Take(1)
-            );
-
-            var qi = queries.GetEnumerator();
-            qi.MoveNext();
-            var query = qi.Current;
-            while (qi.MoveNext())
-                query = query.Union(qi.Current);
-
-            //var query = db.Measures
-            //    .Where(e => e.IdWell == idWell)
-            //    .GroupBy(e => e.IdCategory)
-            //    .Select(g => g.Where(e => e.Timestamp == g.Max(m => m.Timestamp)).First());
-
-            //var query = db.Measures
-            //    .Where(m => m.IdWell == idWell && m.Timestamp == db.Measures
-            //        .Where(subm => subm.IdWell == m.IdWell && subm.IdCategory == m.IdCategory).Max(subm => subm.Timestamp));
-
-            var entities = await query
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            var dtos = entities.Adapt<MeasureDto, Measure>((d, s) => d.CategoryName = s.Category?.Name);
-            return dtos;
-        }
-
         public async Task<IEnumerable<MeasureDto>> GetHisoryAsync(int idWell, CancellationToken token)
         {
             var query = db.Measures.Include(m => m.Category)
@@ -105,6 +69,7 @@ namespace AsbCloudInfrastructure.Services
             if (data.Data is null)
                 throw new ArgumentException("data.data is not optional", nameof(data));
             var entity = data.Adapt<Measure>();
+            entity.IdWell = idWell;
             db.Measures.Add(entity);
             return db.SaveChangesAsync(token);
         }
@@ -122,10 +87,10 @@ namespace AsbCloudInfrastructure.Services
                 .Where(m => m.Id == data.Id && !m.IsDeleted)
                 .FirstOrDefaultAsync(token)
                 .ConfigureAwait(false);
-
             if (entity is null)
                 throw new ArgumentException("id doesn't exist", nameof(data));
 
+            entity.IdWell = idWell;
             entity.Timestamp = data.Timestamp;
             entity.Data = data.Data;
 
diff --git a/AsbCloudWebApi/Controllers/MeasureController.cs b/AsbCloudWebApi/Controllers/MeasureController.cs
index 6422026b..f5ad687f 100644
--- a/AsbCloudWebApi/Controllers/MeasureController.cs
+++ b/AsbCloudWebApi/Controllers/MeasureController.cs
@@ -32,17 +32,6 @@ namespace AsbCloudWebApi.Controllers
             return Ok(result);
         }
 
-        [HttpGet]
-        [Route("lastAll")]
-        public async Task<IActionResult> GetAllLastAsync([FromRoute] int idWell, CancellationToken token = default)
-        {
-            if (!await CanUserAccessToWellAsync(idWell, token).ConfigureAwait(false))
-                return Forbid();
-
-            var result = await measureService.GetAllLastAsync(idWell, token).ConfigureAwait(false);
-            return Ok(result);
-        }
-
         [HttpGet]
         [Route("last/{idCategory}")]
         public async Task<IActionResult> GetLastAsync([FromRoute] int idWell, [FromRoute] int idCategory, CancellationToken token = default)