From 803c390c8118c470154cb87b354c367ca4c7d180 Mon Sep 17 00:00:00 2001
From: Claudio Schaad <c.schaad@pog.ch>
Date: Wed, 3 Sep 2025 21:30:30 +0200
Subject: [PATCH] Cleanup

---
 Services/TransportConnectionCalculator.cs | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/Services/TransportConnectionCalculator.cs b/Services/TransportConnectionCalculator.cs
index 98d3f16..500b875 100644
--- a/Services/TransportConnectionCalculator.cs
+++ b/Services/TransportConnectionCalculator.cs
@@ -32,7 +32,7 @@ public static class TransportConnectionCalculator
         var validConnections = new List<TransportConnection>();
         var lateValidConnections = new List<TransportConnection>();
 
-        foreach (var connection in connections)
+        foreach (var connection in connections.OrderBy(c => c.ArrivalTime))
         {
             if (connection.ArrivalTime <= latestArrivalTime)
             {
@@ -47,10 +47,7 @@ public static class TransportConnectionCalculator
         // If we have valid connections (arriving before latest arrival time)
         if (validConnections.Count > 0)
         {
-            var bestValidConnection = validConnections
-                .OrderBy(c => c.ArrivalTime)
-                .Last();
-
+            var bestValidConnection = validConnections.Last();
             if (bestValidConnection.ArrivalTime > earliestAcceptableTime)
             {
                 return bestValidConnection;
@@ -60,11 +57,7 @@ public static class TransportConnectionCalculator
         // If no connections arrive before latest arrival time, check if any arrive within acceptable late range
         if (lateValidConnections.Count > 0)
         {
-            var bestLateConnection = lateValidConnections
-                .OrderBy(c => c.ArrivalTime)
-                .First();
-            
-            return bestLateConnection;
+            return lateValidConnections.First();
         }
 
         return validConnections.FirstOrDefault();