apphost and urls

Author: aligneddev

src/BikeTracking.Api.Tests/Application/Rides/WeatherLookupServiceTests.cs

@@ -65,7 +65,9 @@ public async Task GetOrFetchAsync_CacheHit_DoesNotCallHttp()
         {
             Content = new StringContent("{}", Encoding.UTF8, "application/json"),
         });
-        var factory = new StubHttpClientFactory(new HttpClient(handler));
+        var factory = new StubHttpClientFactory(
+            new HttpClient(handler) { BaseAddress = new Uri("https://api.open-meteo.com") }
+        );
         var config = new ConfigurationBuilder().AddInMemoryCollection().Build();
 
         var service = new OpenMeteoWeatherLookupService(
@@ -101,7 +103,9 @@ public async Task GetOrFetchAsync_SecondCall_UsesCacheAndCallsHttpOnce()
             ),
         });
 
-        var factory = new StubHttpClientFactory(new HttpClient(handler));
+        var factory = new StubHttpClientFactory(
+            new HttpClient(handler) { BaseAddress = new Uri("https://api.open-meteo.com") }
+        );
         var config = new ConfigurationBuilder().AddInMemoryCollection().Build();
 
         var service = new OpenMeteoWeatherLookupService(
@@ -164,7 +168,9 @@ public async Task GetOrFetchAsync_AfterServiceRestart_UsesPersistedCacheWithoutH
                 "application/json"
             ),
         });
-        var factory = new StubHttpClientFactory(new HttpClient(handler));
+        var factory = new StubHttpClientFactory(
+            new HttpClient(handler) { BaseAddress = new Uri("https://api.open-meteo.com") }
+        );
         var config = new ConfigurationBuilder().AddInMemoryCollection().Build();
 
         await using var restartedContext = CreateSqliteContext(connection);

src/BikeTracking.Api/Application/Rides/WeatherLookupService.cs

@@ -101,17 +101,17 @@ ILogger<OpenMeteoWeatherLookupService> logger
         // Determine which API to call (forecast vs. archive)
         var daysDiff = (int)(DateTime.UtcNow.Date - dateTimeUtc.Date).TotalDays;
         var isHistorical = daysDiff > 92;
-        var endpoint = isHistorical
-            ? "https://archive-api.open-meteo.com/v1/archive"
-            : "https://api.open-meteo.com/v1/forecast";
+        var clientName = isHistorical ? "OpenMeteoArchive" : "OpenMeteoForecast";
+        var requestPath = isHistorical ? "/v1/archive" : "/v1/forecast";
 
         var apiKey = configuration["WeatherLookup:ApiKey"];
         var apiKeyParam = string.IsNullOrWhiteSpace(apiKey)
             ? string.Empty
             : $"&apikey={Uri.EscapeDataString(apiKey)}";
 
         // Build query parameters
-        var pastDaysParam = isHistorical ? "" : $"&past_days={Math.Min(daysDiff + 1, 92)}";
+        var pastDaysParam =
+            isHistorical || daysDiff < 0 ? "" : $"&past_days={Math.Min(daysDiff + 1, 92)}";
         var queryParams =
             $"?latitude={Uri.EscapeDataString(latitude.ToString(CultureInfo.InvariantCulture))}"
             + $"&longitude={Uri.EscapeDataString(longitude.ToString(CultureInfo.InvariantCulture))}"
@@ -126,9 +126,9 @@ ILogger<OpenMeteoWeatherLookupService> logger
 
         try
         {
-            var client = httpClientFactory.CreateClient("OpenMeteo");
+            var client = httpClientFactory.CreateClient(clientName);
             using var response = await client.GetAsync(
-                $"{endpoint}{queryParams}",
+                $"{requestPath}{queryParams}",
                 cancellationToken
             );
 

src/BikeTracking.Api/Program.cs

@@ -15,6 +15,14 @@
 var connectionString =
     builder.Configuration.GetConnectionString("BikeTracking")
     ?? "Data Source=biketracking.local.db";
+var eiaGasPriceBaseUrl =
+    builder.Configuration["ExternalApis:EiaGasPriceBaseUrl"] ?? "https+http://eia-gas-price";
+var openMeteoForecastBaseUrl =
+    builder.Configuration["ExternalApis:OpenMeteoForecastBaseUrl"]
+    ?? "https+http://open-meteo-forecast";
+var openMeteoArchiveBaseUrl =
+    builder.Configuration["ExternalApis:OpenMeteoArchiveBaseUrl"]
+    ?? "https+http://open-meteo-archive";
 
 builder.Services.Configure<IdentityOptions>(builder.Configuration.GetSection("Identity"));
 builder.Services.AddDbContext<BikeTrackingDbContext>(options =>
@@ -48,14 +56,23 @@
     "EiaGasPrice",
     client =>
     {
-        client.BaseAddress = new Uri("https://api.eia.gov");
+        client.BaseAddress = new Uri(eiaGasPriceBaseUrl);
         client.Timeout = TimeSpan.FromSeconds(10);
     }
 );
 builder.Services.AddHttpClient(
-    "OpenMeteo",
+    "OpenMeteoForecast",
     client =>
     {
+        client.BaseAddress = new Uri(openMeteoForecastBaseUrl);
+        client.Timeout = TimeSpan.FromSeconds(5);
+    }
+);
+builder.Services.AddHttpClient(
+    "OpenMeteoArchive",
+    client =>
+    {
+        client.BaseAddress = new Uri(openMeteoArchiveBaseUrl);
         client.Timeout = TimeSpan.FromSeconds(5);
     }
 );

src/BikeTracking.AppHost/AppHost.cs

@@ -1,5 +1,19 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
+var openMeteoForecast = builder.AddExternalService(
+    "open-meteo-forecast",
+    "https://api.open-meteo.com/"
+);
+var openMeteoArchive = builder.AddExternalService(
+    "open-meteo-archive",
+    "https://archive-api.open-meteo.com/"
+);
+var eiaGasPrice = builder.AddExternalService("eia-gas-price", "https://api.eia.gov/");
+
+const string eiaGasPriceBaseUrl = "https+http://eia-gas-price";
+const string openMeteoForecastBaseUrl = "https+http://open-meteo-forecast";
+const string openMeteoArchiveBaseUrl = "https+http://open-meteo-archive";
+
 // Local SQL Server database for development
 // var database = builder.AddSqlServer("sql").AddDatabase("biketracking");
 // TODO https://aspire.dev/integrations/databases/sqlite/sqlite-get-started/?lang=csharp
@@ -10,6 +24,12 @@
 var apiService = builder
     .AddProject<Projects.BikeTracking_Api>("api")
     //.WithReference(database)
+    .WithReference(openMeteoForecast)
+    .WithReference(openMeteoArchive)
+    .WithReference(eiaGasPrice)
+    .WithEnvironment("ExternalApis__EiaGasPriceBaseUrl", eiaGasPriceBaseUrl)
+    .WithEnvironment("ExternalApis__OpenMeteoForecastBaseUrl", openMeteoForecastBaseUrl)
+    .WithEnvironment("ExternalApis__OpenMeteoArchiveBaseUrl", openMeteoArchiveBaseUrl)
     .WithHttpHealthCheck("/health")
     .WithExternalHttpEndpoints();
 

src/BikeTracking.Frontend/playwright.config.ts

@@ -45,6 +45,10 @@ export default defineConfig({
       env: {
         ASPNETCORE_URLS: e2eApiUrl,
         PLAYWRIGHT_E2E: "1",
+        ExternalApis__EiaGasPriceBaseUrl: "https://api.eia.gov",
+        ExternalApis__OpenMeteoForecastBaseUrl: "https://api.open-meteo.com",
+        ExternalApis__OpenMeteoArchiveBaseUrl:
+          "https://archive-api.open-meteo.com",
         // Use a dedicated E2E database so test runs never touch the local dev DB.
         // ASP.NET Core maps ConnectionStrings__<name> to ConnectionStrings[name].
         ConnectionStrings__BikeTracking: `Data Source=${e2eDbPath}`,