Merge branch 'master' into TagBagRepository

DD.Persistence.API/DependencyInjection.cs

@@ -16,12 +16,6 @@ namespace DD.Persistence.API;
 
 public static class DependencyInjection
 {
-    //public static void MapsterSetup()
-    //{
-    //    TypeAdapterConfig.GlobalSettings.Default.Config
-    //        .ForType<TechMessageDto, TechMessage>()
-    //        .Ignore(dest => dest.System, dest => dest.SystemId);
-    //}
     public static void AddSwagger(this IServiceCollection services, IConfiguration configuration)
     {
         services.AddSwaggerGen(c =>

DD.Persistence.API/Startup.cs

@@ -26,8 +26,6 @@ public class Startup
         services.AddJWTAuthentication(Configuration);
         services.AddMemoryCache();
         services.AddServices();
-
-        //DependencyInjection.MapsterSetup();
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)

DD.Persistence.App/appsettings.json

@@ -19,6 +19,7 @@
     "password": 12345,
     "clientId": "webapi",
     "grantType": "password",
-    "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier": "7d9f3574-6574-4ca3-845a-0276eb4aa8f6"
+    "http://schemas.xmlsoap.org/ws/2005/05/identity /claims/nameidentifier": "7d9f3574-6574-4ca3-845a-0276eb4aa8f6"
-  }
+  },
+  "ClientUrl": "http://localhost:5000/"
 }

DD.Persistence.Client/Clients/ChangeLogClient.cs

@@ -3,15 +3,16 @@ using DD.Persistence.Client.Clients.Base;
 using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
 
 namespace DD.Persistence.Client.Clients;
 public class ChangeLogClient : BaseClient, IChangeLogClient
 {
-	private readonly Interfaces.Refit.IRefitChangeLogClient refitChangeLogClient;
+	private readonly IRefitChangeLogClient refitChangeLogClient;
 
-	public ChangeLogClient(Interfaces.Refit.IRefitChangeLogClient refitChangeLogClient, ILogger<ChangeLogClient> logger) : base(logger)
+    public ChangeLogClient(IRefitClientFactory<IRefitChangeLogClient> refitClientFactory, ILogger<ChangeLogClient> logger) : base(logger)
 	{
-		this.refitChangeLogClient = refitChangeLogClient;
+		this.refitChangeLogClient = refitClientFactory.Create();
     }
 
 	public async Task<int> ClearAndAddRange(Guid idDiscriminator, IEnumerable<DataWithWellDepthAndSectionDto> dtos, CancellationToken token)

DD.Persistence.Client/Clients/DataSourceSystemClient.cs

@@ -9,9 +9,9 @@ public class DataSourceSystemClient : BaseClient, IDataSourceSystemClient
 {
 	private readonly IRefitDataSourceSystemClient dataSourceSystemClient;
 
-	public DataSourceSystemClient(IRefitDataSourceSystemClient dataSourceSystemClient, ILogger<DataSourceSystemClient> logger) : base(logger)
+	public DataSourceSystemClient(IRefitClientFactory<IRefitDataSourceSystemClient> dataSourceSystemClientFactory, ILogger<DataSourceSystemClient> logger) : base(logger)
 	{
-		this.dataSourceSystemClient = dataSourceSystemClient;
+		this.dataSourceSystemClient = dataSourceSystemClientFactory.Create();
 	}
 
 	public async Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token)

DD.Persistence.Client/Clients/Interfaces/ITimeSeriesClient.cs

@@ -6,7 +6,7 @@ namespace DD.Persistence.Client.Clients.Interfaces;
 /// Клиент для работы с временными данными
 /// </summary>
 /// <typeparam name="TDto"></typeparam>
-public interface ITimeSeriesClient<TDto> : IDisposable where TDto : class, new()
+public interface ITimeSeriesClient<TDto> : IDisposable where TDto : class, ITimeSeriesAbstractDto
 {
 	/// <summary>
 	/// Добавление записей

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitChangeLogClient.cs

@@ -4,7 +4,7 @@ using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
 
-public interface IRefitChangeLogClient : IDisposable
+public interface IRefitChangeLogClient : IRefitClient, IDisposable
 {
     private const string BaseRoute = "/api/ChangeLog";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitClient.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DD.Persistence.Client.Clients.Interfaces.Refit;
+public interface IRefitClient
+{
+}

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitDataSourceSystemClient.cs

@@ -2,7 +2,7 @@
 using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
-public interface IRefitDataSourceSystemClient : IDisposable
+public interface IRefitDataSourceSystemClient : IRefitClient, IDisposable
 {
 	private const string BaseRoute = "/api/dataSourceSystem";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitSetpointClient.cs

@@ -3,7 +3,7 @@ using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
 
-public interface IRefitSetpointClient : IDisposable
+public interface IRefitSetpointClient : IRefitClient, IDisposable
 {
     private const string BaseRoute = "/api/setpoint";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitTechMessagesClient.cs

@@ -5,7 +5,7 @@ using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit
 {
-    public interface IRefitTechMessagesClient : IDisposable
+    public interface IRefitTechMessagesClient : IRefitClient, IDisposable
     {
         private const string BaseRoute = "/api/techMessages";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitTimeSeriesClient.cs

@@ -2,8 +2,8 @@ using DD.Persistence.Models;
 using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
-public interface IRefitTimeSeriesClient<TDto> : IDisposable
+public interface IRefitTimeSeriesClient<TDto> : IRefitClient, IDisposable
-	where TDto : class, new()
+    where TDto : class, ITimeSeriesAbstractDto
 {
     private const string BaseRoute = "/api/dataSaub";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitTimestampedSetClient.cs

@@ -3,7 +3,7 @@ using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
 
-public interface IRefitTimestampedSetClient : IDisposable
+public interface IRefitTimestampedSetClient : IRefitClient, IDisposable
 {
     private const string baseUrl = "/api/TimestampedSet/{idDiscriminator}";
 

DD.Persistence.Client/Clients/Interfaces/Refit/IRefitWitsDataClient.cs

@@ -3,7 +3,7 @@ using DD.Persistence.Models;
 using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
-public interface IRefitWitsDataClient : IDisposable
+public interface IRefitWitsDataClient : IRefitClient, IDisposable
 {
     private const string BaseRoute = "/api/witsData";
 

DD.Persistence.Client/Clients/SetpointClient.cs

@@ -10,9 +10,9 @@ public class SetpointClient : BaseClient, ISetpointClient
 {
 	private readonly IRefitSetpointClient refitSetpointClient;
 
-	public SetpointClient(IRefitSetpointClient refitSetpointClient, ILogger<SetpointClient> logger) : base(logger)
+	public SetpointClient(IRefitClientFactory<IRefitSetpointClient> refitSetpointClientFactory, ILogger<SetpointClient> logger) : base(logger)
 	{
-		this.refitSetpointClient = refitSetpointClient;
+		this.refitSetpointClient = refitSetpointClientFactory.Create();
 	}
 
 	public async Task<IEnumerable<SetpointValueDto>> GetCurrent(IEnumerable<Guid> setpointKeys, CancellationToken token)

DD.Persistence.Client/Clients/TechMessagesClient.cs

@@ -11,9 +11,9 @@ public class TechMessagesClient : BaseClient, ITechMessagesClient
 {
 	private readonly IRefitTechMessagesClient refitTechMessagesClient;
 
-	public TechMessagesClient(IRefitTechMessagesClient refitTechMessagesClient, ILogger<TechMessagesClient> logger) : base(logger)
+	public TechMessagesClient(IRefitClientFactory<IRefitTechMessagesClient> refitTechMessagesClientFactory, ILogger<TechMessagesClient> logger) : base(logger)
 	{
-		this.refitTechMessagesClient = refitTechMessagesClient;
+		this.refitTechMessagesClient = refitTechMessagesClientFactory.Create();
 	}
 
 	public async Task<PaginationContainer<TechMessageDto>> GetPage(PaginationRequest request, CancellationToken token)

DD.Persistence.Client/Clients/TimeSeriesClient.cs

@@ -5,13 +5,13 @@ using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Models;
 
 namespace DD.Persistence.Client.Clients;
-public class TimeSeriesClient<TDto> : BaseClient, ITimeSeriesClient<TDto> where TDto : class, new()
+public class TimeSeriesClient<TDto> : BaseClient, ITimeSeriesClient<TDto> where TDto : class, ITimeSeriesAbstractDto
 {
 	private readonly IRefitTimeSeriesClient<TDto> timeSeriesClient;
 
-	public TimeSeriesClient(IRefitTimeSeriesClient<TDto> refitTechMessagesClient, ILogger<TimeSeriesClient<TDto>> logger) : base(logger)
+	public TimeSeriesClient(IRefitClientFactory<IRefitTimeSeriesClient<TDto>> refitTechMessagesClientFactory, ILogger<TimeSeriesClient<TDto>> logger) : base(logger)
 	{
-		this.timeSeriesClient = refitTechMessagesClient;
+		this.timeSeriesClient = refitTechMessagesClientFactory.Create();
 	}
 
 	public async Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token)

DD.Persistence.Client/Clients/TimestampedSetClient.cs

@@ -9,9 +9,9 @@ public class TimestampedSetClient : BaseClient, ITimestampedSetClient
 {
 	private readonly IRefitTimestampedSetClient refitTimestampedSetClient;
 
-	public TimestampedSetClient(IRefitTimestampedSetClient refitTimestampedSetClient, ILogger<TimestampedSetClient> logger) : base(logger)
+	public TimestampedSetClient(IRefitClientFactory<IRefitTimestampedSetClient> refitTimestampedSetClientFactory, ILogger<TimestampedSetClient> logger) : base(logger)
 	{
-		this.refitTimestampedSetClient = refitTimestampedSetClient;
+		this.refitTimestampedSetClient = refitTimestampedSetClientFactory.Create();
 	}
 
 	public async Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token)

DD.Persistence.Client/Clients/WitsDataClient.cs

@@ -9,9 +9,9 @@ public class WitsDataClient : BaseClient, IWitsDataClient
 {
 	private readonly IRefitWitsDataClient refitWitsDataClient;
 
-	public WitsDataClient(IRefitWitsDataClient refitWitsDataClient, ILogger<WitsDataClient> logger) : base(logger)
+	public WitsDataClient(IRefitClientFactory<IRefitWitsDataClient> refitWitsDataClientFactory, ILogger<WitsDataClient> logger) : base(logger)
 	{
-		this.refitWitsDataClient = refitWitsDataClient;
+		this.refitWitsDataClient = refitWitsDataClientFactory.Create();
 	}
 
 	public async Task<int> AddRange(IEnumerable<WitsDataDto> dtos, CancellationToken token)

DD.Persistence.Client/DD.Persistence.Client.csproj

@@ -53,6 +53,7 @@
     <PackageReference Include="Refit" Version="8.0.0" />
     <PackageReference Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageReference Include="RestSharp" Version="112.1.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
   </ItemGroup>
 

DD.Persistence.Client/DependencyInjection.cs

@@ -0,0 +1,30 @@
+using DD.Persistence.Client.Clients;
+using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Models;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace DD.Persistence.Client;
+
+/// <summary>
+/// 
+/// </summary>
+public static class DependencyInjection
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="services"></param>
+    /// <returns></returns>
+    public static IServiceCollection AddPersistenceClients(this IServiceCollection services)
+    {
+        services.AddTransient(typeof(IRefitClientFactory<>), typeof(RefitClientFactory<>));
+        services.AddTransient<IChangeLogClient, ChangeLogClient>();
+        services.AddTransient<IDataSourceSystemClient, DataSourceSystemClient>();
+        services.AddTransient<ISetpointClient, SetpointClient>();
+        services.AddTransient<ITechMessagesClient, TechMessagesClient>();
+        services.AddTransient<ITimeSeriesClient<DataSaubDto>, TimeSeriesClient<DataSaubDto>>();
+        services.AddTransient<ITimestampedSetClient, TimestampedSetClient>();
+        services.AddTransient<IWitsDataClient, WitsDataClient>();
+        return services;
+    }
+}

DD.Persistence.Client/IRefitClientFactory.cs

@@ -0,0 +1,16 @@
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+
+namespace DD.Persistence.Client;
+
+/// <summary>
+/// Интерфейс для фабрики, которая создает refit-клиентов
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public interface IRefitClientFactory<T> where T : IRefitClient
+{
+    /// <summary>
+    /// Создание refit-клиента
+    /// </summary>
+    /// <returns></returns>
+    public T Create();
+}

DD.Persistence.Client/PersistenceClientFactory.cs

@@ -1,146 +0,0 @@
-using Microsoft.Extensions.Configuration;
-using DD.Persistence.Client.Clients.Interfaces;
-using DD.Persistence.Client.Clients;
-using DD.Persistence.Client.Helpers;
-using Refit;
-using DD.Persistence.Factories;
-using DD.Persistence.Client.Clients.Interfaces.Refit;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.DependencyInjection;
-using System.Text.Json;
-
-namespace DD.Persistence.Client
-{
-	/// <summary>
-	/// Фабрика клиентов для доступа к Persistence - сервису
-	/// </summary>
-	public class PersistenceClientFactory
-	{
-		private static readonly JsonSerializerOptions JsonSerializerOptions = new()
-		{
-			PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-			PropertyNameCaseInsensitive = true
-		};
-		private static readonly RefitSettings RefitSettings = new(new SystemTextJsonContentSerializer(JsonSerializerOptions));
-		private readonly IServiceProvider provider;
-		private HttpClient httpClient;
-		public PersistenceClientFactory(IHttpClientFactory httpClientFactory, IServiceProvider provider, IConfiguration configuration)
-		{
-			this.provider = provider;
-
-			httpClient = httpClientFactory.CreateClient();
-
-			httpClient.Authorize(configuration);
-		}
-
-		public PersistenceClientFactory(IHttpClientFactory httpClientFactory, IAuthTokenFactory authTokenFactory, IServiceProvider provider, IConfiguration configuration)
-		{
-			this.provider = provider;
-
-			httpClient = httpClientFactory.CreateClient();
-
-			var token = authTokenFactory.GetToken();
-			httpClient.Authorize(token);
-		}
-
-		/// <summary>
-		/// Получить клиент для работы с уставками
-		/// </summary>
-		/// <returns></returns>
-		public ISetpointClient GetSetpointClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<SetpointClient>>();
-
-			var restClient = RestService.For<IRefitSetpointClient>(httpClient, RefitSettings);
-			var client = new SetpointClient(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы с технологическими сообщениями
-		/// </summary>
-		/// <returns></returns>
-		public ITechMessagesClient GetTechMessagesClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<TechMessagesClient>>();
-
-			var restClient = RestService.For<IRefitTechMessagesClient>(httpClient, RefitSettings);
-			var client = new TechMessagesClient(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы с временными данными
-		/// </summary>
-		/// <typeparam name="TDto"></typeparam>
-		/// <returns></returns>
-		public ITimeSeriesClient<TDto> GetTimeSeriesClient<TDto>()
-			where TDto : class, new()
-		{
-			var logger = provider.GetRequiredService<ILogger<TimeSeriesClient<TDto>>>();
-
-			var restClient = RestService.For<IRefitTimeSeriesClient<TDto>>(httpClient, RefitSettings);
-			var client = new TimeSeriesClient<TDto>(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы с данными с отметкой времени
-		/// </summary>
-		/// <returns></returns>
-		public ITimestampedSetClient GetTimestampedSetClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<TimestampedSetClient>>();
-
-			var restClient = RestService.For<IRefitTimestampedSetClient>(httpClient, RefitSettings);
-			var client = new TimestampedSetClient(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы с записями ChangeLog
-		/// </summary>
-		/// <returns></returns>
-		public IChangeLogClient GetChangeLogClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<ChangeLogClient>>();
-
-			var restClient = RestService.For<IRefitChangeLogClient>(httpClient, RefitSettings);
-			var client = new ChangeLogClient(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы c параметрами Wits
-		/// </summary>
-		/// <returns></returns>
-		public IWitsDataClient GetWitsDataClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<WitsDataClient>>();
-
-			var restClient = RestService.For<IRefitWitsDataClient>(httpClient, RefitSettings);
-			var client = new WitsDataClient(restClient, logger);
-
-			return client;
-		}
-
-		/// <summary>
-		/// Получить клиент для работы c системами
-		/// </summary>
-		/// <returns></returns>
-		public IDataSourceSystemClient GetDataSourceSystemClient()
-		{
-			var logger = provider.GetRequiredService<ILogger<DataSourceSystemClient>>();
-
-			var restClient = RestService.For<IRefitDataSourceSystemClient>(httpClient, RefitSettings);
-			var client = new DataSourceSystemClient(restClient, logger);
-
-			return client;
-		}
-	}
-}

DD.Persistence.Client/RefitClientFactory.cs

@@ -0,0 +1,52 @@
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Client.Helpers;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Refit;
+using System.Configuration;
+using System.Text.Json;
+
+namespace DD.Persistence.Client;
+
+/// <summary>
+/// Фабрика, которая создает refit-клиентов
+/// </summary>
+/// <typeparam name="T"></typeparam>
+public class RefitClientFactory<T> : IRefitClientFactory<T> where T : IRefitClient
+{
+    private HttpClient client;
+    private RefitSettings refitSettings;
+
+    /// <inheritdoc/>
+    public RefitClientFactory(IConfiguration configuration, ILogger<IRefitClientFactory<T>> logger, HttpClient client)
+    {
+        //this.client = factory.CreateClient();
+        this.client = client;
+
+        var baseUrl = configuration.GetSection("ClientUrl").Get<string>();
+        if (String.IsNullOrEmpty(baseUrl))
+        {
+            var exception = new SettingsPropertyNotFoundException("В настройках конфигурации не указан адрес Persistence сервиса.");
+
+            logger.LogError(exception.Message);
+
+            throw exception;
+        }
+        client.BaseAddress = new Uri(baseUrl);
+
+        JsonSerializerOptions JsonSerializerOptions = new()
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            PropertyNameCaseInsensitive = true
+        };
+        refitSettings = new(new SystemTextJsonContentSerializer(JsonSerializerOptions));
+    }
+    /// <summary>
+    /// создание клиента
+    /// </summary>
+    /// <returns></returns>
+    public T Create()
+    {
+        return RestService.For<T>(client, refitSettings);
+    }
+}

DD.Persistence.IntegrationTests/Controllers/ChangeLogControllerTest.cs

@@ -7,6 +7,11 @@ using DD.Persistence.Models.Requests;
 using Xunit;
 using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Client;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Client.Clients;
+using Microsoft.Extensions.Logging;
+using Refit;
+using System.Net.Http;
 
 namespace DD.Persistence.IntegrationTests.Controllers;
 public class ChangeLogControllerTest : BaseIntegrationTest
@@ -16,10 +21,12 @@ public class ChangeLogControllerTest : BaseIntegrationTest
 
     public ChangeLogControllerTest(WebAppFactoryFixture factory) : base(factory)
     {
-        var persistenceClientFactory = scope.ServiceProvider
+        var refitClientFactory = scope.ServiceProvider
-            .GetRequiredService<PersistenceClientFactory>();
+            .GetRequiredService<IRefitClientFactory<IRefitChangeLogClient>>();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger<ChangeLogClient>>();
 
-        client = persistenceClientFactory.GetChangeLogClient();
+        client = scope.ServiceProvider
+            .GetRequiredService<IChangeLogClient>();
     }
 
     [Fact]

DD.Persistence.IntegrationTests/Controllers/DataSourceSystemControllerTest.cs

@@ -6,6 +6,8 @@ using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Database.Entity;
 using DD.Persistence.Models;
 using Xunit;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using Microsoft.Extensions.Logging;
 
 namespace DD.Persistence.IntegrationTests.Controllers
 {
@@ -16,11 +18,12 @@ namespace DD.Persistence.IntegrationTests.Controllers
         private readonly IMemoryCache memoryCache;
         public DataSourceSystemControllerTest(WebAppFactoryFixture factory) : base(factory)
         {
-            var scope = factory.Services.CreateScope();
+            var refitClientFactory = scope.ServiceProvider
-            var persistenceClientFactory = scope.ServiceProvider
+                .GetRequiredService<IRefitClientFactory<IRefitDataSourceSystemClient>>();
-                .GetRequiredService<PersistenceClientFactory>();
+            var logger = scope.ServiceProvider.GetRequiredService<ILogger<DataSourceSystemClient>>();
 
-            dataSourceSystemClient = persistenceClientFactory.GetDataSourceSystemClient();
+            dataSourceSystemClient = scope.ServiceProvider
+                .GetRequiredService<IDataSourceSystemClient>();
             memoryCache = scope.ServiceProvider.GetRequiredService<IMemoryCache>();
         }
 

DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs

@@ -4,6 +4,9 @@ using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Database.Model;
 using System.Net;
 using Xunit;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Client.Clients;
+using Microsoft.Extensions.Logging;
 
 namespace DD.Persistence.IntegrationTests.Controllers
 {
@@ -17,11 +20,12 @@ namespace DD.Persistence.IntegrationTests.Controllers
         }
         public SetpointControllerTest(WebAppFactoryFixture factory) : base(factory)
         {
-            var scope = factory.Services.CreateScope();
+            var refitClientFactory = scope.ServiceProvider
-            var persistenceClientFactory = scope.ServiceProvider
+            .GetRequiredService<IRefitClientFactory<IRefitSetpointClient>>();
-                .GetRequiredService<PersistenceClientFactory>();
+            var logger = scope.ServiceProvider.GetRequiredService<ILogger<SetpointClient>>();
 
-            setpointClient = persistenceClientFactory.GetSetpointClient();
+            setpointClient = scope.ServiceProvider
+                .GetRequiredService<ISetpointClient>();
         }
 
         [Fact]

DD.Persistence.IntegrationTests/Controllers/TechMessagesControllerTest.cs

@@ -1,12 +1,14 @@
-using Microsoft.Extensions.Caching.Memory;
+using DD.Persistence.Client;
-using Microsoft.Extensions.DependencyInjection;
+using DD.Persistence.Client.Clients;
-using DD.Persistence.Client;
 using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Database.Entity;
 using DD.Persistence.Models;
 using DD.Persistence.Models.Enumerations;
 using DD.Persistence.Models.Requests;
-using System.Net;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Xunit;
 
 namespace DD.Persistence.IntegrationTests.Controllers
@@ -18,11 +20,12 @@ namespace DD.Persistence.IntegrationTests.Controllers
         private readonly IMemoryCache memoryCache;
         public TechMessagesControllerTest(WebAppFactoryFixture factory) : base(factory)
         {
-			var scope = factory.Services.CreateScope();
+            var refitClientFactory = scope.ServiceProvider
-			var persistenceClientFactory = scope.ServiceProvider
+            .GetRequiredService<IRefitClientFactory<IRefitTechMessagesClient>>();
-				.GetRequiredService<PersistenceClientFactory>();
+            var logger = scope.ServiceProvider.GetRequiredService<ILogger<TechMessagesClient>>();
 
-			techMessagesClient = persistenceClientFactory.GetTechMessagesClient();
+            techMessagesClient = scope.ServiceProvider
+                .GetRequiredService<ITechMessagesClient>();
             memoryCache = scope.ServiceProvider.GetRequiredService<IMemoryCache>();
         }
 
@@ -147,8 +150,8 @@ namespace DD.Persistence.IntegrationTests.Controllers
             dbContext.CleanupDbSet<TechMessage>();
             dbContext.CleanupDbSet<DataSourceSystem>();
 
-			var categoryIds = new [] { 1, 2 };
+            var categoryIds = new[] { 1, 2 };
-			var systemIds = new [] { Guid.NewGuid() };
+            var systemIds = new[] { Guid.NewGuid() };
 
             //act
             var response = await techMessagesClient.GetStatistics(systemIds, categoryIds, CancellationToken.None);

DD.Persistence.IntegrationTests/Controllers/TimeSeriesBaseControllerTest.cs

@@ -1,16 +1,19 @@
+using DD.Persistence.Client;
+using DD.Persistence.Client.Clients;
+using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Database.Model;
+using DD.Persistence.Models;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
-using DD.Persistence.Client;
+using Microsoft.Extensions.Logging;
-using DD.Persistence.Client.Clients.Interfaces;
-using DD.Persistence.Database.Model;
-using System.Net;
 using Xunit;
 
 namespace DD.Persistence.IntegrationTests.Controllers;
 
 public abstract class TimeSeriesBaseControllerTest<TEntity, TDto> : BaseIntegrationTest
     where TEntity : class, ITimestampedData, new()
-    where TDto : class, new()
+    where TDto : class, ITimeSeriesAbstractDto, new()
 {
     private readonly ITimeSeriesClient<TDto> timeSeriesClient;
 
@@ -18,11 +21,12 @@ public abstract class TimeSeriesBaseControllerTest<TEntity, TDto> : BaseIntegrat
     {
         dbContext.CleanupDbSet<TEntity>();
 
-        var scope = factory.Services.CreateScope();
+        var refitClientFactory = scope.ServiceProvider
-        var persistenceClientFactory = scope.ServiceProvider
+            .GetRequiredService<IRefitClientFactory<IRefitTimeSeriesClient<TDto>>>();
-            .GetRequiredService<PersistenceClientFactory>();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger<TimeSeriesClient<TDto>>>();
 
-        timeSeriesClient = persistenceClientFactory.GetTimeSeriesClient<TDto>();
+        timeSeriesClient = scope.ServiceProvider
+            .GetRequiredService<ITimeSeriesClient<TDto>>();
     }
 
     public async Task InsertRangeSuccess(TDto dto)

DD.Persistence.IntegrationTests/Controllers/TimestampedSetControllerTest.cs

@@ -3,6 +3,9 @@ using DD.Persistence.Client;
 using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Models;
 using Xunit;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Client.Clients;
+using Microsoft.Extensions.Logging;
 
 namespace DD.Persistence.IntegrationTests.Controllers;
 public class TimestampedSetControllerTest : BaseIntegrationTest
@@ -11,10 +14,12 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
 
     public TimestampedSetControllerTest(WebAppFactoryFixture factory) : base(factory)
     {
-        var persistenceClientFactory = scope.ServiceProvider
+        var refitClientFactory = scope.ServiceProvider
-            .GetRequiredService<PersistenceClientFactory>();
+           .GetRequiredService<IRefitClientFactory<IRefitTimestampedSetClient>>();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger<TimestampedSetClient>>();
 
-        client = persistenceClientFactory.GetTimestampedSetClient();
+        client = scope.ServiceProvider
+            .GetRequiredService<ITimestampedSetClient>();
     }
 
     [Fact]

DD.Persistence.IntegrationTests/Controllers/WitsDataControllerTest.cs

@@ -1,10 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
+using DD.Persistence.Client;
+using DD.Persistence.Client.Clients;
+using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Database.Entity;
 using DD.Persistence.Models;
-using System.Net;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using Xunit;
-using DD.Persistence.Client.Clients.Interfaces;
-using DD.Persistence.Client;
 
 namespace DD.Persistence.IntegrationTests.Controllers;
 public class WitsDataControllerTest : BaseIntegrationTest
@@ -13,11 +15,12 @@ public class WitsDataControllerTest : BaseIntegrationTest
 
     public WitsDataControllerTest(WebAppFactoryFixture factory) : base(factory)
     {
-        var scope = factory.Services.CreateScope();
+        var refitClientFactory = scope.ServiceProvider
-        var persistenceClientFactory = scope.ServiceProvider
+           .GetRequiredService<IRefitClientFactory<IRefitWitsDataClient>>();
-            .GetRequiredService<PersistenceClientFactory>();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger<WitsDataClient>>();
 
-        witsDataClient = persistenceClientFactory.GetWitsDataClient();
+        witsDataClient = scope.ServiceProvider
+            .GetRequiredService<IWitsDataClient>();
     }
 
     [Fact]

DD.Persistence.IntegrationTests/TestHttpClientFactory.cs

@@ -1,4 +1,7 @@
-namespace DD.Persistence.IntegrationTests
+using DD.Persistence.Client.Helpers;
+using Microsoft.Extensions.Configuration;
+
+namespace DD.Persistence.IntegrationTests
 {
     /// <summary>
     /// Фабрика HTTP клиентов для интеграционных тестов
@@ -6,14 +9,19 @@
     public class TestHttpClientFactory : IHttpClientFactory
     {
         private readonly WebAppFactoryFixture factory;
+        private readonly IConfiguration configuration;
 
-        public TestHttpClientFactory(WebAppFactoryFixture factory)
+        public TestHttpClientFactory(WebAppFactoryFixture factory, IConfiguration configuration)
         {
             this.factory = factory;
+            this.configuration = configuration;
         }
         public HttpClient CreateClient(string name)
         {
-            return factory.CreateClient();
+            var client = factory.CreateClient();
+            client.Authorize(configuration);
+
+            return client;
         }
     }
 }

DD.Persistence.IntegrationTests/WebAppFactoryFixture.cs

@@ -11,6 +11,9 @@ using DD.Persistence.Database.Model;
 using DD.Persistence.Database.Postgres;
 using RestSharp;
 using DD.Persistence.App;
+using DD.Persistence.Client.Helpers;
+using DD.Persistence.Factories;
+using System.Net;
 
 namespace DD.Persistence.IntegrationTests;
 public class WebAppFactoryFixture : WebApplicationFactory<Program>
@@ -40,12 +43,12 @@ public class WebAppFactoryFixture : WebApplicationFactory<Program>
 			services.AddLogging(builder => builder.AddConsole());
 
 			services.RemoveAll<IHttpClientFactory>();
-			services.AddSingleton<IHttpClientFactory>(provider =>
+            services.AddSingleton<IHttpClientFactory>((provider) =>
             {
-				return new TestHttpClientFactory(this);
+                return new TestHttpClientFactory(this, provider.GetRequiredService<IConfiguration>());
             });
-
+            services.AddHttpClient();
-            services.AddSingleton<PersistenceClientFactory>();
+            services.AddPersistenceClients();
 
             var serviceProvider = services.BuildServiceProvider();