Merge branch 'dev' into NewUserRoles

AsbCloudApp/Data/RequestLogUserDto.cs

@@ -1,19 +1,16 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AsbCloudApp.Data
 {
     public class RequestLogUserDto
     {
-        public int Id { get; set; }
+        public int UserId { get; set; }
         public string Login { get; set; }
         public string Ip { get; set; }
         public long ElapsedMs { get; set; }
         public DateTime LastDate { get; set; }
         public long Requests { get; set; }
-        public long Errors { get; set; }        
+        public long Errors { get; set; }
+        public UserDto User { get; set; }
     }
 }

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; }
     }
 }

AsbCloudApp/Data/TimeZoneInfo.cs

@@ -1,4 +0,0 @@
-namespace AsbCloudApp.Data
-{
-    
-}

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; }
     }
 }

AsbCloudApp/Services/ITelemetryService.cs

@@ -14,19 +14,26 @@ namespace AsbCloudApp.Services
         int? GetIdWellByTelemetryUid(string uid);
         int GetOrCreateTelemetryIdByUid(string uid);
         double GetTimezoneOffsetByTelemetryId(int idTelemetry);
-        Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token);
         Task<double?> GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token);
+        IEnumerable<TelemetryDto> GetTransmittingTelemetries();
+        DateTime GetLastTelemetryDate(string telemetryUid);
+        DateTime GetLastTelemetryDate(int telemetryId);
+        int? GetIdTelemetryByIdWell(int idWell);
 
+        Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token);
         Task<DatesRangeDto> FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result,
             CancellationToken token);
 
         Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token);
-        int? GetIdTelemetryByIdWell(int idWell);
+
-        int Merge(IEnumerable<int> telemetryIds);
+        /// <summary>
-        IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids();
+        /// Слить данные телеметрии в одну
-        IEnumerable<TelemetryDto> GetTransmittingTelemetries();
+        /// </summary>
-        DateTime GetLastTelemetryDate(string telemetryUid);
+        /// <param name="from">старая (исходная)</param>
-        DateTime GetLastTelemetryDate(int telemetryId);
+        /// <param name="to">новая</param>
+        /// <returns></returns>
+        Task<int> MergeAsync(int from, int to, CancellationToken token);
+
         void SaveRequestDate(string uid, DateTime remoteDate);
     }
 }

AsbCloudDb/EFExtentions.cs

@@ -35,6 +35,20 @@ namespace AsbCloudDb
 
             return database.ExecuteSqlRawAsync(query, token);
         }
+
+        public static string GetTableName<T>(this DbSet<T> dbSet)
+        where T : class
+        {
+            var factory = GetQueryStringFactory(dbSet);
+            return factory.TableName;
+        }
+
+        public static IEnumerable<string> GetColumnsNames<T>(this DbSet<T> dbSet)
+            where T : class
+        {
+            var factory = GetQueryStringFactory(dbSet);
+            return factory.Columns;
+        }
     }
 
     interface IQueryStringFactory{}
@@ -43,24 +57,26 @@ namespace AsbCloudDb
         where T : class
     {
         private readonly string insertHeader;
-
         private readonly string pk;
         private readonly string conflictBody;
         private readonly IEnumerable<IClrPropertyGetter> getters;
 
+        public string TableName { get; }
+        public IEnumerable<string> Columns { get; }
+
         public QueryStringFactory(DbSet<T> dbset)
         {
             var properties = dbset.EntityType.GetProperties();
             var pkColsNames = dbset.EntityType.FindPrimaryKey()?.Properties.Select(p => p.GetColumnBaseName());
             pk = pkColsNames is null ? string.Empty : $"({string.Join(", ", pkColsNames)})";
 
-            var tableName = dbset.EntityType.GetTableName();
+            TableName = dbset.EntityType.GetTableName();
             getters = properties.Select(p => p.GetGetter());
-            var colNames = properties.Select(p => $"\"{p.GetColumnBaseName()}\"");
+            Columns = properties.Select(p => $"\"{p.GetColumnBaseName()}\"");
-            var colunmsString = $"({string.Join(", ", colNames)})";
+            var colunmsString = $"({string.Join(", ", Columns)})";
 
-            insertHeader = $"INSERT INTO {tableName} {colunmsString} VALUES ";
+            insertHeader = $"INSERT INTO {TableName} {colunmsString} VALUES ";
-            var excludedUpdateSet = string.Join(", ", colNames.Select(n => $"{n} = excluded.{n}"));
+            var excludedUpdateSet = string.Join(", ", Columns.Select(n => $"{n} = excluded.{n}"));
             conflictBody = $" ON CONFLICT {pk} DO UPDATE SET {excludedUpdateSet};";
         }
 

AsbCloudDb/Migrations/20211217104347_RenameDocsCategories.cs

@@ -0,0 +1,65 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace AsbCloudDb.Migrations
+{
+    public partial class RenameDocsCategories : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 11);
+
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 8,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Долотный сервис", "toolService" });
+
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 9,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Буровой подрядчик", "drillService" });
+
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 10,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Сервис по заканчиванию скважины", "closingService" });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 8,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Последний замер бурового раствора ПЛАН", "fluidPlanLastData" });
+
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 9,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Последний замер бурового раствора ФАКТ", "fluidFactLastData" });
+
+            migrationBuilder.UpdateData(
+                table: "t_file_category",
+                keyColumn: "id",
+                keyValue: 10,
+                columns: new[] { "name", "short_name" },
+                values: new object[] { "Последние данные Шламограммы", "mudLastData" });
+
+            migrationBuilder.InsertData(
+                table: "t_file_category",
+                columns: new[] { "id", "name", "short_name" },
+                values: new object[] { 11, "Последние данные ННБ", "nnbLastData" });
+        }
+    }
+}

AsbCloudDb/Migrations/AsbCloudDbContextModelSnapshot.cs

@@ -437,26 +437,20 @@ namespace AsbCloudDb.Migrations
                         new
                         {
                             Id = 8,
-                            Name = "Последний замер бурового раствора ПЛАН",
+                            Name = "Долотный сервис",
-                            ShortName = "fluidPlanLastData"
+                            ShortName = "toolService"
                         },
                         new
                         {
                             Id = 9,
-                            Name = "Последний замер бурового раствора ФАКТ",
+                            Name = "Буровой подрядчик",
-                            ShortName = "fluidFactLastData"
+                            ShortName = "drillService"
                         },
                         new
                         {
                             Id = 10,
-                            Name = "Последние данные Шламограммы",
+                            Name = "Сервис по заканчиванию скважины",
-                            ShortName = "mudLastData"
+                            ShortName = "closingService"
-                        },
-                        new
-                        {
-                            Id = 11,
-                            Name = "Последние данные ННБ",
-                            ShortName = "nnbLastData"
                         },
                         new
                         {

AsbCloudDb/Model/AsbCloudDbContext.cs

@@ -385,10 +385,12 @@ namespace AsbCloudDb.Model
                     new FileCategory {Id = 5, Name = "Документы по скважине", ShortName = "wellDocuments"},
                     new FileCategory {Id = 6, Name = "Супервайзер", ShortName = "supervisor"},
                     new FileCategory {Id = 7, Name = "Мастер", ShortName = "master"},
-                    new FileCategory {Id = 8, Name = "Последний замер бурового раствора ПЛАН", ShortName = "fluidPlanLastData"},
+
-                    new FileCategory {Id = 9, Name = "Последний замер бурового раствора ФАКТ", ShortName = "fluidFactLastData"},
+                    new FileCategory {Id = 8, Name = "Долотный сервис", ShortName = "toolService"},
-                    new FileCategory {Id = 10, Name = "Последние данные Шламограммы", ShortName = "mudLastData"},
+                    new FileCategory {Id = 9, Name = "Буровой подрядчик", ShortName = "drillService"},
-                    new FileCategory {Id = 11, Name = "Последние данные ННБ", ShortName = "nnbLastData"},
+                    new FileCategory {Id = 10, Name = "Сервис по заканчиванию скважины", ShortName = "closingService"},
+                    //new FileCategory {Id = 11, Name = "", ShortName = ""},
+
                     new FileCategory {Id = 12, Name = "Рапорт", ShortName = "report"},
                     new FileCategory {Id = 13, Name = "Программа бурения, части", ShortName = "ПБч"},
                     new FileCategory {Id = 14, Name = "Программа бурения", ShortName = "ПБ"},

AsbCloudDb/Model/TelemetryInfo.cs

@@ -12,7 +12,8 @@ namespace AsbCloudDb.Model
         public string Customer { get; set; }
         public string Deposit { get; set; }
         public string HmiVersion { get; set; }
-        public string PlcVersion { get; set; }
+        public string SaubPlcVersion { get; set; }
+        public string SpinPlcVersion { get; set; }
         public string Comment { get; set; }
     }
 }

AsbCloudInfrastructure/Services/RequerstTrackerService.cs

@@ -22,7 +22,7 @@ namespace AsbCloudInfrastructure.Services
         private readonly ConcurrentQueue<RequestLogDto> slowRequests = new ConcurrentQueue<RequestLogDto>();
         private readonly ConcurrentQueue<RequestLogDto> errorRequests = new ConcurrentQueue<RequestLogDto>();
         private readonly ConcurrentDictionary<string, RequestLogUserDto> users = new ConcurrentDictionary<string, RequestLogUserDto>();
-
+        
         private static IEnumerable<RequestLogDto> Get(IEnumerable<RequestLogDto> list, int take = -1)
         {
             IEnumerable<RequestLogDto> orderedlist = list.OrderByDescending(r => r.Date);
@@ -35,7 +35,7 @@ namespace AsbCloudInfrastructure.Services
         {
             IEnumerable<RequestLogUserDto> result = users.Values.OrderByDescending(u => u.LastDate);
             if (take > 0)
-                result = result.Take(take);
+                result = result.Take(take);            
             return result;
         }
 
@@ -109,9 +109,10 @@ namespace AsbCloudInfrastructure.Services
                 if (!users.ContainsKey(key))
                     users[key] = new RequestLogUserDto
                     {
-                        Id = requestLog.UserId,
+                        UserId = requestLog.UserId,
                         Ip = requestLog.UserIp,
                         Login = requestLog.UserLogin,
+                        //User = userService.Get(requestLog.UserId),
                     };
                 users[key].ElapsedMs += requestLog.ElapsedMilliseconds;
                 users[key].LastDate = requestLog.Date;

AsbCloudInfrastructure/Services/SetpointsService.cs

@@ -16,16 +16,16 @@ namespace AsbCloudInfrastructure.Services
         // ## Инфо от АПГ от 26.11.2021, дополнения ШОВ от 26.11.2021
         private static readonly Dictionary<string, SetpointInfoDto> SetpointInfos = new ()
         {
-            { "bitLoad", new SetpointInfoDto { Name = "bitLoad", DisplayName = "Осевая нагрузка" } },
+            { "bitLoad", new SetpointInfoDto { Name = "bitLoad", DisplayName = "Осевая нагрузка, т" } },
-            { "dPressureMaxRotorSP", new SetpointInfoDto { Name = "dPressureMaxRotorSP", DisplayName = "Дифференциальное рабочее давление в роторе" } },
+            { "dPressureMaxRotorSP", new SetpointInfoDto { Name = "dPressureMaxRotorSP", DisplayName = "Дифференциальное рабочее давление в роторе, атм" } },
-            { "dPressureMaxSlideSP", new SetpointInfoDto { Name = "dPressureMaxSlideSP", DisplayName = "Дифференциальное рабочее давление в слайде" } },
+            { "dPressureMaxSlideSP", new SetpointInfoDto { Name = "dPressureMaxSlideSP", DisplayName = "Дифференциальное рабочее давление в слайде, атм" } },
-            { "torque", new SetpointInfoDto { Name = "torque", DisplayName = "Крутящий момент" } },
+            { "torque", new SetpointInfoDto { Name = "torque", DisplayName = "Крутящий момент, кН/м" } },
-            { "speedRotorSp", new SetpointInfoDto { Name = "speedRotorSp", DisplayName = "Скорость бурения в роторе" } },
+            { "speedRotorSp", new SetpointInfoDto { Name = "speedRotorSp", DisplayName = "Скорость бурения в роторе, м/ч" } },
-            { "speedSlideSp", new SetpointInfoDto { Name = "speedSlideSp", DisplayName = "Скорость бурения в слайде" } },
+            { "speedSlideSp", new SetpointInfoDto { Name = "speedSlideSp", DisplayName = "Скорость бурения в слайде, м/ч" } },
-            { "speedDevelopSp", new SetpointInfoDto { Name = "speedDevelopSp", DisplayName = "Скорость проработки" } },
+            { "speedDevelopSp", new SetpointInfoDto { Name = "speedDevelopSp", DisplayName = "Скорость проработки, м/ч" } },
-            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Скорость обратной проработки" } }, // Такая же что и прямой
+            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Скорость обратной проработки, м/ч" } }, // Такая же что и прямой
-            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Обороты ВСП" } }, // Оно в ПЛК спинмастера, пока сделать нельзя, позднее можно.
+            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Обороты ВСП, об/мин" } }, // Оно в ПЛК спинмастера, пока сделать нельзя, позднее можно.
-            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Расход промывочной жидкости" } }, // Нет в контроллере
+            //{ "", new SetpointInfoDto { Name = "", DisplayName = "Расход промывочной жидкости, л/с" } }, // Нет в контроллере
         };
 
         private readonly CacheTable<SetpointsRequest> cacheSetpoints;

AsbCloudInfrastructure/Services/TelemetryService.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System;
 using System.Threading;
 using Microsoft.EntityFrameworkCore;
+using AsbCloudDb;
 
 namespace AsbCloudInfrastructure.Services
 {
@@ -215,157 +216,166 @@ namespace AsbCloudInfrastructure.Services
         private Telemetry GetOrCreateTelemetryByUid(string uid)
             => cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry { RemoteUid = uid });
 
-        public IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids()
+        public async Task<int> MergeAsync(int from, int to, CancellationToken token)
         {
-            return db.Telemetries
+            if (from == to)
-                .ToList()
+                return -2;
-                .GroupBy(t => t.RemoteUid)
-                .Where(g => g.Count() > 1)
-                .Select(g => (g.Key, g.Select(t=>t.Id).ToArray()));
-        }
 
-        public int Merge(IEnumerable<int> telemetryIds)
+            var stopwath = new System.Diagnostics.Stopwatch();
-        {
+            stopwath.Start();
-            if (telemetryIds.Count() < 2)
-                throw new ArgumentException($"telemetryIds {telemetryIds} < 2. nothing to merge.", nameof(telemetryIds));
 
-            // найти телеметрию с наиболее полными справочниками и принять её за основную
+            var transaction = await db.Database.BeginTransactionAsync(token).ConfigureAwait(false);            
-            // отделить основную от остальных
-
-            // Оценка трудоебкости
-            var telemetriesGrade = db.Telemetries
-                .Include(t => t.Messages)
-                .Include(t => t.DataSaub)
-                .Include(t => t.DataSpin)
-                .Include(t => t.Well)
-                .Where(t => telemetryIds.Contains(t.Id))
-                .Select(t => new {
-                    t.Id,
-                    t.RemoteUid,
-                    t.Info,
-                    IdWell = t.Well != null ? t.Well.Id : int.MinValue,
-                    Records = t.Messages.Count + t.DataSaub.Count + t.DataSpin.Count,
-                    EventsAny = t.Events.Any(),
-                    UsersAny = t.Users.Any(),
-                })
-                .OrderByDescending(t=>t.Records)
-                .ToList();
-
-            var telemetryDestId = telemetriesGrade.FirstOrDefault().Id;
-            if (telemetryDestId == default)
-                return 0;
-
-            var telemetriesSrcIds = telemetryIds.Where(t => t != telemetryDestId).ToList();
-            if(!telemetriesSrcIds.Any())
-                return 0;
-
-            var telemetriesSrcIdsSql = $"({string.Join(',', telemetriesSrcIds)})";
-
-            var (RemoteUid, Info) = telemetriesGrade
-                .Where(t => t.Info != null)
-                .OrderByDescending(t => t.Id)
-                .Select(t => (t.RemoteUid, t.Info))
-                .FirstOrDefault();
-
-            var wellId = telemetriesGrade
-                .Where(t => t.IdWell > 0)
-                .OrderByDescending(t => t.Id)
-                .Select(t => t.IdWell)
-                .FirstOrDefault();
-
-            // начало изменений
-            Console.WriteLine($"Start merge telemetries ids: [{string.Join(',', telemetriesSrcIds)}] to {telemetryDestId}");
-            var sw = new System.Diagnostics.Stopwatch();
-            sw.Start();
-            var transaction = db.Database.BeginTransaction();
-            int rows = 0;
             try
             {
-                var telemetryDst = db.Telemetries.FirstOrDefault(t => t.Id == telemetryDestId);
+                var affected = 0;
-                telemetryDst.RemoteUid = RemoteUid;
+                
-                telemetryDst.Info = Info;
+                var wellFrom = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == from, token)
+                    .ConfigureAwait(false);
+                var wellTo = await db.Wells.FirstOrDefaultAsync(w => w.IdTelemetry == to, token)
+                    .ConfigureAwait(false);
 
-                if (wellId != default)
+                if (wellTo is not null && wellFrom is not null)
+                    return -2;
+
+                if (wellTo is null && wellFrom is not null)
                 {
-                    var well = db.Wells.FirstOrDefault(w => w.Id == wellId);
+                    wellFrom.IdTelemetry = to;
-                    well.IdTelemetry = telemetryDestId;
+                    affected += await db.SaveChangesAsync(token);
                 }
 
-                // events merge
+                affected += await MergeEventsAndMessagesAndUsersAsync(from, to, token);
-                var telemetryDstEventsIds = db.TelemetryEvents.Where(t => t.IdTelemetry == telemetryDestId).Select(t => t.IdEvent).ToList();
+                affected += await MergeDataAsync<TelemetryDataSaub>(from, to, token);
-                var telemetrySrcEvents = db.TelemetryEvents
+                affected += await MergeDataAsync<TelemetryDataSpin>(from, to, token);
-                    .Where(t => telemetriesSrcIds.Contains(t.IdTelemetry) && !telemetryDstEventsIds.Contains(t.IdEvent))
+                
-                    .Select(t => new TelemetryEvent
+                affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry_analysis WHERE id_telemetry = {from} OR id_telemetry = {to};", token)
-                    {
+                    .ConfigureAwait(false);
-                        IdTelemetry = telemetryDestId,
+                affected += await db.Database.ExecuteSqlRawAsync($"DELETE FROM t_telemetry WHERE id = {from};", token)
-                        IdEvent = t.IdEvent,
+                    .ConfigureAwait(false);
-                        IdCategory = t.IdCategory,
+                await transaction.CommitAsync(token).ConfigureAwait(false);
-                        MessageTemplate = t.MessageTemplate,
-                    })
-                    .ToList();
-                var telemetryEventNewUniq = new Dictionary<int, TelemetryEvent>();
-                foreach (var telemetryEvent in telemetrySrcEvents)
-                    telemetryEventNewUniq[telemetryEvent.IdEvent] = telemetryEvent;
-                if (telemetrySrcEvents.Any())
-                    db.TelemetryEvents.AddRange(telemetryEventNewUniq.Values);
 
-                // users merge
+                stopwath.Stop();
-                var telemetryDstUsersIds = db.TelemetryUsers.Where(t => t.IdTelemetry == telemetryDestId).Select(t => t.IdUser).ToList();
+                Console.WriteLine($"Successfully commited in {1d * stopwath.ElapsedMilliseconds / 1000d: #0.00} sec. Affected {affected} rows.");
-                var telemetrySrcUsers = db.TelemetryUsers
+                return affected;
-                    .Where(t => telemetriesSrcIds.Contains(t.IdTelemetry) && !telemetryDstUsersIds.Contains(t.IdUser))
-                    .Select(t => new TelemetryUser
-                    {
-                        IdTelemetry = telemetryDestId,
-                        IdUser = t.IdUser,
-                        Level = t.Level,
-                        Name = t.Name,
-                        Patronymic = t.Patronymic,
-                        Surname = t.Surname,
-                    }).ToList();
-                var telemetryUserNewUniq = new Dictionary<int, TelemetryUser>();
-                foreach (var telemetryUser in telemetrySrcUsers)
-                    telemetryUserNewUniq[telemetryUser.IdUser] = telemetryUser;
-                if (telemetrySrcUsers.Any())
-                    db.TelemetryUsers.AddRange(telemetryUserNewUniq.Values);
-
-                db.SaveChanges();
-
-                db.Database.SetCommandTimeout(3_000); // 5 мин
-
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_data_saub DISABLE TRIGGER ALL;");
-                rows += db.Database.ExecuteSqlRaw($"UPDATE t_telemetry_data_saub SET id_telemetry = {telemetryDestId} WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_data_saub ENABLE TRIGGER ALL;");
-
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_data_spin DISABLE TRIGGER ALL;");
-                rows += db.Database.ExecuteSqlRaw($"UPDATE t_telemetry_data_spin SET id_telemetry = {telemetryDestId} WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_data_spin ENABLE TRIGGER ALL;");
-
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_analysis DISABLE TRIGGER ALL;");
-                rows += db.Database.ExecuteSqlRaw($"UPDATE t_telemetry_analysis SET id_telemetry = {telemetryDestId} WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_analysis ENABLE TRIGGER ALL;");
-
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_message DISABLE TRIGGER ALL;");
-                rows += db.Database.ExecuteSqlRaw($"UPDATE t_telemetry_message SET id_telemetry = {telemetryDestId} WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                db.Database.ExecuteSqlRaw($"ALTER TABLE t_telemetry_message ENABLE TRIGGER ALL;");
-
-                rows += db.Database.ExecuteSqlRaw($"DELETE FROM t_telemetry_event WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                rows += db.Database.ExecuteSqlRaw($"DELETE FROM t_telemetry_user WHERE id_telemetry IN {telemetriesSrcIdsSql};");
-                rows += db.Database.ExecuteSqlRaw($"DELETE FROM t_telemetry WHERE id IN {telemetriesSrcIdsSql};");
-
-                transaction.Commit();
-                sw.Stop();
-                Console.WriteLine($"Successfully commited in {1d*sw.ElapsedMilliseconds/1000d: #0.00} sec. Affected {rows} rows.");
             }
             catch(Exception ex)
             {
-                Console.WriteLine($"Fail. Rollback. Reason is:{ex.Message}");
+                System.Diagnostics.Trace.WriteLine($"Merge() Fail. Rollback. Reason is:{ex.Message}");
-                transaction.Rollback();
+                await transaction.RollbackAsync(token).ConfigureAwait(false);
-                return 0;
+                return -1;
             }
-            
-            return rows;
         }
 
-        
+        private async Task<int> MergeEventsAndMessagesAndUsersAsync(int from, int to, CancellationToken token)
+        {
+            var messagesFrom = await db.TelemetryMessages
+                .Where(d => d.IdTelemetry == from)
+                .ToListAsync(token)
+                .ConfigureAwait(false);
+
+            var usersFromQuery = db.TelemetryUsers
+                .Where(d => d.IdTelemetry == from);
+            var usersFrom = await usersFromQuery
+                .ToListAsync(token)
+                .ConfigureAwait(false);
+
+            var usersTo = await db.TelemetryUsers
+                .Where(d => d.IdTelemetry == to)
+                .AsNoTracking()
+                .ToListAsync(token)
+                .ConfigureAwait(false);
+
+            var usersToNextId = usersTo.Max(u => u.IdUser) + 100;
+
+            messagesFrom.ForEach(m => m.IdTelemetry = to);
+
+            foreach (var userFrom in usersFrom)
+            {
+                var userTo = usersTo
+                    .FirstOrDefault(u=>u.IdUser == userFrom.IdUser);
+
+                if (userTo is null ||
+                    userTo.Name != userFrom.Name ||
+                    userTo.Surname != userFrom.Surname ||
+                    userTo.Patronymic != userFrom.Patronymic)
+                {
+                    messagesFrom
+                        .Where(m => m.IdTelemetryUser == userFrom.IdUser)
+                        .ToList()
+                        .ForEach(m => m.IdTelemetryUser = usersToNextId);
+                    userFrom.IdUser = usersToNextId;
+                    userFrom.IdTelemetry = to;
+                    usersToNextId++;
+                }
+            }
+
+            var eventsFromQuery = db.TelemetryEvents
+                .Where(d => d.IdTelemetry == from);
+            var eventsFrom = await eventsFromQuery
+                .ToListAsync(token)
+                .ConfigureAwait(false);
+
+            var eventsTo = await db.TelemetryEvents
+                .Where(d => d.IdTelemetry == to)
+                .AsNoTracking()
+                .ToListAsync(token)
+                .ConfigureAwait(false);
+
+            var eventsToNextId = eventsTo.Max(e => e.IdEvent) + 1;
+
+            foreach (var eventFrom in eventsFrom)
+            {
+                var eventTo = eventsTo
+                    .FirstOrDefault(e => e.IdEvent == eventFrom.IdEvent);
+
+                if (eventTo is null ||
+                    eventTo.IdCategory != eventFrom.IdCategory ||
+                    eventTo.MessageTemplate != eventFrom.MessageTemplate)
+                {
+                    messagesFrom
+                        .Where(m => m.IdEvent == eventFrom.IdEvent)
+                        .ToList()
+                        .ForEach(m => m.IdEvent = eventsToNextId);
+                    eventFrom.IdEvent = eventsToNextId;
+                    eventFrom.IdTelemetry = to;
+                    eventsToNextId++;
+                }
+            }
+
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message DISABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            var affected = await db.SaveChangesAsync(token).ConfigureAwait(false);
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_user ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_event ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            await db.Database.ExecuteSqlRawAsync($"ALTER TABLE t_telemetry_message ENABLE TRIGGER ALL;", token).ConfigureAwait(false);
+            db.TelemetryUsers.RemoveRange(usersFromQuery);
+            db.TelemetryEvents.RemoveRange(eventsFromQuery);
+            affected += await db.SaveChangesAsync(token).ConfigureAwait(false);
+            return affected;
+        }
+
+        private async Task<int> MergeDataAsync<TEntity>(int from, int to, CancellationToken token)
+            where TEntity: class, AsbCloudDb.Model.ITelemetryData
+        {
+            const string IdTelemetryColumnName = "\"id_telemetry\"";
+            var dbSet = db.Set<TEntity>();
+            var tableName = dbSet.GetTableName();
+            var columns = dbSet.GetColumnsNames().ToList();
+            var index = columns.FindIndex(c => c.ToLower() == IdTelemetryColumnName.ToLower());
+            if (index < 0)
+                return -5;
+            columns[index] = $"{to} as {IdTelemetryColumnName}";
+            var columnsString = string.Join(',', columns);
+            var sql = $"INSERT INTO {tableName} " +
+                $"select {columnsString} " +
+                $"from {tableName} " +
+                $"where {IdTelemetryColumnName} = {from};" +
+                $"delete from {tableName} where {IdTelemetryColumnName} = {from};";
+
+            var affected = await db.Database.ExecuteSqlRawAsync(sql, token)
+                .ConfigureAwait(false);
+
+            return affected;
+        }
     }
 }

AsbCloudWebApi/Controllers/AdminTelemetryController.cs

@@ -2,8 +2,8 @@
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System.Collections.Generic;
+using System.Threading;
-using System.Linq;
+using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {
@@ -22,25 +22,16 @@ namespace AsbCloudWebApi.Controllers
             this.telemetryService = telemetryService;
         }
 
-
-        [HttpGet]
-        [Route("/reduntentUids")]
-        public IActionResult GetRedundentRemoteUids()
-        {
-            var result = telemetryService.GetRedundantRemoteUids().Select(i => new { i.Key, ids = i.Ids });
-            return Ok(result);
-        }
-
         /// <summary>
-        /// merge telemetries
+        /// Merge telemetries. No body required.
         /// </summary>
-        /// <param name="telemetriesIds">array of ids</param>
         /// <returns></returns>
         [HttpPost]
-        [Route("/merge")]
+        [Route("/merge/{idFrom}/{idTo}")]
-        public IActionResult MergeTelemetries([FromBody] List<int> telemetriesIds)
+        public async Task<IActionResult> MergeTelemetriesAsync(int idFrom, int idTo, CancellationToken token = default)
         {
-            var count = telemetryService.Merge(telemetriesIds);
+            var count = await telemetryService.MergeAsync(idFrom, idTo, token)
+                .ConfigureAwait(false);
             return Ok(count);
         }
     }

AsbCloudWebApi/Controllers/RequerstTrackerController.cs

@@ -1,6 +1,8 @@
-using AsbCloudApp.Services;
+using AsbCloudApp.Data;
+using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using System.Collections.Generic;
 
 namespace AsbCloudWebApi.Controllers
 {
@@ -70,6 +72,8 @@ namespace AsbCloudWebApi.Controllers
         /// <param name="take">от 1 до 1000</param>
         /// <returns></returns>
         [HttpGet("users")]
+
+        [ProducesResponseType(typeof(IEnumerable<RequestLogUserDto>), (int)System.Net.HttpStatusCode.OK)]
         public IActionResult GetUsersStat(int take = 512)
         {
             var result = service.GetUsersStat(take);

ConsoleApp1/DbDemoDataService.cs

@@ -48,7 +48,7 @@ namespace ConsoleApp1
                             Deposit = "1",
                             Customer = "1",
                             HmiVersion = "1",
-                            PlcVersion = "1",
+                            //PlcVersion = "1",
                             TimeZoneId = "1",
                             DrillingStartDate = DateTime.Parse("2021-06-29T12:01:19.000000"),
                             TimeZoneOffsetTotalHours = 5.0