From f45fca9122cad8d09ed26689cc5ed2c3e5f473b3 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 19 Oct 2023 16:55:42 +1000 Subject: [PATCH] =?UTF-8?q?feat(esppApi):=20=D0=97=D0=B0=D0=B3=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=B4=D0=BB=D1=8F=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.EsppApi/EsppApiService.cs | 16 +++++++++-- PARR.EsppApi/PARR.EsppApi.csproj | 6 +---- PARR.EsppApi/ParrEsppApiInstaller.cs | 12 ++++++--- PARR.EsppApi/Services/Espp.cs | 27 +++++++++++++++++++ PARR.EsppApi/Settings/EsppOrderSettings.cs | 10 +++++++ PARR.EsppOrderLoader/Class1.cs | 7 ----- .../PARR.EsppOrderLoader.csproj | 6 +++++ .../ParrEsppOrderLoaderInstaller.cs | 22 +++++++++++++++ PARR.EsppOrderManager/Class1.cs | 7 ----- .../PARR.EsppOrderManager.csproj | 5 ++++ PARR.Master/Class1.cs | 7 ----- PARR.Master/PARR.Master.csproj | 5 ++++ PARR.Test/Worker.cs | 2 +- PARR.Test/appsettings.json | 3 +++ 14 files changed, 102 insertions(+), 33 deletions(-) create mode 100644 PARR.EsppApi/Services/Espp.cs create mode 100644 PARR.EsppApi/Settings/EsppOrderSettings.cs delete mode 100644 PARR.EsppOrderLoader/Class1.cs create mode 100644 PARR.EsppOrderLoader/ParrEsppOrderLoaderInstaller.cs delete mode 100644 PARR.EsppOrderManager/Class1.cs delete mode 100644 PARR.Master/Class1.cs diff --git a/PARR.EsppApi/EsppApiService.cs b/PARR.EsppApi/EsppApiService.cs index 823b6419..891d2f7b 100644 --- a/PARR.EsppApi/EsppApiService.cs +++ b/PARR.EsppApi/EsppApiService.cs @@ -1,21 +1,33 @@ using Microsoft.Extensions.Logging; using PARR.EsppApi.Models; +using PARR.EsppApi.Services; +using PARR.EsppApi.Settings; namespace PARR.EsppApi { internal class EsppApiService : IEsppApiService { private readonly ILogger logger; + private readonly EsppOrderSettings esppOrderSettings; + private readonly Espp espp; - public EsppApiService(ILogger logger) + public EsppApiService(ILogger logger, EsppOrderSettings esppOrderSettings, Espp espp) { this.logger = logger; + this.esppOrderSettings = esppOrderSettings; + this.espp = espp; } public async Task> FindOrdersByPrefixAsync(string prefix) { logger.LogInformation("Привет!"); - throw new NotImplementedException(); + + // var url = esppOrderSettings.Url; + var aaa = await espp.Get(); + logger.LogInformation($"asdasd: {aaa}"); + + return new List(); + } } } diff --git a/PARR.EsppApi/PARR.EsppApi.csproj b/PARR.EsppApi/PARR.EsppApi.csproj index de5d2b29..7c0a9f66 100644 --- a/PARR.EsppApi/PARR.EsppApi.csproj +++ b/PARR.EsppApi/PARR.EsppApi.csproj @@ -10,12 +10,8 @@ + - - - - - diff --git a/PARR.EsppApi/ParrEsppApiInstaller.cs b/PARR.EsppApi/ParrEsppApiInstaller.cs index 268659b2..cf7006a5 100644 --- a/PARR.EsppApi/ParrEsppApiInstaller.cs +++ b/PARR.EsppApi/ParrEsppApiInstaller.cs @@ -1,5 +1,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using PARR.EsppApi.Services; +using PARR.EsppApi.Settings; namespace PARR.EsppApi { @@ -8,12 +10,14 @@ namespace PARR.EsppApi public static void InstallEsppApiServices(this IServiceCollection services, IConfiguration configuration) { // settings - //SettingsFromDb configuration - //var settingsFromDb = new SettingsFromDb(); - //configuration.GetSection(nameof(SettingsFromDb)).Bind(settingsFromDb); - //services.AddSingleton(settingsFromDb); + var esppSettings = new EsppOrderSettings(); + configuration.GetSection(nameof(EsppOrderSettings)).Bind(esppSettings); + services.AddSingleton(esppSettings); + services.AddTransient(); + + services.AddHttpClient(); //add other services } diff --git a/PARR.EsppApi/Services/Espp.cs b/PARR.EsppApi/Services/Espp.cs new file mode 100644 index 00000000..ab30e83e --- /dev/null +++ b/PARR.EsppApi/Services/Espp.cs @@ -0,0 +1,27 @@ +namespace PARR.EsppApi.Services +{ + internal class Espp + { + private readonly HttpClient httpClient; + + public Espp(HttpClient httpClient) + { + this.httpClient = httpClient; + } + + public async Task Get() + { + //var req = new HttpRequestMessage(HttpMethod.Get, "https://www.google.com"); + + //if (req == null) + // return; + + var response = await httpClient.GetAsync("http://dvocor.dvgd.rzd"); + var content = await response.Content.ReadAsStringAsync(); + + + + return content; + } + } +} diff --git a/PARR.EsppApi/Settings/EsppOrderSettings.cs b/PARR.EsppApi/Settings/EsppOrderSettings.cs new file mode 100644 index 00000000..26296223 --- /dev/null +++ b/PARR.EsppApi/Settings/EsppOrderSettings.cs @@ -0,0 +1,10 @@ +namespace PARR.EsppApi.Settings +{ + internal class EsppOrderSettings + { + public string Url { get; set; } = string.Empty; + + //login, pass + //todo: add othe + } +} diff --git a/PARR.EsppOrderLoader/Class1.cs b/PARR.EsppOrderLoader/Class1.cs deleted file mode 100644 index 5c538c10..00000000 --- a/PARR.EsppOrderLoader/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PARR.EsppOrderLoader -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj b/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj index cfadb03d..74361878 100644 --- a/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj +++ b/PARR.EsppOrderLoader/PARR.EsppOrderLoader.csproj @@ -6,4 +6,10 @@ enable + + + + + + diff --git a/PARR.EsppOrderLoader/ParrEsppOrderLoaderInstaller.cs b/PARR.EsppOrderLoader/ParrEsppOrderLoaderInstaller.cs new file mode 100644 index 00000000..3c87ac1f --- /dev/null +++ b/PARR.EsppOrderLoader/ParrEsppOrderLoaderInstaller.cs @@ -0,0 +1,22 @@ +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace PARR.EsppOrderLoader +{ + public static class ParrEsppOrderLoaderInstaller + { + public static void InstallEsppOrderLoaderServices(this IServiceCollection services, IConfiguration configuration) + { + //TODO: добавить настройи bll и dal и espp api + + // settings + //SettingsFromDb configuration + //var settingsFromDb = new SettingsFromDb(); + //configuration.GetSection(nameof(SettingsFromDb)).Bind(settingsFromDb); + //services.AddSingleton(settingsFromDb); + + //add other services + //services.AddTransient(); + } + } +} diff --git a/PARR.EsppOrderManager/Class1.cs b/PARR.EsppOrderManager/Class1.cs deleted file mode 100644 index 3001aed3..00000000 --- a/PARR.EsppOrderManager/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PARR.EsppOrderManager -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj b/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj index cfadb03d..0acb0120 100644 --- a/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj +++ b/PARR.EsppOrderManager/PARR.EsppOrderManager.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/PARR.Master/Class1.cs b/PARR.Master/Class1.cs deleted file mode 100644 index 88b42b79..00000000 --- a/PARR.Master/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace PARR.Master -{ - public class Class1 - { - - } -} \ No newline at end of file diff --git a/PARR.Master/PARR.Master.csproj b/PARR.Master/PARR.Master.csproj index cfadb03d..21190861 100644 --- a/PARR.Master/PARR.Master.csproj +++ b/PARR.Master/PARR.Master.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/PARR.Test/Worker.cs b/PARR.Test/Worker.cs index 7284e843..8d1cff3a 100644 --- a/PARR.Test/Worker.cs +++ b/PARR.Test/Worker.cs @@ -27,7 +27,7 @@ namespace PARR.Test private async Task TestEsppApi() { - // var orders = await esppApiService.FindOrdersByPrefixAsync("ПАРР__"); + var orders = await esppApiService.FindOrdersByPrefixAsync("ПАРР__"); } } diff --git a/PARR.Test/appsettings.json b/PARR.Test/appsettings.json index b2dcdb67..337c5fd0 100644 --- a/PARR.Test/appsettings.json +++ b/PARR.Test/appsettings.json @@ -4,5 +4,8 @@ "Default": "Information", "Microsoft.Hosting.Lifetime": "Information" } + }, + "EsppOrderSettings": { + "Url": "http://dafsdf" } }