Merge branch 'dev' into convertToPdf

AsbCloudApp/Data/SAUB/TelemetryWirelineRunOutDto.cs

@@ -3,10 +3,11 @@
 namespace AsbCloudApp.Data.SAUB
 {
 #nullable enable
+
     /// <summary>
-    /// DTO телеметрии наработки талевого каната
+    /// DTO телеметрии наработки талевого каната от панели бурильщика
     /// </summary>
-    public class TelemetryWirelineRunOutDto
+    public class TelemetryWirelineRunOutBaseDto
     {
         /// <summary>
         /// отметка времени
@@ -32,6 +33,13 @@ namespace AsbCloudApp.Data.SAUB
         /// Наработка талевого каната до сигнализации о необходимости замены, т*км
         /// </summary>
         public float ReplaceWarnSp { get; set; }
+    }
+
+    /// <summary>
+    /// DTO телеметрии наработки талевого каната
+    /// </summary>
+    public class TelemetryWirelineRunOutDto : TelemetryWirelineRunOutBaseDto
+    {
 
         /// <summary>
         /// Информация по скважине

AsbCloudApp/Data/WellDto.cs

@@ -8,9 +8,6 @@ namespace AsbCloudApp.Data
     /// </summary>
     public class WellDto : WellInfoDto, IMapPoint, IId
     {
-        /// <inheritdoc/>
-        public int Id { get; set; }
-
         /// <inheritdoc/>
         public double? Latitude { get; set; }
 

AsbCloudApp/Data/WellInfoDto.cs

@@ -3,8 +3,11 @@
     /// <summary>
     /// базовая информация о скважине
     /// </summary>
-    public class WellInfoDto
+    public class WellInfoDto: IId
     {
+        /// <inheritdoc/>
+        public int Id { get; set; }
+
         /// <summary>
         /// Название
         /// </summary>

AsbCloudApp/Repositories/ITelemetryWirelineRunOutRepository.cs

@@ -19,7 +19,7 @@ namespace AsbCloudApp.Repositories
         /// <param name="dto"></param>
         /// <param name="token"></param>
         /// <returns></returns>
-        Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token);
+        Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token);
 
         /// <summary>
         /// Выдает данные по скважине

AsbCloudInfrastructure/Repository/TelemetryWirelineRunOutRepository.cs

@@ -29,20 +29,16 @@ namespace AsbCloudInfrastructure.Repository
         }
 
         /// <inheritdoc/>
-        public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutDto dto, CancellationToken token)
+        public async Task<int> AddOrUpdateAsync(string uid, TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
         {
             var idTelemetry = telemetryService.GetOrCreateTelemetryIdByUid(uid);
             var timezoneOffset = telemetryService.GetTimezone(idTelemetry).Hours;
             var entity = Convert(idTelemetry, dto, timezoneOffset);
             
-            var updatingItem = context.TelemetryWirelineRunOut
+            if (await context.TelemetryWirelineRunOut.AnyAsync(w => w.IdTelemetry == idTelemetry, token))
-                .Where(x => x.IdTelemetry == idTelemetry)
-                .FirstOrDefault();
-
-            if (updatingItem is null)
-                context.TelemetryWirelineRunOut.Add(entity);
-            else
                 context.TelemetryWirelineRunOut.Update(entity);
+            else
+                context.TelemetryWirelineRunOut.Add(entity);
 
             return await context.SaveChangesAsync(token);
         }
@@ -93,7 +89,7 @@ namespace AsbCloudInfrastructure.Repository
             return result;
         }
 
-        private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutDto dto, double timezoneOffset)
+        private static TelemetryWirelineRunOut Convert(int idTelemetry, TelemetryWirelineRunOutBaseDto dto, double timezoneOffset)
         {
             var entity = dto.Adapt<TelemetryWirelineRunOut>();
             entity.IdTelemetry = idTelemetry;

AsbCloudWebApi/Controllers/SAUB/TelemetryWirelineRunOutController.cs

@@ -48,12 +48,12 @@ namespace AsbCloudWebApi.Controllers.SAUB
         [HttpPost]
         [Route("{uid}")]
         [AllowAnonymous]
-        public IActionResult PostData(string uid, [FromBody] TelemetryWirelineRunOutDto dto, CancellationToken token)
+        public async Task<IActionResult> PostDataAsync(string uid, [FromBody] TelemetryWirelineRunOutBaseDto dto, CancellationToken token)
         {
             if (dto is null)
                 return BadRequest("Dto shouldn't be null");
 
-            var data = repository.AddOrUpdateAsync(uid, dto, token);
+            var data = await repository.AddOrUpdateAsync(uid, dto, token);
 
             var idWell = telemetryService.GetIdWellByTelemetryUid(uid);
             if (idWell is not null)

AsbCloudWebApi/ProtobufModel.cs

@@ -15,15 +15,15 @@ namespace AsbCloudWebApi
 
         private static void EnshureRegisteredWirelineRunOutDto()
         {
-            var type = typeof(TelemetryWirelineRunOutDto);
+            var type = typeof(TelemetryWirelineRunOutBaseDto);
             if (RuntimeTypeModel.Default.IsDefined(type))
                 return;
             RuntimeTypeModel.Default.Add(type, false)
-                .Add(1, nameof(TelemetryWirelineRunOutDto.DateTime))
+                .Add(1, nameof(TelemetryWirelineRunOutBaseDto.DateTime))
-                .Add(2, nameof(TelemetryWirelineRunOutDto.Hauling))
+                .Add(2, nameof(TelemetryWirelineRunOutBaseDto.Hauling))
-                .Add(3, nameof(TelemetryWirelineRunOutDto.HaulingWarnSp))
+                .Add(3, nameof(TelemetryWirelineRunOutBaseDto.HaulingWarnSp))
-                .Add(4, nameof(TelemetryWirelineRunOutDto.Replace))
+                .Add(4, nameof(TelemetryWirelineRunOutBaseDto.Replace))
-                .Add(5, nameof(TelemetryWirelineRunOutDto.ReplaceWarnSp));
+                .Add(5, nameof(TelemetryWirelineRunOutBaseDto.ReplaceWarnSp));
         }
 
         private static void EnshureRegisteredWITS()