diff --git a/BinaryDad.AacpsBusAlert.Worker/BinaryDad.AacpsBusAlert.Worker.csproj b/BinaryDad.AacpsBusAlert.Worker/BinaryDad.AacpsBusAlert.Worker.csproj index 8b580ae..a357711 100644 --- a/BinaryDad.AacpsBusAlert.Worker/BinaryDad.AacpsBusAlert.Worker.csproj +++ b/BinaryDad.AacpsBusAlert.Worker/BinaryDad.AacpsBusAlert.Worker.csproj @@ -1,19 +1,41 @@ - + - - Exe - net6.0 - enable - enable - + + Exe + net6.0 + enable + enable + - - - + + + + + - - - - + + + PreserveNewest + appsettings.json + + + appsettings.json + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + diff --git a/BinaryDad.AacpsBusAlert.Worker/Program.cs b/BinaryDad.AacpsBusAlert.Worker/Program.cs index f447c97..b2f4092 100644 --- a/BinaryDad.AacpsBusAlert.Worker/Program.cs +++ b/BinaryDad.AacpsBusAlert.Worker/Program.cs @@ -1,8 +1,21 @@ -using BinaryDad.AacpsBusAlert.Services; +using BinaryDad.AacpsBusAlert; +using BinaryDad.AacpsBusAlert.Services; +using BinaryDad.Extensions; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Newtonsoft.Json; var host = Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration((context, builder) => + { + builder.AddEnvironmentVariables(); + + var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");// context.HostingEnvironment.EnvironmentName; + + builder.AddJsonFile("appsettings.json"); + builder.AddJsonFile($"appsettings.{env}.json", true); + }) .ConfigureServices(services => { services.AddTransient(); @@ -10,6 +23,18 @@ var host = Host.CreateDefaultBuilder(args) }) .Build(); +var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT"); + +var configuration = host.Services.GetService(); +var httpClientFactory = host.Services.GetService(); +var httpClient = httpClientFactory.CreateClient(); + +var apiBaseUrl = configuration["Urls:Api"]; +var apiBusRouteUrl = UrlUtility.Combine(apiBaseUrl, "api/routes"); +var busRoutesRaw = await httpClient.GetStringAsync(apiBusRouteUrl); + +var busRoutes = JsonConvert.DeserializeObject>(busRoutesRaw); + var busRouteService = host.Services.GetService(); var routes = await busRouteService.GetBusRoutesAsync(); diff --git a/BinaryDad.AacpsBusAlert.Worker/Properties/launchSettings.json b/BinaryDad.AacpsBusAlert.Worker/Properties/launchSettings.json new file mode 100644 index 0000000..87de2e6 --- /dev/null +++ b/BinaryDad.AacpsBusAlert.Worker/Properties/launchSettings.json @@ -0,0 +1,10 @@ +{ + "profiles": { + "BinaryDad.AacpsBusAlert.Worker": { + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} \ No newline at end of file diff --git a/BinaryDad.AacpsBusAlert.Worker/appsettings.Development.json b/BinaryDad.AacpsBusAlert.Worker/appsettings.Development.json new file mode 100644 index 0000000..c8bc59e --- /dev/null +++ b/BinaryDad.AacpsBusAlert.Worker/appsettings.Development.json @@ -0,0 +1,5 @@ +{ + "Urls": { + "Api": "http://localhost:5299/" + } +} \ No newline at end of file diff --git a/BinaryDad.AacpsBusAlert.Worker/appsettings.Production.json b/BinaryDad.AacpsBusAlert.Worker/appsettings.Production.json new file mode 100644 index 0000000..1bf5d58 --- /dev/null +++ b/BinaryDad.AacpsBusAlert.Worker/appsettings.Production.json @@ -0,0 +1,5 @@ +{ + "Urls": { + "Api": "https://buses.binarydad.com/" + } +} \ No newline at end of file diff --git a/BinaryDad.AacpsBusAlert.Worker/appsettings.json b/BinaryDad.AacpsBusAlert.Worker/appsettings.json new file mode 100644 index 0000000..0e0dcd2 --- /dev/null +++ b/BinaryDad.AacpsBusAlert.Worker/appsettings.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file