From 6e31d29784a76384ec2931af7739d55a821289b3 Mon Sep 17 00:00:00 2001
From: ngfrolov <ng.frolov@autodrilling.ru>
Date: Wed, 28 Sep 2022 14:52:45 +0500
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE=D0=B2=D1=82=D0=BE=D1=80=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BC=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B8=20WITS=20=D1=82=D0=B5=D0=BB=D0=B5=D0=BC=D0=B5=D1=82?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Repository/WitsRecordRepository.cs        | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
index 1be9a7de..0c750c6b 100644
--- a/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
+++ b/AsbCloudInfrastructure/Repository/WitsRecordRepository.cs
@@ -66,17 +66,33 @@ namespace AsbCloudInfrastructure.Repository
             return new TDto[] { Convert(data, timezoneHours) };
         }
 
-        public Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token)
+        public async Task SaveDataAsync(int idTelemetry, IEnumerable<TDto> dtos, CancellationToken token)
         {
             if (dtos?.Any() != true)
-                return Task.CompletedTask;
+                return;
 
             var timezoneHours = telemetryService.GetTimezone(idTelemetry).Hours;
             var entities = dtos
                 .DistinctBy(d => d.DateTime)
                 .Select(dto => Convert(dto, idTelemetry, timezoneHours));
-            dbset.AddRange(entities);
-            return db.SaveChangesAsync(token);
+
+            var dateMin = entities.Min(e => e.DateTime);
+            var dateMax = entities.Max(e => e.DateTime);
+            var existingEntities = await dbset
+                .Where(e => e.IdTelemetry == idTelemetry)
+                .Where(e => e.DateTime >= dateMin && e.DateTime <= dateMax)
+                .Select(e => new { e.DateTime, e.IdTelemetry})
+                .ToArrayAsync(token);
+
+            foreach (var entity in entities)
+            {
+                if (existingEntities.Any(e=>e.IdTelemetry == entity.IdTelemetry && e.DateTime == entity.DateTime))                
+                    dbset.Update(entity);                
+                else
+                    dbset.Add(entity);
+            }
+            
+            await db.SaveChangesAsync(token);
         }
 
         private static TEntity Convert(TDto dto, int idTelemetry, double timezoneHours)