Add proximity filtering to satellite retrieval and enhance tests

Author: scott-the-programmer

Satellite.DataAccess.Test/N2YOSatelliteClientTests.cs

@@ -10,26 +10,24 @@ public class N2YOSatelliteClientTests
         public async Task GetSatellitesAsync_ReturnsSatelliteData()
         {
             // Arrange
-            var httpClientMock = new Mock<IHttpClient>();
-            var expectedData = GetSampleSatelliteDataJson();
+            var httpMock = new Mock<IHttpClient>();
             var response = new HttpResponseMessage(HttpStatusCode.OK)
             {
-                Content = new StringContent(expectedData),
+                Content = new StringContent(GetSampleSatelliteDataJson()),
             };
 
-            httpClientMock.Setup(x => x.GetAsync(It.IsAny<string>())).ReturnsAsync(response);
+            httpMock.Setup(x => x.GetAsync(It.IsAny<string>())).ReturnsAsync(response);
 
-            var nasaSatellite = new N2YOSatelliteClient(httpClientMock.Object, "1234");
+            var client = new N2YOSatelliteClient(httpMock.Object, "test-api-key");
 
             // Act
-            var satellites = await nasaSatellite.GetSatellitesAsync(0, 0, 90, 0);
+            var satellites = await client.GetSatellitesAsync(-35.0, 158.0);
 
             // Assert
-            Assert.Multiple(() =>
-            {
-                Assert.NotEmpty(satellites);
-                Assert.NotNull(satellites);
-            });
+            Assert.NotNull(satellites);
+            Assert.Equal(8, satellites.Above.Count());
+            Assert.Equal("Iridium", satellites.Info.Category);
+            Assert.Equal(8, satellites.Info.SatCount);
         }
 
         [Fact]
@@ -42,9 +40,9 @@ public async Task GetSatellitesAsync_HandlesEmptyResponse()
                 Content = null
             };
 
-#pragma warning disable CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
+#pragma warning disable CS8620
             _ = httpClientMock.Setup(x => x.GetAsync(It.IsAny<string>())).ReturnsAsync(response);
-#pragma warning restore CS8620 // Argument cannot be used for parameter due to differences in the nullability of reference types.
+#pragma warning restore CS8620
 
             var nasaSatellite = new N2YOSatelliteClient(httpClientMock.Object, "1234");
 
@@ -57,7 +55,6 @@ public async Task GetSatellitesAsync_HandlesEmptyResponse()
                 Assert.Empty(satellites);
                 Assert.NotNull(satellites);
             });
-
         }
 
         [Fact]

Satellite.DataAccess.Test/SatelliteServiceTests.cs

@@ -93,6 +93,49 @@ public async Task GetSatellitesAsync_FetchesDataFromClientIfNotCached()
                 memoryCacheMock.Verify(x => x.CreateEntry(It.IsAny<object>()), Times.Once());
             });
         }
+
+        [Fact]
+        public async Task GetIridiumsAsync_FiltersByProximity_ReturnsOnlyProximateSatellites()
+        {
+            // Arrange
+            var httpMock = new Mock<IHttpClient>();
+            var apiResponse = new HttpResponseMessage(HttpStatusCode.OK)
+            {
+                Content = new StringContent(GetSampleSatelliteDataJson()),
+            };
+
+            httpMock.Setup(x => x.GetAsync(It.IsAny<string>())).ReturnsAsync(apiResponse);
+
+            // Use N2YOSatelliteClient as the ISatelliteClient implementation
+            var nasaSatelliteClient = new N2YOSatelliteClient(httpMock.Object, "test-api-key");
+
+            var memoryCacheMock = new Mock<IMemoryCache>();
+            object cachedData;
+            memoryCacheMock.Setup(x => x.TryGetValue("iridium", out cachedData))
+                           .Returns(false);
+
+            var cacheEntryMock = new Mock<ICacheEntry>();
+            memoryCacheMock.Setup(x => x.CreateEntry(It.IsAny<object>())).Returns(cacheEntryMock.Object);
+
+            var userCoords = new CurrentCoords { Latitude = -35.0, Longitude = 158.0 };
+            var service = new SatelliteService(nasaSatelliteClient, memoryCacheMock.Object, userCoords);
+
+            // Act
+            var satellites = await service.GetIridiumsAsync();
+
+            // Assert
+            Assert.NotNull(satellites);
+            var proximateSatellite = Assert.Single(satellites);
+            Assert.Equal("IRIDIUM 36", proximateSatellite.Name);
+            Assert.Equal(-35.6729, proximateSatellite.Latitude);
+            Assert.Equal(158.2153, proximateSatellite.Longitude);
+
+            // Verify that the HTTP client was called (due to cache miss)
+            httpMock.Verify(x => x.GetAsync(It.IsAny<string>()), Times.Once);
+            // Verify that the cache was attempted to be updated with the key "iridium"
+            memoryCacheMock.Verify(x => x.CreateEntry("iridium"), Times.Once);
+        }
+
         private string GetSampleSatelliteDataJson()
         {
             var sampleData = """

Satellite.DataAccess/Services/NASASatelliteService.cs

@@ -189,6 +189,9 @@ public SatelliteService(ISatelliteClient nasaSatelliteClient, IMemoryCache cache
             }
 
             var response = await _nasaSatelliteClient.GetSatellitesAsync(_coords.Longitude, _coords.Latitude, 4, (int)type);
+
+            const double proximityThresholdDegrees = 1.0;
+
             var satellites = response.Select(i =>
             {
                 return new Models.Satellite
@@ -199,7 +202,9 @@ public SatelliteService(ISatelliteClient nasaSatelliteClient, IMemoryCache cache
                     Altitude = i.Satalt,
                     Age = i.LaunchDate
                 };
-            });
+            })
+            .Where(s => Math.Abs(s.Latitude - _coords.Latitude) < proximityThresholdDegrees &&
+                        Math.Abs(s.Longitude - _coords.Longitude) < proximityThresholdDegrees);
 
             CacheSatelliteData(cacheKey, satellites);