From f10201d3ef9c18b0e22d10ac01f9c4f6bef306ce Mon Sep 17 00:00:00 2001
From: eugeniy_ivanov <ea.ivanov@digitaldrilling.ru>
Date: Thu, 3 Nov 2022 14:02:56 +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=B8=D0=B5=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D1=85?=
 =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubsystemOperationTimeService.cs          | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
index e462e7fa..4601ddcf 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemOperationTimeService.cs
@@ -170,17 +170,17 @@ namespace AsbCloudInfrastructure.Services.Subsystems
         {
             var depthIntervalSubsystem = 0d;
             //AKB - MSE
-            if (idSubsystem == 1 | idSubsystem == 2)
+            if (idSubsystem == IdSubsystemAKB | idSubsystem == IdSubsystemMSE)
             {
                 depthIntervalSubsystem = depthInterval.depthIntervalRotor + depthInterval.depthIntervalSlide;
             }
             //Spin
-            if (idSubsystem == 65536)
+            if (idSubsystem == IdSubsystemSpin)
             {
                 depthIntervalSubsystem = depthInterval.depthIntervalSlide;
             }
             //Torque
-            if (idSubsystem == 65537)
+            if (idSubsystem == IdSubsystemTorque)
             {
                 depthIntervalSubsystem = depthInterval.depthIntervalRotor;
             }
@@ -215,15 +215,12 @@ namespace AsbCloudInfrastructure.Services.Subsystems
                 beginUTC = gtDate.Value.ToUtcDateTimeOffset(firstWell.Timezone.Hours);                
             }
             query = query.Where(d => d.DateStart >= beginUTC);           
-            query = query.Where(o => o.DateEnd <= endUTC);
-            
+            query = query.Where(o => o.DateEnd <= endUTC);            
 
             var depthIntervals = await detectedOperationService.GetDepthIntervalAllOperationsAsync(beginUTC, endUTC, token);            
-            var result = new List<SubsystemActiveWellStatDto>();
-            
+            var result = new List<SubsystemActiveWellStatDto>();            
             var subsystemsOperationTime = await query.ToListAsync(token);
-            var groupingSubsystemsOperationTime = subsystemsOperationTime.GroupBy(g => g.IdTelemetry);            
-
+            var groupingSubsystemsOperationTime = subsystemsOperationTime.GroupBy(g => g.IdTelemetry);
             foreach (var group in groupingSubsystemsOperationTime)
             {
                 var well = activeWell.Where(w => w.IdTelemetry == group.Key).FirstOrDefault();
@@ -235,8 +232,7 @@ namespace AsbCloudInfrastructure.Services.Subsystems
                     };
                     if (depthIntervals is not null)
                     {
-                        var depthInterval = depthIntervals.Where(o => o.Item1 == well.IdTelemetry).Select(o => (o.Item2, o.Item3)).FirstOrDefault();
-                        //var groupSubsystem = group.GroupBy(g => g.IdSubsystem);
+                        var depthInterval = depthIntervals.Where(o => o.Item1 == well.IdTelemetry).Select(o => (o.Item2, o.Item3)).FirstOrDefault();                        
                         var dto = group.Select(s => s.Adapt<SubsystemOperationTimeDto>());
                         var subsystemStat = CalcStat(dto, depthInterval);
                         wellStat.SubsystemAKB = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemAKB);
@@ -245,14 +241,11 @@ namespace AsbCloudInfrastructure.Services.Subsystems
                         wellStat.SubsystemTorqueMaster = subsystemStat.FirstOrDefault(s => s.IdSubsystem == IdSubsystemTorque);
                         result.Add(wellStat);
                     }
-
                 }
             }
             return result;
         }
 
-
-
         /// <inheritdoc/>
         public async Task<DatesRangeDto?> GetDateRangeOperationTimeAsync(SubsystemOperationTimeRequest request, CancellationToken token)
         {