Address more coderabbit feedback

Signed-off-by: Dave Thaler <[email protected]>
orcasound · Oct 25, 2024 · a06d79f · a06d79f
1 parent 467e3ce
commit a06d79f
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/OrcanodeMonitor/Models/Orcanode.cs b/OrcanodeMonitor/Models/Orcanode.cs
@@ -392,8 +392,24 @@ public string OrcasoundOnlineStatusString {
 
         public OrcanodeIftttDTO ToIftttDTO() => new OrcanodeIftttDTO(ID, DisplayName);
 
+        /// <summary>
+        /// Calculates the uptime percentage for a node based on its events since a specified date.
+        /// </summary>
+        /// <param name="orcanodeId">The ID of the node to calculate uptime for</param>
+        /// <param name="events">List of node events</param>
+        /// <param name="since">The start date for uptime calculation</param>
+        /// <returns>Uptime percentage as an integer between 0 and 100</returns>
+        /// <exception cref="ArgumentException">Thrown when orcanodeId is null or empty</exception>         
         public static int GetUptimePercentage(string orcanodeId, List<OrcanodeEvent> events, DateTime since)
         {
+            if (string.IsNullOrEmpty(orcanodeId))
+            {
+                throw new ArgumentException("Node ID cannot be null or empty", nameof(orcanodeId));
+            }
+            if (since > DateTime.UtcNow)
+            {
+                throw new ArgumentException("Start date cannot be in the future", nameof(since));
+            }
             if (events == null)
             {
                 return 0;
@@ -404,7 +420,7 @@ public static int GetUptimePercentage(string orcanodeId, List<OrcanodeEvent> eve
             DateTime start = since;
             string lastValue = string.Empty;
 
-            // Get events sorted by date to ensure correct chronological processing
+            // Get events sorted by date to ensure correct chronological processing.
             var nodeEvents = events
                    .Where(e => e.OrcanodeId == orcanodeId)
                    .OrderBy(e => e.DateTimeUtc)
@@ -420,7 +436,7 @@ public static int GetUptimePercentage(string orcanodeId, List<OrcanodeEvent> eve
                     continue;
                 }
                 DateTime current = e.DateTimeUtc;
-                if (lastValue == Orcanode.OnlineString)
+                if (lastValue == OnlineString)
                 {
                     up += (current - start);
                 }
@@ -431,13 +447,16 @@ public static int GetUptimePercentage(string orcanodeId, List<OrcanodeEvent> eve
                 start = current;
                 lastValue = e.Value;
             }
-            if (lastValue == Orcanode.OnlineString)
+
+            // Account for the reminder of the time until now.
+            DateTime now = DateTime.UtcNow;
+            if (lastValue == OnlineString)
             {
-                up += DateTime.UtcNow - start;
+                up += now - start;
             }
             else
             {
-                down += DateTime.UtcNow - start;
+                down += now - start;
             }
 
             TimeSpan totalTime = up + down;

diff --git a/OrcanodeMonitor/Pages/Index.cshtml b/OrcanodeMonitor/Pages/Index.cshtml
@@ -72,7 +72,8 @@
                 </td>
             }
             <td style="background-color: @Model.NodeUptimePercentageBackgroundColor(item)">
-                    <a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)" target="_blank">
+                    <a asp-page="/NodeEvents" asp-route-id="@item.ID" style="color: @Model.NodeUptimePercentageTextColor(item)" target="_blank"
+                       aria-label="View events for @item.DisplayName (opens in new tab)">
                     @Model.GetUptimePercentage(item)%
                 </a>
             </td>

diff --git a/OrcanodeMonitor/Pages/Index.cshtml.cs b/OrcanodeMonitor/Pages/Index.cshtml.cs
@@ -101,7 +101,7 @@ private string GetTextColor(OrcanodeOnlineStatus status)
 
         public string NodeUptimePercentageBackgroundColor(Orcanode node)
         {
-            int value = Orcanode.GetUptimePercentage(node.ID, _events, SinceTime);
+            int value = GetUptimePercentage(node);
             if (value < 1)
             {
                 return ColorTranslator.ToHtml(Color.Red);

diff --git a/OrcanodeMonitor/Pages/NodeEvents.cshtml.cs b/OrcanodeMonitor/Pages/NodeEvents.cshtml.cs
@@ -5,7 +5,6 @@
 using OrcanodeMonitor.Core;
 using OrcanodeMonitor.Data;
 using OrcanodeMonitor.Models;
-using System.Xml.Linq;
 
 namespace OrcanodeMonitor.Pages
 {