From f21c75d4501c2e173baec1af5da831e13be3747e Mon Sep 17 00:00:00 2001
From: KharchenkoVV <vv.harchenko@autodrilling.ru>
Date: Thu, 13 May 2021 15:00:57 +0500
Subject: [PATCH] =?UTF-8?q?CS2-6:=20=D0=9B=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B8=20?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=D1=8B=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=B7=20=D0=BA=D0=BE=D0=BD?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=B0=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5=D1=80=D0=B0=20?=
 =?UTF-8?q?=D0=B2=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/TelemetryController.cs        | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/AsbCloudWebApi/Controllers/TelemetryController.cs b/AsbCloudWebApi/Controllers/TelemetryController.cs
index 7c8427e5..b4e26367 100644
--- a/AsbCloudWebApi/Controllers/TelemetryController.cs
+++ b/AsbCloudWebApi/Controllers/TelemetryController.cs
@@ -3,7 +3,6 @@ using AsbCloudApp.Services;
 using AsbCloudWebApi.SignalR;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -41,19 +40,8 @@ namespace AsbCloudWebApi.Controllers
             this.telemetryUserService = telemetryUserService;
             this.telemetryHubContext = telemetryHubContext;
             this.telemetryTracker = telemetryTracker;
-
-            RegisterRequest();
         }
-
-        private void RegisterRequest()
-        {
-            if (Request.Query.TryGetValue("uid", out Microsoft.Extensions.Primitives.StringValues pId) && pId.Count > 0)
-            {
-                string panelId = pId.First();
-                telemetryTracker.SaveRequest(panelId);
-            }
-        }
-
+        
         /// <summary>
         /// Принимает общую информацию по скважине
         /// </summary>
@@ -65,6 +53,7 @@ namespace AsbCloudWebApi.Controllers
         public IActionResult PostInfo(string uid, [FromBody] TelemetryInfoDto info)
         {
             telemetryService.UpdateInfo(uid, info);
+            telemetryTracker.SaveRequest(uid);
             return Ok();
         }
 
@@ -84,6 +73,7 @@ namespace AsbCloudWebApi.Controllers
             if (wellId != null && dtos.Any())
                 Task.Run(() => telemetryHubContext.Clients.Group($"well_{wellId}").SendAsync(nameof(ITelemetryHubClient.ReceiveDataSaub), dtos));
 
+            telemetryTracker.SaveRequest(uid);
             return Ok();
         }
 
@@ -103,6 +93,7 @@ namespace AsbCloudWebApi.Controllers
             if (dtos.Any())
                 Task.Run(() => telemetryHubContext.Clients.Group($"well_{wellId}").SendAsync(nameof(ITelemetryHubClient.ReceiveMessages), dtos));
 
+            telemetryTracker.SaveRequest(uid);
             return Ok();
         }
 
@@ -117,6 +108,7 @@ namespace AsbCloudWebApi.Controllers
         public IActionResult PostEvents(string uid, [FromBody] List<EventDto> events)
         {
             eventService.Upsert(uid, events);
+            telemetryTracker.SaveRequest(uid);
             return Ok();
         }
 
@@ -131,6 +123,7 @@ namespace AsbCloudWebApi.Controllers
         public IActionResult PostUsers(string uid, [FromBody] List<TelemetryUserDto> users)
         {
             telemetryUserService.Upsert(uid, users);
+            telemetryTracker.SaveRequest(uid);
             return Ok();
         }