From 9bb1cc5abc6cca1b5e15b6bc965e5f5b7d2859a1 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: Fri, 17 Dec 2021 13:07:45 +0500
Subject: [PATCH] Add some fields into dtos to make possible assign telemetry
 to well.

---
 AsbCloudApp/Data/TelemetryDto.cs              |  1 +
 AsbCloudApp/Data/WellDto.cs                   |  1 +
 .../Services/TelemetryService.cs              | 25 -------------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/AsbCloudApp/Data/TelemetryDto.cs b/AsbCloudApp/Data/TelemetryDto.cs
index ce79b5f8..94ff740e 100644
--- a/AsbCloudApp/Data/TelemetryDto.cs
+++ b/AsbCloudApp/Data/TelemetryDto.cs
@@ -5,5 +5,6 @@
         public int Id { get; set; }
         public string RemoteUid { get; set; }
         public TelemetryInfoDto Info { get; set; }
+        public WellDto Well { get; set; }
     }
 }
diff --git a/AsbCloudApp/Data/WellDto.cs b/AsbCloudApp/Data/WellDto.cs
index d55e7549..7d2bef82 100644
--- a/AsbCloudApp/Data/WellDto.cs
+++ b/AsbCloudApp/Data/WellDto.cs
@@ -20,6 +20,7 @@ namespace AsbCloudApp.Data
         /// </summary>
         public int IdState { get; set; }
         public DateTime LastTelemetryDate { get; set; }
+        public int? IdTelemetry { get; set; }
         public TelemetryDto Telemetry { get; set; }
     }
 }
diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs
index 0c244e32..9c7d9c34 100644
--- a/AsbCloudInfrastructure/Services/TelemetryService.cs
+++ b/AsbCloudInfrastructure/Services/TelemetryService.cs
@@ -377,30 +377,5 @@ namespace AsbCloudInfrastructure.Services
 
             return affected;
         }
-
-        //todo: delete this
-        private async Task<int> MergeDataAsync_old<TEntity>(int from, int to, CancellationToken token)
-            where TEntity : class, AsbCloudDb.Model.ITelemetryData
-        {
-            var dbSet = db.Set<TEntity>();
-            var entitiesFromQuery = dbSet.Where(d => d.IdTelemetry == from);
-            var entitiesFrom = await entitiesFromQuery
-                .AsNoTracking()
-                .ToListAsync(token)
-                .ConfigureAwait(false);
-
-            dbSet.RemoveRange(entitiesFromQuery);
-
-            var affected = await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-
-            entitiesFrom.ForEach(d => d.IdTelemetry = to);
-            dbSet.AddRange(entitiesFrom);
-
-            affected += await db.SaveChangesAsync(token)
-                .ConfigureAwait(false);
-
-            return affected;
-        }
     }
 }