Extracted Router from Sender

FitConnect/IRouter.cs

-namespace FitConnect;
+using FitConnect.Models;
+
+namespace FitConnect;
 
 public interface IRouter {
+    
+    /// <summary>
+    /// Finding areas for the filter with paging
+    /// </summary>
+    /// <param name="filter">Search string for the area, use * as wildcard</param>
+    /// <param name="totalCount">out var for the total count</param>
+    /// <param name="offset"></param>
+    /// <param name="limit"></param>
+    /// <example>
+    /// var areas = GetAreas("Erlang*", out var _, 0, 10)
+    /// </example>
+    /// <returns></returns>
+    public IEnumerable<Area> GetAreas(string filter, out int totalCount, int offset = 0,
+        int limit = 100);
+
+    
     public Task<List<FitConnect.Services.Models.v1.Routes.Route>> FindDestinationsAsync(
         string leiaKey, string? ags = null,
         string? ars = null,

FitConnect/Interfaces/Sender/ISender.cs

@@ -30,17 +30,4 @@ public interface ISender : IFitConnectClient {
     public ISenderWithDestination WithDestination(string destinationId);
 
 
-    /// <summary>
-    /// Finding areas for the filter with paging
-    /// </summary>
-    /// <param name="filter">Search string for the area, use * as wildcard</param>
-    /// <param name="totalCount">out var for the total count</param>
-    /// <param name="offset"></param>
-    /// <param name="limit"></param>
-    /// <example>
-    /// var areas = GetAreas("Erlang*", out var _, 0, 10)
-    /// </example>
-    /// <returns></returns>
-    public IEnumerable<Area> GetAreas(string filter, out int totalCount, int offset = 0,
-        int limit = 100);
 }

FitConnect/Router.cs

@@ -17,4 +17,19 @@ public class Router : IRouter {
         string? areaId = null) => await RouteService.GetDestinationIdAsync(leiaKey, ags, ars, areaId);
 
 
+    /// <summary>
+    /// Finding Areas
+    /// </summary>
+    /// <param name="filter"></param>
+    /// <param name="totalCount"></param>
+    /// <param name="offset"></param>
+    /// <param name="limit"></param>
+    /// <returns></returns>
+    public IEnumerable<Area> GetAreas(string filter, out int totalCount, int offset = 0,
+        int limit = 100) {
+        var dto = RouteService.GetAreas(filter, offset, limit).Result;
+        totalCount = dto?.TotalCount ?? 0;
+        return dto?.Areas ?? new List<Area>();
+    }
+
 }

FitConnect/Sender.cs

@@ -225,20 +225,6 @@ public class Sender : FitConnectClient, ISender, ISenderWithDestination,
         return JsonConvert.SerializeObject(metaData);
     }
 
-    /// <summary>
-    /// Finding Areas
-    /// </summary>
-    /// <param name="filter"></param>
-    /// <param name="totalCount"></param>
-    /// <param name="offset"></param>
-    /// <param name="limit"></param>
-    /// <returns></returns>
-    public IEnumerable<Area> GetAreas(string filter, out int totalCount, int offset = 0,
-        int limit = 100) {
-        var dto = RouteService.GetAreas(filter, offset, limit).Result;
-        totalCount = dto?.TotalCount ?? 0;
-        return dto?.Areas ?? new List<Area>();
-    }
 
     /// <summary>
     ///     Uploading the encrypted data to the server

IntegrationTests/Routing/RoutingTests.cs

@@ -68,4 +68,11 @@ public class RoutingTests {
         route.DestinationId.Should().NotBeNull();
         route.DestinationSignature.Should().NotBeNull();
     }
+
+    [Test]
+    public void GetAreas_ShouldGetAreasFromServer() {
+        // Arrange
+        var areas = _router.GetAreas("Furth*", out var _);
+        areas.Should().HaveCountGreaterThan(0);
+    }
 }

IntegrationTests/Sender/SenderTestHappyPath.cs

@@ -169,12 +169,6 @@ public class SenderTestHappyPath : SenderTestBase {
         submission.Should().NotBeNull();
     }
 
-    [Test]
-    public void GetAreas_ShouldGetAreasFromServer() {
-        // Arrange
-        var areas = Sender.GetAreas("Furth*", out var _);
-        areas.Should().HaveCountGreaterThan(0);
-    }
 
     [Test]
     public void GetDestinations_ShouldGetDestinationsFromServer() {