From d5dceccaa2f3608b212574200b8cb73415e3ba67 Mon Sep 17 00:00:00 2001
From: aestene <arnts@equinor.com>
Date: Thu, 26 Oct 2023 15:54:34 +0200
Subject: [PATCH] Refactor add timer functionality

---
 .../IsarConnectionEventHandler.cs             | 53 +++++++++----------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/backend/api/EventHandlers/IsarConnectionEventHandler.cs b/backend/api/EventHandlers/IsarConnectionEventHandler.cs
index 79c7a117..1b36c955 100644
--- a/backend/api/EventHandlers/IsarConnectionEventHandler.cs
+++ b/backend/api/EventHandlers/IsarConnectionEventHandler.cs
@@ -65,38 +65,36 @@ private async void OnIsarRobotHeartbeat(object? sender, MqttReceivedArgs mqttArg
             if (robot == null)
             {
                 _logger.LogInformation(
-                    "Received message from unknown ISAR '{isarId}' ('{robotName}')",
+                    "Received message from unknown ISAR '{IsarId}' ('{RobotName}')",
                     isarRobotHeartbeat.IsarId,
                     isarRobotHeartbeat.RobotName
                 );
                 return;
             }
 
-            if (!_isarConnectionTimers.ContainsKey(robot.IsarId))
-            {
-                var timer = new Timer(_isarConnectionTimeout * 1000);
-                timer.Elapsed += (_, _) => OnTimeoutEvent(isarRobotHeartbeat);
-                timer.Start();
-                if (_isarConnectionTimers.TryAdd(robot.IsarId, timer))
-                    _logger.LogInformation(
-                        "Added new timer for ISAR '{isarId}' ('{robotName}')",
-                        robot.IsarId,
-                        robot.Name
-                    );
-            }
+            if (!_isarConnectionTimers.ContainsKey(robot.IsarId)) { AddTimerForRobot(isarRobotHeartbeat, robot); }
 
-            _logger.LogDebug(
-                "Reset connection timer for ISAR '{isarId}' ('{robotName}')",
+            _logger.LogInformation(
+                "Reset connection timer for ISAR '{IsarId}' ('{RobotName}')",
                 robot.IsarId,
                 robot.Name
             );
+
             _isarConnectionTimers[robot.IsarId].Reset();
 
-            if (!robot.Enabled)
-            {
-                robot.Enabled = true;
-                await RobotService.Update(robot);
-            }
+            if (robot.Enabled) { return; }
+            robot.Enabled = true;
+            await RobotService.Update(robot);
+        }
+
+        private void AddTimerForRobot(IsarRobotHeartbeatMessage isarRobotHeartbeat, Robot robot)
+        {
+            var timer = new Timer(_isarConnectionTimeout * 1000);
+            timer.Elapsed += (_, _) => OnTimeoutEvent(isarRobotHeartbeat);
+            timer.Start();
+
+            if (_isarConnectionTimers.TryAdd(robot.IsarId, timer)) { _logger.LogInformation("Added new timer for ISAR '{IsarId}' ('{RobotName}')", robot.IsarId, robot.Name); }
+            else { _logger.LogWarning("Failed to add new timer for ISAR '{IsarId}' ('{RobotName})'", robot.IsarId, robot.Name); }
         }
 
         private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessage)
@@ -105,7 +103,7 @@ private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessag
             if (robot is null)
             {
                 _logger.LogError(
-                    "Connection to ISAR instance '{id}' ('{robotName}') timed out but the corresponding robot could not be found in the database.",
+                    "Connection to ISAR instance '{Id}' ('{RobotName}') timed out but the corresponding robot could not be found in the database",
                     robotHeartbeatMessage.IsarId,
                     robotHeartbeatMessage.IsarId
                 );
@@ -113,7 +111,7 @@ private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessag
             else
             {
                 _logger.LogWarning(
-                    "Connection to ISAR instance '{id}' timed out - It will be disabled and active missions aborted",
+                    "Connection to ISAR instance '{Id}' timed out - It will be disabled and active missions aborted",
                     robotHeartbeatMessage.IsarId
                 );
                 robot.Enabled = false;
@@ -124,7 +122,7 @@ private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessag
                     if (missionRun != null)
                     {
                         _logger.LogError(
-                            "Mission '{missionId}' ('{missionName}') failed due to ISAR timeout",
+                            "Mission '{MissionId}' ('{MissionName}') failed due to ISAR timeout",
                             missionRun.Id,
                             missionRun.Name
                         );
@@ -136,11 +134,10 @@ private async void OnTimeoutEvent(IsarRobotHeartbeatMessage robotHeartbeatMessag
                 await RobotService.Update(robot);
             }
 
-            if (_isarConnectionTimers.TryGetValue(robotHeartbeatMessage.IsarId, out var timer))
-            {
-                timer.Close();
-                _isarConnectionTimers.Remove(robotHeartbeatMessage.IsarId, out _);
-            }
+            if (!_isarConnectionTimers.TryGetValue(robotHeartbeatMessage.IsarId, out var timer)) { return; }
+            timer.Close();
+            _isarConnectionTimers.Remove(robotHeartbeatMessage.IsarId, out _);
+            _logger.LogError("Removed timer for ISAR instance {RobotName} with ID '{Id}'", robotHeartbeatMessage.RobotName, robotHeartbeatMessage.IsarId);
         }
     }
 }