DD.Persistence.API/Controllers/ChangeLogController.cs

@@ -4,6 +4,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
 using DD.Persistence.Repositories;
 using System.Net;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API.Controllers;
 

DD.Persistence.API/Controllers/DataSaubController.cs

@@ -1,20 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-
-namespace DD.Persistence.API.Controllers;
-
-/// <summary>
-/// Работа с временными данными
-/// </summary>
-[ApiController]
-[Authorize]
-[Route("api/[controller]")]
-public class DataSaubController : TimeSeriesController<DataSaubDto>
-{
-    public DataSaubController(ITimeSeriesDataRepository<DataSaubDto> timeSeriesDataRepository) : base(timeSeriesDataRepository)
-    {
-
-    }
-}

DD.Persistence.API/Controllers/SetpointController.cs

@@ -4,6 +4,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Repositories;
 using System.Net;
 using System.Text.Json;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API.Controllers;
 

DD.Persistence.API/Controllers/TechMessagesController.cs

@@ -4,6 +4,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
 using DD.Persistence.Repositories;
 using System.Net;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API.Controllers;
 

DD.Persistence.API/Controllers/TimeSeriesController.cs

@@ -1,76 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-
-namespace DD.Persistence.API.Controllers;
-
-[ApiController]
-[Authorize]
-[Route("api/[controller]")]
-public class TimeSeriesController<TDto> : ControllerBase, ITimeSeriesDataApi<TDto>
-   where TDto : class, ITimeSeriesAbstractDto, new()
-{
-    private readonly ITimeSeriesDataRepository<TDto> timeSeriesDataRepository;
-
-    public TimeSeriesController(ITimeSeriesDataRepository<TDto> timeSeriesDataRepository)
-    {
-        this.timeSeriesDataRepository = timeSeriesDataRepository;
-    }
-
-    /// <summary>
-    /// Получить список объектов, удовлетворяющий диапазону дат
-    /// </summary>
-    /// <param name="dateBegin"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    [HttpGet]
-    [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> Get(DateTimeOffset dateBegin, CancellationToken token)
-    {
-        var result = await timeSeriesDataRepository.GetGtDate(dateBegin, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Получить диапазон дат, для которых есть данные в репозитории
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    [HttpGet("datesRange")]
-    public async Task<IActionResult> GetDatesRange(CancellationToken token)
-    {
-        var result = await timeSeriesDataRepository.GetDatesRange(token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Получить список объектов с прореживанием, удовлетворяющий диапазону дат
-    /// </summary>
-    /// <param name="dateBegin"></param>
-    /// <param name="intervalSec"></param>
-    /// <param name="approxPointsCount"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    [HttpGet("resampled")]
-    public async Task<IActionResult> GetResampledData(DateTimeOffset dateBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default)
-    {
-        var result = await timeSeriesDataRepository.GetResampledData(dateBegin, intervalSec, approxPointsCount, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Добавить записи
-    /// </summary>
-    /// <param name="dtos"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    [HttpPost]
-    public async Task<IActionResult> AddRange(IEnumerable<TDto> dtos, CancellationToken token)
-    {
-        var result = await timeSeriesDataRepository.AddRange(dtos, token);
-        return Ok(result);
-    }
-
-
-}

DD.Persistence.API/Controllers/TimestampedSetController.cs

@@ -1,104 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-using System.Net;
-
-namespace DD.Persistence.API.Controllers;
-
-/// <summary>
-/// Хранение наборов данных с отметкой времени.
-/// Не оптимизировано под большие данные.
-/// </summary>
-[ApiController]
-[Authorize]
-[Route("api/[controller]/{idDiscriminator}")]
-public class TimestampedSetController : ControllerBase
-{
-    private readonly ITimestampedSetRepository repository;
-
-    public TimestampedSetController(ITimestampedSetRepository repository)
-    {
-        this.repository = repository;
-    }
-
-    /// <summary>
-    /// Записать новые данные
-    /// Предполагается что данные с одним дискриминатором имеют одинаковую структуру
-    /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
-    /// <param name="sets"></param>
-    /// <param name="token"></param>
-    /// <returns>кол-во затронутых записей</returns>
-    [HttpPost]
-    [ProducesResponseType(typeof(int), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> AddRange([FromRoute] Guid idDiscriminator, [FromBody] IEnumerable<TimestampedSetDto> sets, CancellationToken token)
-    {
-        var result = await repository.AddRange(idDiscriminator, sets, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Получение данных с фильтрацией. Значение фильтра null - отключен
-    /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
-    /// <param name="geTimestamp">Фильтр позднее даты</param>
-    /// <param name="columnNames">Фильтр свойств набора. Можно запросить только некоторые свойства из набора</param>
-    /// <param name="skip"></param>
-    /// <param name="take"></param>
-    /// <param name="token"></param>
-    /// <returns>Фильтрованный набор данных с сортировкой по отметке времени</returns>
-    [HttpGet]
-    [ProducesResponseType(typeof(IEnumerable<TimestampedSetDto>), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, [FromQuery] IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
-    {
-        var result = await repository.Get(idDiscriminator, geTimestamp, columnNames, skip, take, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Получить последние данные
-    /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
-    /// <param name="columnNames">Фильтр свойств набора. Можно запросить только некоторые свойства из набора</param>
-    /// <param name="take"></param>
-    /// <param name="token"></param>
-    /// <returns>Фильтрованный набор данных с сортировкой по отметке времени</returns>
-    [HttpGet("last")]
-    [ProducesResponseType(typeof(IEnumerable<TimestampedSetDto>), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> GetLast(Guid idDiscriminator, [FromQuery] IEnumerable<string>? columnNames, int take, CancellationToken token)
-    {
-        var result = await repository.GetLast(idDiscriminator, columnNames, take, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Диапазон дат за которые есть данные
-    /// </summary>
-    /// <param name="idDiscriminator"></param>
-    /// <param name="token"></param>
-    /// <returns>Дата первой и последней записи</returns>
-    [HttpGet("datesRange")]
-    [ProducesResponseType(typeof(DatesRangeDto), (int)HttpStatusCode.OK)]
-    [ProducesResponseType((int)HttpStatusCode.NoContent)]
-    public async Task<IActionResult> GetDatesRange(Guid idDiscriminator, CancellationToken token)
-    {
-        var result = await repository.GetDatesRange(idDiscriminator, token);
-        return Ok(result);
-    }
-
-    /// <summary>
-    /// Количество записей по указанному набору в БД. Для пагинации.
-    /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    [HttpGet("count")]
-    [ProducesResponseType(typeof(int), (int)HttpStatusCode.OK)]
-    [ProducesResponseType((int)HttpStatusCode.NoContent)]
-    public async Task<IActionResult> Count(Guid idDiscriminator, CancellationToken token)
-    {
-        var result = await repository.Count(idDiscriminator, token);
-        return Ok(result);
-    }
-}

DD.Persistence.API/Controllers/TimestampedValuesController.cs

@@ -0,0 +1,151 @@
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+using DD.Persistence.Services.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System.Net;
+
+namespace DD.Persistence.API.Controllers;
+
+/// <summary>
+/// Хранение наборов данных с отметкой времени.
+/// </summary>
+[ApiController]
+[Authorize]
+[Route("api/[controller]/{discriminatorId}")]
+public class TimestampedValuesController : ControllerBase
+{
+    private readonly ITimestampedValuesService timestampedValuesRepository;
+
+    public TimestampedValuesController(ITimestampedValuesService repository)
+    {
+        this.timestampedValuesRepository = repository;
+    }
+
+    /// <summary>
+    /// Записать новые данные.
+    /// Предполагается что данные с одним дискриминатором имеют одинаковую структуру
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    [HttpPost]
+    [ProducesResponseType(typeof(int), (int)HttpStatusCode.Created)]
+    public async Task<IActionResult> AddRange([FromRoute] Guid discriminatorId, [FromBody] IEnumerable<TimestampedValuesDto> dtos, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.AddRange(discriminatorId, dtos, token);
+
+        return CreatedAtAction(nameof(AddRange), result);
+    }
+
+    /// <summary>
+    /// Получение данных с фильтрацией. Значение фильтра null - отключен
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin">Фильтр позднее даты</param>
+    /// <param name="columnNames">Фильтр свойств набора</param>
+    /// <param name="skip"></param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    [HttpGet]
+    [ProducesResponseType(typeof(IEnumerable<TimestampedValuesDto>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    public async Task<ActionResult<IEnumerable<TimestampedValuesDto>>> Get([FromRoute] Guid discriminatorId, DateTimeOffset? timestampBegin, [FromQuery] string[]? columnNames, int skip, int take, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.Get(discriminatorId, timestampBegin, columnNames, skip, take, token);
+
+        return result.Any() ? Ok(result) : NoContent();
+    }
+
+    /// <summary>
+    /// Получить данные, начиная с заданной отметки времени
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin">Фильтр позднее даты</param>
+    /// <param name="token"></param>
+    [HttpGet("gtdate")]
+    [ProducesResponseType(typeof(IEnumerable<TimestampedValuesDto>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    public async Task<ActionResult<IEnumerable<TimestampedValuesDto>>> GetGtDate([FromRoute] Guid discriminatorId, DateTimeOffset timestampBegin, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.GetGtDate(discriminatorId, timestampBegin, token);
+
+        return result.Any() ? Ok(result) : NoContent();
+    }
+
+    /// <summary>
+    /// Получить данные c начала
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    [HttpGet("first")]
+    [ProducesResponseType(typeof(IEnumerable<TimestampedValuesDto>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    public async Task<ActionResult<IEnumerable<TimestampedValuesDto>>> GetFirst([FromRoute] Guid discriminatorId, int take, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.GetFirst(discriminatorId, take, token);
+
+        return result.Any() ? Ok(result) : NoContent();
+    }
+
+    /// <summary>
+    /// Получить данные c конца
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    [HttpGet("last")]
+    [ProducesResponseType(typeof(IEnumerable<TimestampedValuesDto>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    public async Task<ActionResult<IEnumerable<TimestampedValuesDto>>> GetLast([FromRoute] Guid discriminatorId, int take, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.GetLast(discriminatorId, take, token);
+
+        return result.Any() ? Ok(result) : NoContent();
+    }
+
+    /// <summary>
+    /// Получить список объектов с прореживанием, удовлетворяющий диапазону дат
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin">Фильтр позднее даты</param>
+    /// <param name="intervalSec"></param>
+    /// <param name="approxPointsCount"></param>
+    /// <param name="token"></param>
+    [HttpGet("resampled")]
+    [ProducesResponseType(typeof(IEnumerable<TimestampedValuesDto>), (int)HttpStatusCode.OK)]
+    [ProducesResponseType((int)HttpStatusCode.NoContent)]
+    public async Task<ActionResult<IEnumerable<TimestampedValuesDto>>> GetResampledData([FromRoute] Guid discriminatorId, DateTimeOffset timestampBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default)
+    {
+        var result = await timestampedValuesRepository.GetResampledData(discriminatorId, timestampBegin, intervalSec, approxPointsCount, token);
+
+        return result.Any() ? Ok(result) : NoContent();
+    }
+
+    /// <summary>
+    /// Получить количество записей по указанному набору в БД. Для пагинации
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="token"></param>
+    [HttpGet("count")]
+    public async Task<ActionResult<int>> Count([FromRoute] Guid discriminatorId, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.Count(discriminatorId, token);
+
+        return Ok(result);
+    }
+
+    /// <summary>
+    /// Получить диапазон дат, в пределах которых хранятся даные
+    /// </summary>
+    /// <param name="discriminatorId"></param>
+    /// <param name="token"></param>
+    [HttpGet("datesRange")]
+    public async Task<ActionResult<DatesRangeDto>> GetDatesRange([FromRoute] Guid discriminatorId, CancellationToken token)
+    {
+        var result = await timestampedValuesRepository.GetDatesRange(discriminatorId, token);
+
+        return Ok(result);
+    }
+}

DD.Persistence.API/Controllers/WitsDataController.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using DD.Persistence.Models;
 using DD.Persistence.Services.Interfaces;
 using System.Net;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API.Controllers;
 

DD.Persistence.API/DependencyInjection.cs

@@ -53,6 +53,7 @@ public static class DependencyInjection
     public static void AddServices(this IServiceCollection services)
     {
         services.AddTransient<IWitsDataService, WitsDataService>();
+        services.AddTransient<ITimestampedValuesService, TimestampedValuesService>();
     }
 
     #region Authentication

DD.Persistence.App/appsettings.Tests.json

@@ -1,10 +1,10 @@
 {
   "DbConnection": {
-    "Host": "localhost",
+    "Host": "postgres",
     "Port": 5432,
     "Database": "persistence",
     "Username": "postgres",
-    "Password": "postgres"
+    "Password": "q"
   },
   "NeedUseKeyCloak": false,
   "AuthUser": {

DD.Persistence.Client/Clients/ChangeLogClient.cs

@@ -4,6 +4,7 @@ using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
 using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients;
 public class ChangeLogClient : BaseClient, IChangeLogClient

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 
 namespace DD.Persistence.Client.Clients.Interfaces;

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients.Interfaces;
 

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 
 namespace DD.Persistence.Client.Clients.Interfaces;

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

@@ -1,44 +0,0 @@
-using DD.Persistence.Models;
-
-namespace DD.Persistence.Client.Clients.Interfaces;
-
-/// <summary>
-/// Клиент для работы с временными данными
-/// </summary>
-/// <typeparam name="TDto"></typeparam>
-public interface ITimeSeriesClient<TDto> : IDisposable where TDto : class, ITimeSeriesAbstractDto
-{
-	/// <summary>
-	/// Добавление записей
-	/// </summary>
-	/// <param name="dtos"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token);
-
-	/// <summary>
-	/// Получить список объектов, удовлетворяющий диапазону дат
-	/// </summary>
-	/// <param name="dateBegin"></param>
-	/// <param name="dateEnd"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<IEnumerable<TDto>> Get(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token);
-
-	/// <summary>
-	/// Получить диапазон дат, для которых есть данные в репозитории
-	/// </summary>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<DatesRangeDto?> GetDatesRange(CancellationToken token);
-
-	/// <summary>
-	///  Получить список объектов с прореживанием, удовлетворяющий диапазону дат
-	/// </summary>
-	/// <param name="dateBegin"></param>
-	/// <param name="intervalSec"></param>
-	/// <param name="approxPointsCount"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<IEnumerable<TDto>> GetResampledData(DateTimeOffset dateBegin, double intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default);
-}

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

@@ -1,82 +0,0 @@
-using DD.Persistence.Models;
-
-namespace DD.Persistence.Client.Clients.Interfaces;
-
-/// <summary>
-/// Клиент для работы с репозиторием для хранения разных наборов данных рядов.
-/// idDiscriminator - идентифицирует конкретный набор данных, прим.: циклы измерения АСИБР, или отчет о DrillTest.
-/// idDiscriminator формируют клиенты и только им известно что они обозначают.
-/// Так как данные приходят редко, то их прореживания для построения графиков не предусмотрено.
-/// </summary>
-public interface ITimestampedSetClient : IDisposable
-{
-	/// <summary>
-	/// Записать новые данные
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="sets"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token);
-
-	/// <summary>
-	/// Количество записей по указанному набору в БД. Для пагинации
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<int> Count(Guid idDiscriminator, CancellationToken token);
-
-	/// <summary>
-	/// Получение данных с фильтрацией. Значение фильтра null - отключен
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="geTimestamp"></param>
-	/// <param name="columnNames"></param>
-	/// <param name="skip"></param>
-	/// <param name="take"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<IEnumerable<TimestampedSetDto>> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
-
-    /// <summary>
-	/// Получение данных с фильтрацией. Значение фильтра null - отключен
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="geTimestamp"></param>
-	/// <param name="columnNames"></param>
-	/// <param name="skip"></param>
-	/// <param name="take"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-	Task<IEnumerable<T>> Get<T>(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
-
-
-    /// <summary>
-    /// Диапазон дат за которые есть данные
-    /// </summary>
-    /// <param name="idDiscriminator"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<DatesRangeDto?> GetDatesRange(Guid idDiscriminator, CancellationToken token);
-
-	/// <summary>
-	/// 
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="columnNames"></param>
-	/// <param name="take"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-    Task<IEnumerable<TimestampedSetDto>> GetLast(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token);
-
-    /// <summary>
-	/// 
-	/// </summary>
-	/// <param name="idDiscriminator"></param>
-	/// <param name="columnNames"></param>
-	/// <param name="take"></param>
-	/// <param name="token"></param>
-	/// <returns></returns>
-    Task<IEnumerable<T>> GetLast<T>(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token);
-}

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

@@ -0,0 +1,103 @@
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+
+namespace DD.Persistence.Client.Clients.Interfaces;
+
+/// <summary>
+/// Клиент для работы с наборами данных, имеющими отметку времени.
+/// discriminatorId - идентифицирует конкретный набор данных, прим.: циклы измерения АСИБР, или отчет о DrillTest.
+/// discriminatorId формируют клиенты и только им известно что они обозначают.
+/// </summary>
+public interface ITimestampedValuesClient : IDisposable
+{
+    /// <summary>
+    /// Записать новые данные
+    /// Предполагается что данные с одним дискриминатором имеют одинаковую структуру
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные с фильтрацией. Значение фильтра null - отключен
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin">Фильтр позднее даты</param>
+    /// <param name="columnNames">Фильтр свойств набора</param>
+    /// <param name="skip"></param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    Task<IEnumerable<TimestampedValuesDto>> Get(Guid discriminatorId, DateTimeOffset? timestampBegin, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные, начиная с заданной отметки времени
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin">Фильтр позднее даты</param>
+    /// <param name="token"></param>
+    Task<IEnumerable<TimestampedValuesDto>> GetGtDate(Guid discriminatorId, DateTimeOffset timestampBegin, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные с начала
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    Task<IEnumerable<TimestampedValuesDto>> GetFirst(Guid discriminatorId, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные с конца
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    Task<IEnumerable<TimestampedValuesDto>> GetLast(Guid discriminatorId, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные с прореживанием, удовлетворяющем диапазону дат
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="timestampBegin"></param>
+    /// <param name="intervalSec"></param>
+    /// <param name="approxPointsCount"></param>
+    /// <param name="token"></param>
+    Task<IEnumerable<TimestampedValuesDto>> GetResampledData(Guid discriminatorId, DateTimeOffset timestampBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default);
+
+    /// <summary>
+    /// Количество записей по указанному набору в БД. Для пагинации
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="token"></param>
+    Task<int> Count(Guid discriminatorId, CancellationToken token);
+
+    /// <summary>
+    /// Диапазон дат, в пределах которых осуществляется хранение данных
+    /// </summary>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="token"></param>
+    Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token);
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="idDiscriminator"></param>
+    /// <param name="geTimestamp"></param>
+    /// <param name="columnNames"></param>
+    /// <param name="skip"></param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<T>> Get<T>(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
+    
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="idDiscriminator"></param>
+    /// <param name="take"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<IEnumerable<T>> GetLast<T>(Guid idDiscriminator, int take, CancellationToken token);
+}

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using Refit;
 
 namespace DD.Persistence.Client.Clients.Interfaces;

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 using Refit;
 

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

@@ -5,6 +5,10 @@ using System.Text;
 using System.Threading.Tasks;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
+
+/// <summary>
+/// Базовый Refit интерфейс
+/// </summary>
 public interface IRefitClient
 {
 }

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

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using Refit;
 using System.Text.Json;
 

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

@@ -1,6 +1,7 @@
 using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
 using Refit;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit
 {

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

@@ -1,21 +0,0 @@
-using DD.Persistence.Models;
-using Refit;
-
-namespace DD.Persistence.Client.Clients.Interfaces.Refit;
-public interface IRefitTimeSeriesClient<TDto> : IRefitClient, IDisposable
-    where TDto : class, ITimeSeriesAbstractDto
-{
-    private const string BaseRoute = "/api/dataSaub";
-
-    [Post($"{BaseRoute}")]
-    Task<IApiResponse<int>> AddRange(IEnumerable<TDto> dtos, CancellationToken token);
-
-    [Get($"{BaseRoute}")]
-    Task<IApiResponse<IEnumerable<TDto>>> Get(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token);
-
-    [Get($"{BaseRoute}/resampled")]
-    Task<IApiResponse<IEnumerable<TDto>>> GetResampledData(DateTimeOffset dateBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default);
-
-    [Get($"{BaseRoute}/datesRange")]
-    Task<IApiResponse<DatesRangeDto?>> GetDatesRange(CancellationToken token);
-}

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

@@ -1,24 +0,0 @@
-using DD.Persistence.Models;
-using Refit;
-
-namespace DD.Persistence.Client.Clients.Interfaces.Refit;
-
-public interface IRefitTimestampedSetClient : IRefitClient, IDisposable
-{
-    private const string baseUrl = "/api/TimestampedSet/{idDiscriminator}";
-
-    [Post(baseUrl)]
-    Task<IApiResponse<int>> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token);
-
-    [Get(baseUrl)]
-    Task<IApiResponse<IEnumerable<TimestampedSetDto>>> Get(Guid idDiscriminator, [Query] DateTimeOffset? geTimestamp, [Query] IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
-
-    [Get($"{baseUrl}/last")]
-    Task<IApiResponse<IEnumerable<TimestampedSetDto>>> GetLast(Guid idDiscriminator, [Query] IEnumerable<string>? columnNames, int take, CancellationToken token);
-
-    [Get($"{baseUrl}/count")]
-    Task<IApiResponse<int>> Count(Guid idDiscriminator, CancellationToken token);
-
-    [Get($"{baseUrl}/datesRange")]
-    Task<IApiResponse<DatesRangeDto?>> GetDatesRange(Guid idDiscriminator, CancellationToken token);
-}

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

@@ -0,0 +1,61 @@
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+using Refit;
+
+namespace DD.Persistence.Client.Clients.Interfaces.Refit;
+
+/// <summary>
+/// Refit интерфейс для TimestampedValuesController
+/// </summary>
+public interface IRefitTimestampedValuesClient : IRefitClient, IDisposable
+{
+    private const string baseUrl = "/api/TimestampedValues/{discriminatorId}";
+
+    /// <summary>
+    /// Записать новые данные
+    /// </summary>
+    [Post(baseUrl)]
+    Task<IApiResponse<int>> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token);
+
+    /// <summary>
+    /// Получение данных с фильтрацией
+    /// </summary>
+    [Get(baseUrl)]
+    Task<IApiResponse<IEnumerable<TimestampedValuesDto>>> Get(Guid discriminatorId, DateTimeOffset? timestampBegin, [Query(CollectionFormat.Multi)] IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные, начиная с заданной отметки времени
+    /// </summary>
+    [Get($"{baseUrl}/gtdate")]
+    Task<IApiResponse<IEnumerable<TimestampedValuesDto>>> GetGtDate(Guid discriminatorId, DateTimeOffset timestampBegin, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные c начала
+    /// </summary>
+    [Get($"{baseUrl}/first")]
+    Task<IApiResponse<IEnumerable<TimestampedValuesDto>>> GetFirst(Guid discriminatorId, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить данные c конца
+    /// </summary>
+    [Get($"{baseUrl}/last")]
+    Task<IApiResponse<IEnumerable<TimestampedValuesDto>>> GetLast(Guid discriminatorId, int take, CancellationToken token);
+
+    /// <summary>
+    /// Получить список объектов с прореживанием, удовлетворяющий диапазону временных отметок
+    /// </summary>
+    [Get($"{baseUrl}/resampled")]
+    Task<IApiResponse<IEnumerable<TimestampedValuesDto>>> GetResampledData(Guid discriminatorId, DateTimeOffset timestampBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default);
+
+    /// <summary>
+    /// Получить количество записей по указанному набору в БД. Для пагинации
+    /// </summary>
+    [Get($"{baseUrl}/count")]
+    Task<IApiResponse<int>> Count(Guid discriminatorId, CancellationToken token);
+
+    /// <summary>
+    /// Получить диапазон дат, в пределах которых хранятся даные
+    /// </summary>
+    [Get($"{baseUrl}/datesRange")]
+    Task<IApiResponse<DatesRangeDto?>> GetDatesRange(Guid discriminatorId, CancellationToken token);
+}

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

@@ -1,5 +1,6 @@
 using DD.Persistence.Models;
 using Refit;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients.Interfaces.Refit;
 public interface IRefitWitsDataClient : IRefitClient, IDisposable

DD.Persistence.Client/Clients/SetpointClient.cs

@@ -1,4 +1,4 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using DD.Persistence.Client.Clients.Base;
 using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Client.Clients.Interfaces.Refit;
@@ -6,6 +6,7 @@ using DD.Persistence.Models;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Globalization;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients;
 

DD.Persistence.Client/Clients/TechMessagesClient.cs

@@ -4,6 +4,7 @@ using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients;
 

DD.Persistence.Client/Clients/TimeSeriesClient.cs

@@ -1,55 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DD.Persistence.Client.Clients.Base;
-using DD.Persistence.Client.Clients.Interfaces;
-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, ITimeSeriesAbstractDto
-{
-	private readonly IRefitTimeSeriesClient<TDto> timeSeriesClient;
-
-	public TimeSeriesClient(IRefitClientFactory<IRefitTimeSeriesClient<TDto>> refitTechMessagesClientFactory, ILogger<TimeSeriesClient<TDto>> logger) : base(logger)
-	{
-		this.timeSeriesClient = refitTechMessagesClientFactory.Create();
-	}
-
-	public async Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token)
-	{
-		var result = await ExecutePostResponse(
-			async () => await timeSeriesClient.AddRange(dtos, token), token);
-
-		return result;
-	}
-
-	public async Task<IEnumerable<TDto>> Get(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await timeSeriesClient.Get(dateBegin, dateEnd, token), token);
-
-		return result!;
-	}
-
-	public async Task<IEnumerable<TDto>> GetResampledData(DateTimeOffset dateBegin, double intervalSec = 600d, int approxPointsCount = 1024, CancellationToken token = default)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await timeSeriesClient.GetResampledData(dateBegin, intervalSec, approxPointsCount, token), token);
-
-		return result!;
-	}
-
-	public async Task<DatesRangeDto?> GetDatesRange(CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await timeSeriesClient.GetDatesRange(token), token);
-
-		return result;
-	}
-
-	public void Dispose()
-	{
-		timeSeriesClient.Dispose();
-
-        GC.SuppressFinalize(this);
-    }
-}

DD.Persistence.Client/Clients/TimestampedSetClient.cs

@@ -1,92 +0,0 @@
-using Microsoft.Extensions.Logging;
-using DD.Persistence.Client.Clients.Base;
-using DD.Persistence.Client.Clients.Interfaces;
-using DD.Persistence.Client.Clients.Interfaces.Refit;
-using DD.Persistence.Models;
-using static System.Runtime.InteropServices.JavaScript.JSType;
-using System.Runtime.CompilerServices;
-using System.Text.Json;
-using System.Reflection;
-using System.Collections.Concurrent;
-
-namespace DD.Persistence.Client.Clients;
-public class TimestampedSetClient : BaseClient, ITimestampedSetClient
-{
-	private readonly IRefitTimestampedSetClient refitTimestampedSetClient;
-    private readonly ConcurrentDictionary<Guid, TimestampedSetMapperBase> mapperCache = new();
-    public TimestampedSetClient(IRefitClientFactory<IRefitTimestampedSetClient> refitTimestampedSetClientFactory, ILogger<TimestampedSetClient> logger) : base(logger)
-	{
-		this.refitTimestampedSetClient = refitTimestampedSetClientFactory.Create();
-	}
-
-	public async Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token)
-	{
-		var result = await ExecutePostResponse(
-			async () => await refitTimestampedSetClient.AddRange(idDiscriminator, sets, token), token);
-
-		return result;
-	}
-
-	public async Task<IEnumerable<TimestampedSetDto>> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await refitTimestampedSetClient.Get(idDiscriminator, geTimestamp, columnNames, skip, take, token), token);
-
-		return result!;
-	}
-
-	public async Task<IEnumerable<TimestampedSetDto>> GetLast(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await refitTimestampedSetClient.GetLast(idDiscriminator, columnNames, take, token), token);
-
-		return result!;
-	}
-
-	public async Task<int> Count(Guid idDiscriminator, CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await refitTimestampedSetClient.Count(idDiscriminator, token), token);
-
-		return result;
-	}
-
-	public async Task<DatesRangeDto?> GetDatesRange(Guid idDiscriminator, CancellationToken token)
-	{
-		var result = await ExecuteGetResponse(
-			async () => await refitTimestampedSetClient.GetDatesRange(idDiscriminator, token), token);
-
-		return result;
-	}
-
-    public async Task<IEnumerable<T>> Get<T>(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
-    {
-        var data = await Get(idDiscriminator, geTimestamp, columnNames, skip, take, token);
-        var mapper = GetMapper<T>(idDiscriminator);
-
-        return data.Select(mapper.DeserializeTimeStampedData);
-    }
-
-    
-
-    public async Task<IEnumerable<T>> GetLast<T>(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token)
-    {
-        var data = await GetLast(idDiscriminator, columnNames, take, token);
-        var mapper = GetMapper<T>(idDiscriminator);
-
-        return data.Select(mapper.DeserializeTimeStampedData);
-    }
-
-    private TimestampedSetMapper<T> GetMapper<T>(Guid idDiscriminator)
-    {
-        return (TimestampedSetMapper<T>)mapperCache.GetOrAdd(idDiscriminator, name => new TimestampedSetMapper<T>(idDiscriminator));
-    }
-    public void Dispose()
-	{
-		refitTimestampedSetClient.Dispose();
-
-        GC.SuppressFinalize(this);
-    }
-
-    
-}

DD.Persistence.Client/Clients/TimestampedValuesClient.cs

@@ -0,0 +1,127 @@
+using DD.Persistence.Client.Clients.Base;
+using DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+using Microsoft.Extensions.Logging;
+using System.Collections.Concurrent;
+
+namespace DD.Persistence.Client.Clients;
+
+/// <inheritdoc/>
+public class TimestampedValuesClient : BaseClient, ITimestampedValuesClient
+{
+	private readonly IRefitTimestampedValuesClient refitTimestampedSetClient;
+
+    /// <inheritdoc/>
+	public TimestampedValuesClient(IRefitClientFactory<IRefitTimestampedValuesClient> refitTimestampedSetClientFactory, ILogger<TimestampedValuesClient> logger) : base(logger)
+	{
+		this.refitTimestampedSetClient = refitTimestampedSetClientFactory.Create();
+	}
+
+    /// <inheritdoc/>
+    private readonly ConcurrentDictionary<Guid, TimestampedSetMapperBase> mapperCache = new();
+
+    /// <inheritdoc/>
+	public async Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> sets, CancellationToken token)
+	{
+		var result = await ExecutePostResponse(
+			async () => await refitTimestampedSetClient.AddRange(discriminatorId, sets, token), token);
+
+		return result;
+	}
+
+    /// <inheritdoc/>
+	public async Task<IEnumerable<TimestampedValuesDto>> Get(Guid discriminatorId, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
+	{
+		var result = await ExecuteGetResponse(
+			async () => await refitTimestampedSetClient.Get(discriminatorId, geTimestamp, columnNames, skip, take, token), token);
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TimestampedValuesDto>> GetGtDate(Guid discriminatorId, DateTimeOffset timestampBegin, CancellationToken token)
+    {
+        var result = await ExecuteGetResponse(
+            async () => await refitTimestampedSetClient.GetGtDate(discriminatorId, timestampBegin, token), token);
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TimestampedValuesDto>> GetFirst(Guid discriminatorId, int take, CancellationToken token)
+    {
+        var result = await ExecuteGetResponse(
+            async () => await refitTimestampedSetClient.GetFirst(discriminatorId, take, token), token);
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TimestampedValuesDto>> GetLast(Guid discriminatorId, int take, CancellationToken token)
+	{
+		var result = await ExecuteGetResponse(
+			async () => await refitTimestampedSetClient.GetLast(discriminatorId, take, token), token);
+
+        return result;
+	}
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<TimestampedValuesDto>> GetResampledData(Guid discriminatorId, DateTimeOffset dateBegin, double intervalSec = 600, int approxPointsCount = 1024, CancellationToken token = default)
+    {
+        var result = await ExecuteGetResponse(
+            async () => await refitTimestampedSetClient.GetResampledData(discriminatorId, dateBegin, intervalSec, approxPointsCount, token), token);
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<int> Count(Guid discriminatorId, CancellationToken token)
+    {
+        var result = await ExecuteGetResponse(
+            async () => await refitTimestampedSetClient.Count(discriminatorId, token), token);
+
+        return result;
+    }
+
+    /// <inheritdoc/>
+    public async Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token)
+	{
+		var result = await ExecuteGetResponse(
+			async () => await refitTimestampedSetClient.GetDatesRange(discriminatorId, token), token);
+
+		return result;
+	}
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<T>> Get<T>(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
+    {
+        var data = await Get(idDiscriminator, geTimestamp, columnNames, skip, take, token);
+        var mapper = GetMapper<T>(idDiscriminator);
+
+        return data.Select(mapper.DeserializeTimeStampedData);
+    }
+
+    /// <inheritdoc/>
+    public async Task<IEnumerable<T>> GetLast<T>(Guid idDiscriminator, int take, CancellationToken token)
+    {
+        var data = await GetLast(idDiscriminator, take, token);
+        var mapper = GetMapper<T>(idDiscriminator);
+
+        return data.Select(mapper.DeserializeTimeStampedData);
+    }
+
+    /// <inheritdoc/>
+    private TimestampedSetMapper<T> GetMapper<T>(Guid idDiscriminator)
+    {
+        return (TimestampedSetMapper<T>)mapperCache.GetOrAdd(idDiscriminator, name => new TimestampedSetMapper<T>(idDiscriminator));
+    }
+
+    /// <inheritdoc/>
+    public void Dispose()
+	{
+		refitTimestampedSetClient.Dispose();
+
+        GC.SuppressFinalize(this);
+    }
+}

DD.Persistence.Client/Clients/WitsDataClient.cs

@@ -3,6 +3,7 @@ using DD.Persistence.Client.Clients.Base;
 using DD.Persistence.Client.Clients.Interfaces;
 using DD.Persistence.Client.Clients.Interfaces.Refit;
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Client.Clients;
 public class WitsDataClient : BaseClient, IWitsDataClient

DD.Persistence.Client/DependencyInjection.cs

@@ -22,8 +22,7 @@ public static class DependencyInjection
         services.AddTransient<IDataSourceSystemClient, DataSourceSystemClient>();
         services.AddTransient<ISetpointClient, SetpointClient>();
         services.AddTransient<ITechMessagesClient, TechMessagesClient>();
-        services.AddTransient<ITimeSeriesClient<DataSaubDto>, TimeSeriesClient<DataSaubDto>>();
+        services.AddTransient<ITimestampedValuesClient, TimestampedValuesClient>();
-        services.AddTransient<ITimestampedSetClient, TimestampedSetClient>();
         services.AddTransient<IWitsDataClient, WitsDataClient>();
 
         services.AddSingleton<ISetpointConfigStorage, SetpointConfigStorage>(provider =>

DD.Persistence.Client/Readme.md

@@ -11,8 +11,7 @@ Persistence сервисом посредством обращения к кон
 ## Список предоставляемых клиентов
 - `ISetpointClient` - Клиент для работы с уставками
 - `ITechMessagesClient` - Клиент для работы с технологическими сообщениями 
-- `ITimeSeriesClient` - Клиент для работы с временными данными 
+- `ITimestampedValuesClient` - Клиент для работы с наборами данных, имеющими отметку времени
-- `ITimestampedSetClient` - Клиент для работы с данными с отметкой времени 
 - `IChangeLogClient` - Клиент для работы с записями ChangeLog
 - `IWitsDataClient` - Клиент для работы с параметрами Wits
 - `IDataSourceSystemClient` - Клиент для работы с системами

DD.Persistence.Client/TimestampedSetMapper.cs

@@ -8,7 +8,7 @@ namespace DD.Persistence.Client;
 
 internal abstract class TimestampedSetMapperBase
 {
-    public abstract object Map(TimestampedSetDto data);
+    public abstract object Map(TimestampedValuesDto data);
 
 }
 internal class TimestampedSetMapper<T> : TimestampedSetMapperBase
@@ -22,12 +22,12 @@ internal class TimestampedSetMapper<T> : TimestampedSetMapperBase
         IdDiscriminator = idDiscriminator;
     }
 
-    public override object Map(TimestampedSetDto data)
+    public override object Map(TimestampedValuesDto data)
     {
         return DeserializeTimeStampedData(data)!;
     }
 
-    public T DeserializeTimeStampedData(TimestampedSetDto data)
+    public T DeserializeTimeStampedData(TimestampedValuesDto data)
     {
 
         if (entityType.IsValueType)
@@ -36,10 +36,10 @@ internal class TimestampedSetMapper<T> : TimestampedSetMapperBase
             return MapClass(data);
     }
 
-    private T MapClass(TimestampedSetDto data)
+    private T MapClass(TimestampedValuesDto data)
     {
         var entity = (T)RuntimeHelpers.GetUninitializedObject(typeof(T));
-        foreach (var (propertyName, value) in data.Set)
+        foreach (var (propertyName, value) in data.Values)
         {
             if (value is JsonElement jsonElement)
                 SetPropertyValueFromJson(ref entity, propertyName, jsonElement);
@@ -48,11 +48,11 @@ internal class TimestampedSetMapper<T> : TimestampedSetMapperBase
         return entity;
     }
 
-    private T MapStruct(TimestampedSetDto data)
+    private T MapStruct(TimestampedValuesDto data)
     {
         var entity = Activator.CreateInstance<T>();
         object boxedEntity = entity!;
-        foreach (var (propertyName, value) in data.Set)
+        foreach (var (propertyName, value) in data.Values)
         {
             if (value is JsonElement jsonElement)
                 SetPropertyValueForStructFromJson(ref boxedEntity, propertyName, jsonElement);

DD.Persistence.Database.Postgres/Migrations/20250122111321_Init.Designer.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Text.Json;
 using DD.Persistence.Database.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -12,7 +13,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace DD.Persistence.Database.Postgres.Migrations
 {
     [DbContext(typeof(PersistencePostgresContext))]
-    [Migration("20241220062251_Init")]
+    [Migration("20250122111321_Init")]
     partial class Init
     {
         /// <inheritdoc />
@@ -20,11 +21,28 @@ namespace DD.Persistence.Database.Postgres.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("ProductVersion", "9.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("DD.Persistence.Database.Entity.DataScheme", b =>
+                {
+                    b.Property<Guid>("DiscriminatorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasComment("Идентификатор схемы данных");
+
+                    b.Property<string>("PropNames")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasComment("Наименования полей в порядке индексации");
+
+                    b.HasKey("DiscriminatorId");
+
+                    b.ToTable("DataSchemes");
+                });
+
             modelBuilder.Entity("DD.Persistence.Database.Entity.DataSourceSystem", b =>
                 {
                     b.Property<Guid>("SystemId")
@@ -105,27 +123,24 @@ namespace DD.Persistence.Database.Postgres.Migrations
                     b.ToTable("TechMessage");
                 });
 
-            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedSet", b =>
+            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedValues", b =>
                 {
-                    b.Property<Guid>("IdDiscriminator")
+                    b.Property<Guid>("DiscriminatorId")
                         .HasColumnType("uuid")
-                        .HasComment("Дискриминатор ссылка на тип сохраняемых данных");
+                        .HasComment("Дискриминатор системы");
 
                     b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("timestamp with time zone")
-                        .HasComment("Отметка времени, строго в UTC");
+                        .HasComment("Временная отметка");
 
-                    b.Property<string>("Set")
+                    b.Property<string>("Values")
                         .IsRequired()
                         .HasColumnType("jsonb")
-                        .HasComment("Набор сохраняемых данных");
+                        .HasComment("Данные");
 
-                    b.HasKey("IdDiscriminator", "Timestamp");
+                    b.HasKey("DiscriminatorId", "Timestamp");
 
-                    b.ToTable("TimestampedSets", t =>
+                    b.ToTable("TimestampedValues");
-                        {
-                            t.HasComment("Общая таблица данных временных рядов");
-                        });
                 });
 
             modelBuilder.Entity("DD.Persistence.Database.Model.ChangeLog", b =>
@@ -181,96 +196,13 @@ namespace DD.Persistence.Database.Postgres.Migrations
                     b.ToTable("ChangeLog");
                 });
 
-            modelBuilder.Entity("DD.Persistence.Database.Model.DataSaub", b =>
-                {
-                    b.Property<DateTimeOffset>("Date")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date");
-
-                    b.Property<double?>("AxialLoad")
-                        .HasColumnType("double precision")
-                        .HasColumnName("axialLoad");
-
-                    b.Property<double?>("BitDepth")
-                        .HasColumnType("double precision")
-                        .HasColumnName("bitDepth");
-
-                    b.Property<double?>("BlockPosition")
-                        .HasColumnType("double precision")
-                        .HasColumnName("blockPosition");
-
-                    b.Property<double?>("BlockSpeed")
-                        .HasColumnType("double precision")
-                        .HasColumnName("blockSpeed");
-
-                    b.Property<double?>("Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("flow");
-
-                    b.Property<double?>("HookWeight")
-                        .HasColumnType("double precision")
-                        .HasColumnName("hookWeight");
-
-                    b.Property<int>("IdFeedRegulator")
-                        .HasColumnType("integer")
-                        .HasColumnName("idFeedRegulator");
-
-                    b.Property<int?>("Mode")
-                        .HasColumnType("integer")
-                        .HasColumnName("mode");
-
-                    b.Property<double?>("Mse")
-                        .HasColumnType("double precision")
-                        .HasColumnName("mse");
-
-                    b.Property<short>("MseState")
-                        .HasColumnType("smallint")
-                        .HasColumnName("mseState");
-
-                    b.Property<double?>("Pressure")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pressure");
-
-                    b.Property<double?>("Pump0Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump0Flow");
-
-                    b.Property<double?>("Pump1Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump1Flow");
-
-                    b.Property<double?>("Pump2Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump2Flow");
-
-                    b.Property<double?>("RotorSpeed")
-                        .HasColumnType("double precision")
-                        .HasColumnName("rotorSpeed");
-
-                    b.Property<double?>("RotorTorque")
-                        .HasColumnType("double precision")
-                        .HasColumnName("rotorTorque");
-
-                    b.Property<string>("User")
-                        .HasColumnType("text")
-                        .HasColumnName("user");
-
-                    b.Property<double?>("WellDepth")
-                        .HasColumnType("double precision")
-                        .HasColumnName("wellDepth");
-
-                    b.HasKey("Date");
-
-                    b.ToTable("DataSaub");
-                });
-
             modelBuilder.Entity("DD.Persistence.Database.Model.Setpoint", b =>
                 {
                     b.Property<Guid>("Key")
                         .HasColumnType("uuid")
                         .HasComment("Ключ");
 
-                    b.Property<DateTimeOffset>("Created")
+                    b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("timestamp with time zone")
                         .HasComment("Дата создания уставки");
 
@@ -278,12 +210,11 @@ namespace DD.Persistence.Database.Postgres.Migrations
                         .HasColumnType("uuid")
                         .HasComment("Id автора последнего изменения");
 
-                    b.Property<object>("Value")
+                    b.Property<JsonElement>("Value")
-                        .IsRequired()
                         .HasColumnType("jsonb")
                         .HasComment("Значение уставки");
 
-                    b.HasKey("Key", "Created");
+                    b.HasKey("Key", "Timestamp");
 
                     b.ToTable("Setpoint");
                 });
@@ -298,6 +229,17 @@ namespace DD.Persistence.Database.Postgres.Migrations
 
                     b.Navigation("System");
                 });
+
+            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedValues", b =>
+                {
+                    b.HasOne("DD.Persistence.Database.Entity.DataScheme", "DataScheme")
+                        .WithMany()
+                        .HasForeignKey("DiscriminatorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DataScheme");
+                });
 #pragma warning restore 612, 618
         }
     }

DD.Persistence.Database.Postgres/Migrations/20250122111321_Init.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
@@ -33,32 +34,15 @@ namespace DD.Persistence.Database.Postgres.Migrations
                 });
 
             migrationBuilder.CreateTable(
-                name: "DataSaub",
+                name: "DataSchemes",
                 columns: table => new
                 {
-                    date = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
+                    DiscriminatorId = table.Column<Guid>(type: "uuid", nullable: false, comment: "Идентификатор схемы данных"),
-                    mode = table.Column<int>(type: "integer", nullable: true),
+                    PropNames = table.Column<string>(type: "jsonb", nullable: false, comment: "Наименования полей в порядке индексации")
-                    user = table.Column<string>(type: "text", nullable: true),
-                    wellDepth = table.Column<double>(type: "double precision", nullable: true),
-                    bitDepth = table.Column<double>(type: "double precision", nullable: true),
-                    blockPosition = table.Column<double>(type: "double precision", nullable: true),
-                    blockSpeed = table.Column<double>(type: "double precision", nullable: true),
-                    pressure = table.Column<double>(type: "double precision", nullable: true),
-                    axialLoad = table.Column<double>(type: "double precision", nullable: true),
-                    hookWeight = table.Column<double>(type: "double precision", nullable: true),
-                    rotorTorque = table.Column<double>(type: "double precision", nullable: true),
-                    rotorSpeed = table.Column<double>(type: "double precision", nullable: true),
-                    flow = table.Column<double>(type: "double precision", nullable: true),
-                    mseState = table.Column<short>(type: "smallint", nullable: false),
-                    idFeedRegulator = table.Column<int>(type: "integer", nullable: false),
-                    mse = table.Column<double>(type: "double precision", nullable: true),
-                    pump0Flow = table.Column<double>(type: "double precision", nullable: true),
-                    pump1Flow = table.Column<double>(type: "double precision", nullable: true),
-                    pump2Flow = table.Column<double>(type: "double precision", nullable: true)
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_DataSaub", x => x.date);
+                    table.PrimaryKey("PK_DataSchemes", x => x.DiscriminatorId);
                 });
 
             migrationBuilder.CreateTable(
@@ -93,28 +77,33 @@ namespace DD.Persistence.Database.Postgres.Migrations
                 columns: table => new
                 {
                     Key = table.Column<Guid>(type: "uuid", nullable: false, comment: "Ключ"),
-                    Created = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Дата создания уставки"),
+                    Timestamp = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Дата создания уставки"),
-                    Value = table.Column<object>(type: "jsonb", nullable: false, comment: "Значение уставки"),
+                    Value = table.Column<JsonElement>(type: "jsonb", nullable: false, comment: "Значение уставки"),
                     IdUser = table.Column<Guid>(type: "uuid", nullable: false, comment: "Id автора последнего изменения")
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_Setpoint", x => new { x.Key, x.Created });
+                    table.PrimaryKey("PK_Setpoint", x => new { x.Key, x.Timestamp });
                 });
 
             migrationBuilder.CreateTable(
-                name: "TimestampedSets",
+                name: "TimestampedValues",
                 columns: table => new
                 {
-                    IdDiscriminator = table.Column<Guid>(type: "uuid", nullable: false, comment: "Дискриминатор ссылка на тип сохраняемых данных"),
+                    Timestamp = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Временная отметка"),
-                    Timestamp = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false, comment: "Отметка времени, строго в UTC"),
+                    DiscriminatorId = table.Column<Guid>(type: "uuid", nullable: false, comment: "Дискриминатор системы"),
-                    Set = table.Column<string>(type: "jsonb", nullable: false, comment: "Набор сохраняемых данных")
+                    Values = table.Column<string>(type: "jsonb", nullable: false, comment: "Данные")
                 },
                 constraints: table =>
                 {
-                    table.PrimaryKey("PK_TimestampedSets", x => new { x.IdDiscriminator, x.Timestamp });
+                    table.PrimaryKey("PK_TimestampedValues", x => new { x.DiscriminatorId, x.Timestamp });
-                },
+                    table.ForeignKey(
-                comment: "Общая таблица данных временных рядов");
+                        name: "FK_TimestampedValues_DataSchemes_DiscriminatorId",
+                        column: x => x.DiscriminatorId,
+                        principalTable: "DataSchemes",
+                        principalColumn: "DiscriminatorId",
+                        onDelete: ReferentialAction.Cascade);
+                });
 
             migrationBuilder.CreateTable(
                 name: "TechMessage",
@@ -150,9 +139,6 @@ namespace DD.Persistence.Database.Postgres.Migrations
             migrationBuilder.DropTable(
                 name: "ChangeLog");
 
-            migrationBuilder.DropTable(
-                name: "DataSaub");
-
             migrationBuilder.DropTable(
                 name: "ParameterData");
 
@@ -163,10 +149,13 @@ namespace DD.Persistence.Database.Postgres.Migrations
                 name: "TechMessage");
 
             migrationBuilder.DropTable(
-                name: "TimestampedSets");
+                name: "TimestampedValues");
 
             migrationBuilder.DropTable(
                 name: "DataSourceSystem");
+
+            migrationBuilder.DropTable(
+                name: "DataSchemes");
         }
     }
 }

DD.Persistence.Database.Postgres/Migrations/PersistencePostgresContextModelSnapshot.cs

@@ -1,5 +1,6 @@
 // <auto-generated />
 using System;
+using System.Text.Json;
 using DD.Persistence.Database.Model;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
@@ -17,11 +18,28 @@ namespace DD.Persistence.Database.Postgres.Migrations
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.10")
+                .HasAnnotation("ProductVersion", "9.0.0")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
 
+            modelBuilder.Entity("DD.Persistence.Database.Entity.DataScheme", b =>
+                {
+                    b.Property<Guid>("DiscriminatorId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uuid")
+                        .HasComment("Идентификатор схемы данных");
+
+                    b.Property<string>("PropNames")
+                        .IsRequired()
+                        .HasColumnType("jsonb")
+                        .HasComment("Наименования полей в порядке индексации");
+
+                    b.HasKey("DiscriminatorId");
+
+                    b.ToTable("DataSchemes");
+                });
+
             modelBuilder.Entity("DD.Persistence.Database.Entity.DataSourceSystem", b =>
                 {
                     b.Property<Guid>("SystemId")
@@ -102,27 +120,24 @@ namespace DD.Persistence.Database.Postgres.Migrations
                     b.ToTable("TechMessage");
                 });
 
-            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedSet", b =>
+            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedValues", b =>
                 {
-                    b.Property<Guid>("IdDiscriminator")
+                    b.Property<Guid>("DiscriminatorId")
                         .HasColumnType("uuid")
-                        .HasComment("Дискриминатор ссылка на тип сохраняемых данных");
+                        .HasComment("Дискриминатор системы");
 
                     b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("timestamp with time zone")
-                        .HasComment("Отметка времени, строго в UTC");
+                        .HasComment("Временная отметка");
 
-                    b.Property<string>("Set")
+                    b.Property<string>("Values")
                         .IsRequired()
                         .HasColumnType("jsonb")
-                        .HasComment("Набор сохраняемых данных");
+                        .HasComment("Данные");
 
-                    b.HasKey("IdDiscriminator", "Timestamp");
+                    b.HasKey("DiscriminatorId", "Timestamp");
 
-                    b.ToTable("TimestampedSets", t =>
+                    b.ToTable("TimestampedValues");
-                        {
-                            t.HasComment("Общая таблица данных временных рядов");
-                        });
                 });
 
             modelBuilder.Entity("DD.Persistence.Database.Model.ChangeLog", b =>
@@ -178,96 +193,13 @@ namespace DD.Persistence.Database.Postgres.Migrations
                     b.ToTable("ChangeLog");
                 });
 
-            modelBuilder.Entity("DD.Persistence.Database.Model.DataSaub", b =>
-                {
-                    b.Property<DateTimeOffset>("Date")
-                        .HasColumnType("timestamp with time zone")
-                        .HasColumnName("date");
-
-                    b.Property<double?>("AxialLoad")
-                        .HasColumnType("double precision")
-                        .HasColumnName("axialLoad");
-
-                    b.Property<double?>("BitDepth")
-                        .HasColumnType("double precision")
-                        .HasColumnName("bitDepth");
-
-                    b.Property<double?>("BlockPosition")
-                        .HasColumnType("double precision")
-                        .HasColumnName("blockPosition");
-
-                    b.Property<double?>("BlockSpeed")
-                        .HasColumnType("double precision")
-                        .HasColumnName("blockSpeed");
-
-                    b.Property<double?>("Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("flow");
-
-                    b.Property<double?>("HookWeight")
-                        .HasColumnType("double precision")
-                        .HasColumnName("hookWeight");
-
-                    b.Property<int>("IdFeedRegulator")
-                        .HasColumnType("integer")
-                        .HasColumnName("idFeedRegulator");
-
-                    b.Property<int?>("Mode")
-                        .HasColumnType("integer")
-                        .HasColumnName("mode");
-
-                    b.Property<double?>("Mse")
-                        .HasColumnType("double precision")
-                        .HasColumnName("mse");
-
-                    b.Property<short>("MseState")
-                        .HasColumnType("smallint")
-                        .HasColumnName("mseState");
-
-                    b.Property<double?>("Pressure")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pressure");
-
-                    b.Property<double?>("Pump0Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump0Flow");
-
-                    b.Property<double?>("Pump1Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump1Flow");
-
-                    b.Property<double?>("Pump2Flow")
-                        .HasColumnType("double precision")
-                        .HasColumnName("pump2Flow");
-
-                    b.Property<double?>("RotorSpeed")
-                        .HasColumnType("double precision")
-                        .HasColumnName("rotorSpeed");
-
-                    b.Property<double?>("RotorTorque")
-                        .HasColumnType("double precision")
-                        .HasColumnName("rotorTorque");
-
-                    b.Property<string>("User")
-                        .HasColumnType("text")
-                        .HasColumnName("user");
-
-                    b.Property<double?>("WellDepth")
-                        .HasColumnType("double precision")
-                        .HasColumnName("wellDepth");
-
-                    b.HasKey("Date");
-
-                    b.ToTable("DataSaub");
-                });
-
             modelBuilder.Entity("DD.Persistence.Database.Model.Setpoint", b =>
                 {
                     b.Property<Guid>("Key")
                         .HasColumnType("uuid")
                         .HasComment("Ключ");
 
-                    b.Property<DateTimeOffset>("Created")
+                    b.Property<DateTimeOffset>("Timestamp")
                         .HasColumnType("timestamp with time zone")
                         .HasComment("Дата создания уставки");
 
@@ -275,12 +207,11 @@ namespace DD.Persistence.Database.Postgres.Migrations
                         .HasColumnType("uuid")
                         .HasComment("Id автора последнего изменения");
 
-                    b.Property<object>("Value")
+                    b.Property<JsonElement>("Value")
-                        .IsRequired()
                         .HasColumnType("jsonb")
                         .HasComment("Значение уставки");
 
-                    b.HasKey("Key", "Created");
+                    b.HasKey("Key", "Timestamp");
 
                     b.ToTable("Setpoint");
                 });
@@ -295,6 +226,17 @@ namespace DD.Persistence.Database.Postgres.Migrations
 
                     b.Navigation("System");
                 });
+
+            modelBuilder.Entity("DD.Persistence.Database.Entity.TimestampedValues", b =>
+                {
+                    b.HasOne("DD.Persistence.Database.Entity.DataScheme", "DataScheme")
+                        .WithMany()
+                        .HasForeignKey("DiscriminatorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("DataScheme");
+                });
 #pragma warning restore 612, 618
         }
     }

DD.Persistence.Database/Entity/ChangeLog.cs

@@ -1,8 +1,9 @@
 
 using Microsoft.EntityFrameworkCore;
-using DD.Persistence.Models;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using DD.Persistence.ModelsAbstractions;
+using DD.Persistence.Database.EntityAbstractions;
 
 namespace DD.Persistence.Database.Model;
 

DD.Persistence.Database/Entity/DataSaub.cs

@@ -1,63 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DD.Persistence.Database.Model;
-public class DataSaub : ITimestampedData
-{
-    [Key, Column("date")]
-    public DateTimeOffset Date { get; set; }
-
-    [Column("mode")]
-    public int? Mode { get; set; }
-
-    [Column("user")]
-    public string? User { get; set; }
-
-    [Column("wellDepth")]
-    public double? WellDepth { get; set; }
-
-    [Column("bitDepth")]
-    public double? BitDepth { get; set; }
-
-    [Column("blockPosition")]
-    public double? BlockPosition { get; set; }
-
-    [Column("blockSpeed")]
-    public double? BlockSpeed { get; set; }
-
-    [Column("pressure")]
-    public double? Pressure { get; set; }
-
-    [Column("axialLoad")]
-    public double? AxialLoad { get; set; }
-
-    [Column("hookWeight")]
-    public double? HookWeight { get; set; }
-
-    [Column("rotorTorque")]
-    public double? RotorTorque { get; set; }
-
-    [Column("rotorSpeed")]
-    public double? RotorSpeed { get; set; }
-
-    [Column("flow")]
-    public double? Flow { get; set; }
-
-    [Column("mseState")]
-    public short MseState { get; set; }
-
-    [Column("idFeedRegulator")]
-    public int IdFeedRegulator { get; set; }
-
-    [Column("mse")]
-    public double? Mse { get; set; }
-
-    [Column("pump0Flow")]
-    public double? Pump0Flow { get; set; }
-
-    [Column("pump1Flow")]
-    public double? Pump1Flow { get; set; }
-
-    [Column("pump2Flow")]
-    public double? Pump2Flow { get; set; }
-}

DD.Persistence.Database/Entity/DataScheme.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DD.Persistence.Database.Entity;
+
+public class DataScheme
+{
+    [Key, Comment("Идентификатор схемы данных"),]
+    public Guid DiscriminatorId { get; set; }
+
+    [Comment("Наименования полей в порядке индексации"), Column(TypeName = "jsonb")]
+    public string[] PropNames { get; set; } = [];
+}

DD.Persistence.Database/Entity/DataSourceSystem.cs

@@ -9,7 +9,7 @@ public class DataSourceSystem
 	public Guid SystemId { get; set; }
 
 	[Required, Column(TypeName = "varchar(256)"), Comment("Наименование системы - источника данных")]
-	public required string Name { get; set; }
+	public string Name { get; set; } = string.Empty;
 
 	[Comment("Описание системы - источника данных")]
 	public string? Description { get; set; }

DD.Persistence.Database/Entity/ITimestampedData.cs

@@ -1,8 +0,0 @@
-namespace DD.Persistence.Database.Model;
-public interface ITimestampedData
-{
-    /// <summary>
-    /// Дата (должна быть обязательно в UTC)
-    /// </summary>
-    DateTimeOffset Date { get; set; }
-}

DD.Persistence.Database/Entity/ParameterData.cs

@@ -1,11 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using DD.Persistence.Database.EntityAbstractions;
+using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DD.Persistence.Database.Entity;
 
 [PrimaryKey(nameof(DiscriminatorId), nameof(ParameterId), nameof(Timestamp))]
-public class ParameterData
+public class ParameterData : ITimestampedItem
 {
     [Required, Comment("Дискриминатор системы")]
     public Guid DiscriminatorId { get; set; }

DD.Persistence.Database/Entity/Setpoint.cs

@@ -1,11 +1,12 @@
-using Microsoft.EntityFrameworkCore;
+using DD.Persistence.Database.EntityAbstractions;
+using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json;
 
 namespace DD.Persistence.Database.Model
 {
-    [PrimaryKey(nameof(Key), nameof(Created))]
+    [PrimaryKey(nameof(Key), nameof(Timestamp))]
-    public class Setpoint
+    public class Setpoint : ITimestampedItem
     {
         [Comment("Ключ")]
         public Guid Key { get; set; }
@@ -14,7 +15,7 @@ namespace DD.Persistence.Database.Model
         public required JsonElement Value { get; set; }
 
         [Comment("Дата создания уставки")]
-        public DateTimeOffset Created { get; set; }
+        public DateTimeOffset Timestamp { get; set; }
 
         [Comment("Id автора последнего изменения")]
         public Guid IdUser { get; set; }

DD.Persistence.Database/Entity/TechMessage.cs

@@ -1,10 +1,11 @@
+using DD.Persistence.Database.EntityAbstractions;
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DD.Persistence.Database.Entity
 {
-    public class TechMessage
+    public class TechMessage : ITimestampedItem
     {
         [Key, Comment("Id события")]
         public Guid EventId { get; set; }

DD.Persistence.Database/Entity/TimestampedSet.cs

@@ -1,11 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DD.Persistence.Database.Entity;
-
-[Comment("Общая таблица данных временных рядов")]
-[PrimaryKey(nameof(IdDiscriminator), nameof(Timestamp))]
-public record TimestampedSet(
-    [property: Comment("Дискриминатор ссылка на тип сохраняемых данных")] Guid IdDiscriminator,
-    [property: Comment("Отметка времени, строго в UTC")] DateTimeOffset Timestamp,
-    [property: Column(TypeName = "jsonb"), Comment("Набор сохраняемых данных")] IDictionary<string, object> Set);

DD.Persistence.Database/Entity/TimestampedValues.cs

@@ -0,0 +1,22 @@
+using DD.Persistence.Database.EntityAbstractions;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DD.Persistence.Database.Entity;
+
+[PrimaryKey(nameof(DiscriminatorId), nameof(Timestamp))]
+public class TimestampedValues : ITimestampedItem
+{
+    [Comment("Временная отметка"), Key]
+    public DateTimeOffset Timestamp { get; set; }
+
+    [Comment("Дискриминатор системы"),]
+    public Guid DiscriminatorId { get; set; }
+
+    [Comment("Данные"), Column(TypeName = "jsonb")]
+    public required object[] Values { get; set; }
+
+    [Required, ForeignKey(nameof(DiscriminatorId)), Comment("Идентификаторы")]
+    public virtual DataScheme? DataScheme { get; set; }
+}

DD.Persistence.Database/EntityAbstractions/IChangeLog.cs

@@ -1,5 +1,4 @@
-
+namespace DD.Persistence.Database.EntityAbstractions;
-namespace DD.Persistence.Database.Model;
 
 /// <summary>
 /// Часть записи, описывающая изменение

DD.Persistence.Database/EntityAbstractions/ITimestampedItem.cs

@@ -0,0 +1,8 @@
+namespace DD.Persistence.Database.EntityAbstractions;
+public interface ITimestampedItem
+{
+    /// <summary>
+    /// Дата (должна быть обязательно в UTC)
+    /// </summary>
+    DateTimeOffset Timestamp { get; set; }
+}

DD.Persistence.Database/PersistenceDbContext.cs

@@ -9,11 +9,11 @@ namespace DD.Persistence.Database;
 /// </summary>
 public class PersistenceDbContext : DbContext
 {
-    public DbSet<DataSaub> DataSaub => Set<DataSaub>();
-
     public DbSet<Setpoint> Setpoint => Set<Setpoint>();
 
-    public DbSet<TimestampedSet> TimestampedSets => Set<TimestampedSet>();
+    public DbSet<DataScheme> DataSchemes => Set<DataScheme>();
+
+    public DbSet<TimestampedValues> TimestampedValues => Set<TimestampedValues>();
 
     public DbSet<ChangeLog> ChangeLog => Set<ChangeLog>();
 
@@ -31,8 +31,12 @@ public class PersistenceDbContext : DbContext
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
-        modelBuilder.Entity<TimestampedSet>()
+        modelBuilder.Entity<DataScheme>()
-            .Property(e => e.Set)
+            .Property(e => e.PropNames)
+            .HasJsonConversion();
+
+        modelBuilder.Entity<TimestampedValues>()
+            .Property(e => e.Values)
             .HasJsonConversion();
 
         modelBuilder.Entity<ChangeLog>()

DD.Persistence.IntegrationTests/Controllers/DataSaubControllerTest.cs

@@ -1,85 +0,0 @@
-using DD.Persistence.Database.Model;
-using DD.Persistence.Models;
-using Xunit;
-
-namespace DD.Persistence.IntegrationTests.Controllers;
-public class DataSaubControllerTest : TimeSeriesBaseControllerTest<DataSaub, DataSaubDto>
-{
-    private readonly DataSaubDto dto = new()
-    {
-        AxialLoad = 1,
-        BitDepth = 2,
-        BlockPosition = 3,
-        BlockSpeed = 4,
-        Date = DateTimeOffset.UtcNow,
-        Flow = 5,
-        HookWeight = 6,
-        IdFeedRegulator = 8,
-        Mode = 9,
-        Mse = 10,
-        MseState = 11,
-        Pressure = 12,
-        Pump0Flow = 13,
-        Pump1Flow = 14,
-        Pump2Flow = 15,
-        RotorSpeed = 16,
-        RotorTorque = 17,
-        User = string.Empty,
-        WellDepth = 18,
-    };
-
-    private readonly DataSaub entity = new()
-    {
-        AxialLoad = 1,
-        BitDepth = 2,
-        BlockPosition = 3,
-        BlockSpeed = 4,
-        Date = DateTimeOffset.UtcNow,
-        Flow = 5,
-        HookWeight = 6,
-        IdFeedRegulator = 8,
-        Mode = 9,
-        Mse = 10,
-        MseState = 11,
-        Pressure = 12,
-        Pump0Flow = 13,
-        Pump1Flow = 14,
-        Pump2Flow = 15,
-        RotorSpeed = 16,
-        RotorTorque = 17,
-        User = string.Empty,
-        WellDepth = 18,
-    };
-
-    public DataSaubControllerTest(WebAppFactoryFixture factory) : base(factory)
-    {
-    }
-
-    [Fact]
-    public async Task InsertRange_returns_success()
-    {
-        await InsertRangeSuccess(dto);
-    }
-
-    [Fact]
-    public async Task Get_returns_success()
-    {
-        var beginDate = DateTimeOffset.UtcNow.AddDays(-1);
-        var endDate = DateTimeOffset.UtcNow;
-        await GetSuccess(beginDate, endDate, entity);
-    }
-
-    [Fact]
-    public async Task GetDatesRange_returns_success()
-    {
-        await GetDatesRangeSuccess(entity);
-    }
-
-
-
-    [Fact]
-    public async Task GetResampledData_returns_success()
-    {
-        await GetResampledDataSuccess(entity);
-    }
-}

DD.Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs

@@ -1,13 +1,12 @@
-using Microsoft.Extensions.DependencyInjection;
 using DD.Persistence.Client;
-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 DD.Persistence.Client.Clients.Interfaces;
+using DD.Persistence.Client.Clients.Interfaces.Refit;
+using DD.Persistence.Database.Model;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.Text.Json;
+using Xunit;
 
 namespace DD.Persistence.IntegrationTests.Controllers
 {
@@ -15,12 +14,6 @@ namespace DD.Persistence.IntegrationTests.Controllers
     {
         private readonly ISetpointClient setpointClient;
         private readonly SetpointConfigStorage configStorage;
-
-        private class TestObject
-        {
-            public string? Value1 { get; set; }
-            public int? Value2 { get; set; }
-        }
         public SetpointControllerTest(WebAppFactoryFixture factory) : base(factory)
         {
             var refitClientFactory = scope.ServiceProvider
@@ -184,7 +177,7 @@ namespace DD.Persistence.IntegrationTests.Controllers
 
             await Add();
 
-            var dateBegin = DateTimeOffset.MinValue;
+            var dateBegin = DateTimeOffset.UtcNow.AddDays(-1);
             var take = 1;
             var part = await setpointClient.GetPart(dateBegin, take, CancellationToken.None);
 
@@ -195,14 +188,17 @@ namespace DD.Persistence.IntegrationTests.Controllers
             Assert.NotNull(response);
 
             var expectedValue = part!
-                .FirstOrDefault()!.Created
+                .FirstOrDefault()!.Timestamp
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .ToUniversalTime()
+                .ToString();
             var actualValueFrom = response.From
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .ToUniversalTime()
+                .ToString();
             Assert.Equal(expectedValue, actualValueFrom);
 
             var actualValueTo = response.To
-                .ToString("dd.MM.yyyy-HH:mm:ss");
+                .ToUniversalTime()
+                .ToString();
             Assert.Equal(expectedValue, actualValueTo);
         }
 
@@ -247,7 +243,7 @@ namespace DD.Persistence.IntegrationTests.Controllers
         {
             //arrange
             var setpointKey = Guid.NewGuid();
-            var setpointValue = new TestObject()
+            var setpointValue = new
             {
                 Value1 = "1",
                 Value2 = 2

DD.Persistence.IntegrationTests/Controllers/TechMessagesControllerTest.cs

@@ -15,7 +15,7 @@ namespace DD.Persistence.IntegrationTests.Controllers
 {
     public class TechMessagesControllerTest : BaseIntegrationTest
     {
-        private static readonly string SystemCacheKey = $"{typeof(Database.Entity.DataSourceSystem).FullName}CacheKey";
+        private static readonly string SystemCacheKey = $"{typeof(DataSourceSystem).FullName}CacheKey";
         private readonly ITechMessagesClient techMessagesClient;
         private readonly IMemoryCache memoryCache;
         public TechMessagesControllerTest(WebAppFactoryFixture factory) : base(factory)

DD.Persistence.IntegrationTests/Controllers/TimeSeriesBaseControllerTest.cs

@@ -1,122 +0,0 @@
-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 Microsoft.Extensions.Logging;
-using Xunit;
-
-namespace DD.Persistence.IntegrationTests.Controllers;
-
-public abstract class TimeSeriesBaseControllerTest<TEntity, TDto> : BaseIntegrationTest
-    where TEntity : class, ITimestampedData, new()
-    where TDto : class, ITimeSeriesAbstractDto, new()
-{
-    private readonly ITimeSeriesClient<TDto> timeSeriesClient;
-
-    public TimeSeriesBaseControllerTest(WebAppFactoryFixture factory) : base(factory)
-    {
-        dbContext.CleanupDbSet<TEntity>();
-
-        var refitClientFactory = scope.ServiceProvider
-            .GetRequiredService<IRefitClientFactory<IRefitTimeSeriesClient<TDto>>>();
-        var logger = scope.ServiceProvider.GetRequiredService<ILogger<TimeSeriesClient<TDto>>>();
-
-        timeSeriesClient = scope.ServiceProvider
-            .GetRequiredService<ITimeSeriesClient<TDto>>();
-    }
-
-    public async Task InsertRangeSuccess(TDto dto)
-    {
-        //arrange
-        var expected = dto.Adapt<TDto>();
-
-        //act
-        var response = await timeSeriesClient.AddRange(new TDto[] { expected }, new CancellationToken());
-
-        //assert
-        Assert.Equal(1, response);
-    }
-
-    public async Task GetSuccess(DateTimeOffset beginDate, DateTimeOffset endDate, TEntity entity)
-    {
-        //arrange
-        var dbset = dbContext.Set<TEntity>();
-
-        dbset.Add(entity);
-
-        dbContext.SaveChanges();
-
-        var response = await timeSeriesClient.Get(beginDate, endDate, new CancellationToken());
-
-        //assert
-        Assert.NotNull(response);
-        Assert.Single(response);
-    }
-
-    public async Task GetDatesRangeSuccess(TEntity entity)
-    {
-        //arrange
-        var datesRangeExpected = 30;
-
-        var entity2 = entity.Adapt<TEntity>();
-        entity2.Date = entity.Date.AddDays(datesRangeExpected);
-
-        var dbset = dbContext.Set<TEntity>();
-        dbset.Add(entity);
-        dbset.Add(entity2);
-
-        dbContext.SaveChanges();
-
-        var response = await timeSeriesClient.GetDatesRange(new CancellationToken());
-
-        //assert
-        Assert.NotNull(response);
-
-        var datesRangeActual = (response.To - response.From).Days;
-        Assert.Equal(datesRangeExpected, datesRangeActual);
-    }
-
-    public async Task GetResampledDataSuccess(TEntity entity)
-    {
-        //arrange
-        var approxPointsCount = 10;
-        var differenceBetweenStartAndEndDays = 50;
-
-        var entities = new List<TEntity>();
-        for (var i = 1; i <= differenceBetweenStartAndEndDays; i++)
-        {
-            var entity2 = entity.Adapt<TEntity>();
-            entity2.Date = entity.Date.AddDays(i - 1);
-
-            entities.Add(entity2);
-        }
-
-        var dbset = dbContext.Set<TEntity>();
-        dbset.AddRange(entities);
-
-        dbContext.SaveChanges();
-
-        var response = await timeSeriesClient.GetResampledData(entity.Date.AddMinutes(-1), differenceBetweenStartAndEndDays * 24 * 60 * 60 + 60, approxPointsCount, new CancellationToken());
-
-        //assert
-        Assert.NotNull(response);
-
-        var ratio = entities.Count / approxPointsCount;
-        if (ratio > 1)
-        {
-            var expectedResampledCount = entities
-                .Where((_, index) => index % ratio == 0)
-                .Count();
-
-            Assert.Equal(expectedResampledCount, response.Count());
-        }
-        else
-        {
-            Assert.Equal(entities.Count(), response.Count());
-        }
-    }
-}

DD.Persistence.IntegrationTests/Controllers/TimestampedSetControllerTest.cs

@@ -1,211 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-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
-{
-    private readonly ITimestampedSetClient client;
-
-    public TimestampedSetControllerTest(WebAppFactoryFixture factory) : base(factory)
-    {
-        var refitClientFactory = scope.ServiceProvider
-           .GetRequiredService<IRefitClientFactory<IRefitTimestampedSetClient>>();
-        var logger = scope.ServiceProvider.GetRequiredService<ILogger<TimestampedSetClient>>();
-
-        client = scope.ServiceProvider
-            .GetRequiredService<ITimestampedSetClient>();
-    }
-
-    [Fact]
-    public async Task InsertRange()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        IEnumerable<TimestampedSetDto> testSets = Generate(10, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-
-        // act
-        var response = await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-
-        // assert
-        Assert.Equal(testSets.Count(), response);
-    }
-
-    [Fact]
-    public async Task Get_without_filter()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-
-        // act
-        var response = await client.Get(idDiscriminator, null, null, 0, int.MaxValue, CancellationToken.None);
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(count, response.Count());
-    }
-
-    [Fact]
-    public async Task Get_with_filter_props()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-        string[] props = ["A"];
-
-        // act
-        var response = await client.Get(idDiscriminator, null, props, 0, int.MaxValue, new CancellationToken());
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(count, response.Count());
-        foreach (var item in response)
-        {
-            Assert.Single(item.Set);
-            var kv = item.Set.First();
-            Assert.Equal("A", kv.Key);
-        }
-    }
-
-    [Fact]
-    public async Task Get_geDate()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        var dateMin = DateTimeOffset.Now;
-        var dateMax = DateTimeOffset.Now.AddSeconds(count);
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, dateMin.ToOffset(TimeSpan.FromHours(7)));
-        var insertResponse = await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-        var tail = testSets.OrderBy(t => t.Timestamp).Skip(count / 2).Take(int.MaxValue);
-        var geDate = tail.First().Timestamp;
-        var tolerance = TimeSpan.FromSeconds(1);
-        var expectedCount = tail.Count();
-
-        // act
-        var response = await client.Get(idDiscriminator, geDate, null, 0, int.MaxValue, CancellationToken.None);
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(expectedCount, response.Count());
-        var minDate = response.Min(t => t.Timestamp);
-        Assert.Equal(geDate, geDate, tolerance);
-    }
-
-    [Fact]
-    public async Task Get_with_skip_take()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-        var expectedCount = count / 2;
-
-        // act
-        var response = await client.Get(idDiscriminator, null, null, 2, expectedCount, new CancellationToken());
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(expectedCount, response.Count());
-    }
-
-
-    [Fact]
-    public async Task Get_with_big_skip_take()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        var expectedCount = 1;
-        int count = 10 + expectedCount;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-
-        // act
-        var response = await client.Get(idDiscriminator, null, null, count - expectedCount, count, new CancellationToken());
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(expectedCount, response.Count());
-    }
-
-    [Fact]
-    public async Task GetLast()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-        var expectedCount = 8;
-
-        // act
-        var response = await client.GetLast(idDiscriminator, null, expectedCount, new CancellationToken());
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(expectedCount, response.Count());
-    }
-
-    [Fact]
-    public async Task GetDatesRange()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 10;
-        var dateMin = DateTimeOffset.Now;
-        var dateMax = DateTimeOffset.Now.AddSeconds(count - 1);
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, dateMin.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-        var tolerance = TimeSpan.FromSeconds(1);
-
-        // act
-        var response = await client.GetDatesRange(idDiscriminator, new CancellationToken());
-
-        // assert
-        Assert.NotNull(response);
-        Assert.Equal(dateMin, response.From, tolerance);
-        Assert.Equal(dateMax, response.To, tolerance);
-    }
-
-    [Fact]
-    public async Task Count()
-    {
-        // arrange
-        Guid idDiscriminator = Guid.NewGuid();
-        int count = 144;
-        IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        await client.AddRange(idDiscriminator, testSets, CancellationToken.None);
-
-        // act
-        var response = await client.Count(idDiscriminator, new CancellationToken());
-
-        // assert
-        Assert.Equal(count, response);
-    }
-
-    private static IEnumerable<TimestampedSetDto> Generate(int n, DateTimeOffset from)
-    {
-        for (int i = 0; i < n; i++)
-            yield return new TimestampedSetDto
-            (
-                from.AddSeconds(i),
-                new Dictionary<string, object>{
-                    {"A", i },
-                    {"B", i * 1.1 },
-                    {"C", $"Any{i}" },
-                    {"D", DateTimeOffset.Now},
-                }
-            );
-    }
-}

DD.Persistence.IntegrationTests/Controllers/TimestampedValuesControllerTest.cs

@@ -0,0 +1,405 @@
+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 Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System.Text.Json;
+using Xunit;
+
+namespace DD.Persistence.IntegrationTests.Controllers;
+public class TimestampedValuesControllerTest : BaseIntegrationTest
+{
+    private readonly ITimestampedValuesClient timestampedValuesClient;
+    private readonly IMemoryCache memoryCache;
+    private IEnumerable<Guid> discriminatorIds = [];
+
+    public TimestampedValuesControllerTest(WebAppFactoryFixture factory) : base(factory)
+    {
+        var refitClientFactory = scope.ServiceProvider
+           .GetRequiredService<IRefitClientFactory<IRefitTimestampedValuesClient>>();
+        var logger = scope.ServiceProvider.GetRequiredService<ILogger<TimestampedValuesClient>>();
+
+        timestampedValuesClient = scope.ServiceProvider
+            .GetRequiredService<ITimestampedValuesClient>();
+        memoryCache = scope.ServiceProvider.GetRequiredService<IMemoryCache>();
+    }
+
+    [Fact]
+    public async Task AddRange_returns_success()
+    {
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        await AddRange(discriminatorId);
+    }
+
+    [Fact]
+    public async Task Get_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.Get(discriminatorId, null, null, 0, 1, CancellationToken.None);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+
+    public async Task Get_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var timestampBegin = DateTimeOffset.UtcNow.AddDays(-1);
+        var columnNames = new List<string>() { "A", "C" };
+        var skip = 5;
+        var take = 5;
+
+        var dtos = await AddRange(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.Get(discriminatorId, timestampBegin, columnNames, skip, take, CancellationToken.None);
+
+        //assert
+        Assert.NotNull(response);
+        Assert.NotEmpty(response);
+
+        var actualCount = response.Count();
+        Assert.Equal(take, actualCount);
+
+        var actualColumnNames = response.SelectMany(e => e.Values.Keys).Distinct().ToList();
+        Assert.Equal(columnNames, actualColumnNames);
+
+        var expectedValueKind = JsonValueKind.Number;
+        var actualValueKind = ((JsonElement) response.First().Values["A"]).ValueKind;
+        Assert.Equal(expectedValueKind, actualValueKind);
+
+        expectedValueKind = JsonValueKind.String;
+        actualValueKind = ((JsonElement)response.First().Values["C"]).ValueKind;
+        Assert.Equal(expectedValueKind, actualValueKind);
+    }
+
+    [Fact]
+    public async Task GetGtDate_returns_success()
+    {
+        //arrange
+        Cleanup();
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var timestampBegin = DateTimeOffset.UtcNow.AddDays(-1);
+
+        //act
+        var response = await timestampedValuesClient.GetGtDate(discriminatorId, timestampBegin, CancellationToken.None);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+    public async Task GetGtDate_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var dtos = await AddRange(discriminatorId);
+        var timestampBegin = DateTimeOffset.UtcNow.AddSeconds(-5);
+
+        //act
+        var response = await timestampedValuesClient.GetGtDate(discriminatorId, timestampBegin, CancellationToken.None);
+
+        //assert
+        Assert.NotNull(response);
+        Assert.NotEmpty(response);
+
+        var expectedCount = dtos.Count(dto => dto.Timestamp.ToUniversalTime() > timestampBegin);
+        var actualCount = response.Count();
+        Assert.Equal(expectedCount, actualCount);
+    }
+
+    [Fact]
+    public async Task GetFirst_returns_success()
+    {
+        //arrange
+        Cleanup();
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var take = 1;
+
+        //act
+        var response = await timestampedValuesClient.GetFirst(discriminatorId, take, CancellationToken.None);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+    public async Task GetFirst_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var dtos = await AddRange(discriminatorId);
+        var take = 1;
+
+        //act
+        var response = await timestampedValuesClient.GetFirst(discriminatorId, take, CancellationToken.None);
+
+        //assert
+        Assert.NotNull(response);
+        Assert.NotEmpty(response);
+
+        var expectedTimestampString = dtos
+            .OrderBy(dto => dto.Timestamp)
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        var actualTimestampString = response
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        Assert.Equal(expectedTimestampString, actualTimestampString);
+    }
+
+    [Fact]
+    public async Task GetLast_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var take = 1;
+
+        //act
+        var response = await timestampedValuesClient.GetLast(discriminatorId, take, CancellationToken.None);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+    public async Task GetLast_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var dtos = await AddRange(discriminatorId);
+        var take = 1;
+
+        //act
+        var response = await timestampedValuesClient.GetLast(discriminatorId, take, CancellationToken.None);
+
+        //assert
+        Assert.NotNull(response);
+        Assert.NotEmpty(response);
+
+        var expectedTimestampString = dtos
+            .OrderByDescending(dto => dto.Timestamp)
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        var actualTimestampString = response
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        Assert.Equal(expectedTimestampString, actualTimestampString);
+    }
+
+    [Fact]
+    public async Task GetResampledData_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var timestampBegin = DateTimeOffset.UtcNow;
+
+        //act
+        var response = await timestampedValuesClient.GetResampledData(discriminatorId, timestampBegin);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+    public async Task GetResampledData_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var count = 2048;
+        var timestampBegin = DateTimeOffset.UtcNow;
+        var dtos = await AddRange(discriminatorId, count);
+        
+
+        //act
+        var response = await timestampedValuesClient.GetResampledData(discriminatorId, timestampBegin, count);
+
+        //assert
+        Assert.NotNull(response);
+        Assert.NotEmpty(response);
+
+        var expectedCount = count / 2;
+        var actualCount = response.Count();
+        Assert.Equal(expectedCount, actualCount);
+    }
+
+    [Fact]
+    public async Task Count_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.Count(discriminatorId, CancellationToken.None);
+
+        //assert
+        Assert.Equal(0, response);
+    }
+
+    [Fact]
+    public async Task Count_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var dtos = await AddRange(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.Count(discriminatorId, CancellationToken.None);
+
+        //assert
+        var expectedCount = dtos.Count();
+        Assert.Equal(expectedCount, response);
+    }
+
+    [Fact]
+    public async Task GetDatesRange_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.GetDatesRange(discriminatorId, CancellationToken.None);
+
+        //assert
+        Assert.Null(response);
+    }
+
+    [Fact]
+    public async Task GetDatesRange_AfterSave_returns_success()
+    {
+        //arrange
+        Cleanup();
+
+        var discriminatorId = Guid.NewGuid();
+        discriminatorIds.Append(discriminatorId);
+
+        var dtos = await AddRange(discriminatorId);
+
+        //act
+        var response = await timestampedValuesClient.GetDatesRange(discriminatorId, CancellationToken.None);
+
+        //assert
+        Assert.NotNull(response);
+
+        var expectedDateFromString = dtos
+            .OrderBy(dto => dto.Timestamp)
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        var actualDateFromString = response.From
+            .ToUniversalTime()
+            .ToString();
+        Assert.Equal(expectedDateFromString, actualDateFromString);
+
+        var expectedDateToString = dtos
+            .OrderByDescending(dto => dto.Timestamp)
+            .First().Timestamp
+            .ToUniversalTime()
+            .ToString();
+        var actualDateToString = response.To
+            .ToUniversalTime()
+            .ToString();
+        Assert.Equal(expectedDateToString, actualDateToString);
+    }
+
+    private async Task<IEnumerable<TimestampedValuesDto>> AddRange(Guid discriminatorId, int countToCreate = 10)
+    {
+        // arrange
+        IEnumerable<TimestampedValuesDto> generatedDtos = Generate(countToCreate, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
+
+        // act
+        var response = await timestampedValuesClient.AddRange(discriminatorId, generatedDtos, CancellationToken.None);
+
+        // assert
+        Assert.Equal(generatedDtos.Count(), response);
+
+        return generatedDtos;
+    }
+
+    private static IEnumerable<TimestampedValuesDto> Generate(int countToCreate, DateTimeOffset from)
+    {
+        var result = new List<TimestampedValuesDto>();
+        for (int i = 0; i < countToCreate; i++)
+        {
+            var values = new Dictionary<string, object>()
+            {
+                { "A", i },
+                { "B", i * 1.1 },
+                { "C", $"Any{i}" },
+                { "D", DateTimeOffset.Now },
+            };
+
+            yield return new TimestampedValuesDto()
+            {
+                Timestamp = from.AddSeconds(i),
+                Values = values
+            };
+        }
+    }
+
+    private void Cleanup()
+    {
+        discriminatorIds = [];
+        dbContext.CleanupDbSet<TimestampedValues>();
+        dbContext.CleanupDbSet<DataScheme>();
+    }
+}

DD.Persistence.Models/DataSaubDto.cs

@@ -1,41 +0,0 @@
-namespace DD.Persistence.Models;
-public class DataSaubDto : ITimeSeriesAbstractDto
-{
-    public DateTimeOffset Date { get; set; } = DateTimeOffset.UtcNow;
-
-    public int? Mode { get; set; }
-
-    public string? User { get; set; }
-
-    public double? WellDepth { get; set; }
-
-    public double? BitDepth { get; set; }
-
-    public double? BlockPosition { get; set; }
-
-    public double? BlockSpeed { get; set; }
-
-    public double? Pressure { get; set; }
-
-    public double? AxialLoad { get; set; }
-
-    public double? HookWeight { get; set; }
-
-    public double? RotorTorque { get; set; }
-
-    public double? RotorSpeed { get; set; }
-
-    public double? Flow { get; set; }
-
-    public short MseState { get; set; }
-
-    public int IdFeedRegulator { get; set; }
-
-    public double? Mse { get; set; }
-
-    public double? Pump0Flow { get; set; }
-
-    public double? Pump1Flow { get; set; }
-
-    public double? Pump2Flow { get; set; }
-}

DD.Persistence.Models/DataSchemeDto.cs

@@ -0,0 +1,17 @@
+namespace DD.Persistence.Models;
+
+/// <summary>
+/// Схема для набора данных
+/// </summary>
+public class DataSchemeDto
+{
+    /// <summary>
+    /// Дискриминатор
+    /// </summary>
+    public Guid DiscriminatorId { get; set; }
+
+    /// <summary>
+    /// Наименования полей
+    /// </summary>
+    public string[] PropNames { get; set; } = [];
+}

DD.Persistence.Models/DataSourceSystemDto.cs

@@ -13,7 +13,7 @@ public class DataSourceSystemDto
     /// <summary>
     /// Наименование
     /// </summary>
-    public required string Name { get; set; } = string.Empty;
+    public string Name { get; set; } = string.Empty;
 
     /// <summary>
     /// Описание

DD.Persistence.Models/DatesRangeDto.cs

@@ -1,4 +1,4 @@
-namespace DD.Persistence.Models;
+namespace DD.Persistence.Models.Common;
 
 /// <summary>
 /// Диапазон дат

DD.Persistence.Models/ITimeSeriesAbstractDto.cs

@@ -1,12 +1,12 @@
-namespace DD.Persistence.Models;
+namespace DD.Persistence.ModelsAbstractions;
 
 /// <summary>
 /// Интерфейс, описывающий временные данные
 /// </summary>
-public interface ITimeSeriesAbstractDto
+public interface ITimestampAbstractDto
 {
     /// <summary>
     /// временная отметка
     /// </summary>
-    DateTimeOffset Date { get; set; }
+    DateTimeOffset Timestamp { get; set; }
 }

DD.Persistence.Models/IWithSectionPart.cs

@@ -1,4 +1,4 @@
-namespace DD.Persistence.Models;
+namespace DD.Persistence.ModelsAbstractions;
 public interface IWithSectionPart
 {
     public double DepthStart { get; set; }

DD.Persistence.Models/PaginationContainer.cs

@@ -1,4 +1,4 @@
-namespace DD.Persistence.Models;
+namespace DD.Persistence.Models.Common;
 
 /// <summary>
 /// Контейнер для поддержки постраничного просмотра таблиц

DD.Persistence.Models/SetpointLogDto.cs

@@ -8,7 +8,7 @@ public class SetpointLogDto : SetpointValueDto
     /// <summary>
     /// Дата сохранения уставки
     /// </summary>
-    public DateTimeOffset Created { get; set; }
+    public DateTimeOffset Timestamp { get; set; }
 
     /// <summary>
     /// Ключ пользователя

DD.Persistence.Models/TimestampedSetDto.cs

@@ -1,8 +0,0 @@
-namespace DD.Persistence.Models;
-
-/// <summary>
-/// набор данных с отметкой времени
-/// </summary>
-/// <param name="Timestamp">отметка времени</param>
-/// <param name="Set">набор данных</param>
-public record TimestampedSetDto(DateTimeOffset Timestamp, IDictionary<string, object> Set);

DD.Persistence.Models/TimestampedValuesDto.cs

@@ -0,0 +1,19 @@
+using DD.Persistence.ModelsAbstractions;
+
+namespace DD.Persistence.Models;
+
+/// <summary>
+/// Набор данных с отметкой времени
+/// </summary>
+public class TimestampedValuesDto : ITimestampAbstractDto
+{
+    /// <summary>
+    /// Временная отметка
+    /// </summary>
+    public DateTimeOffset Timestamp { get; set; }
+
+    /// <summary>
+    /// Набор данных
+    /// </summary>
+    public Dictionary<string, object> Values { get; set; } = [];
+}

DD.Persistence.Repository/DependencyInjection.cs

@@ -6,6 +6,7 @@ using DD.Persistence.Repositories;
 using DD.Persistence.Repository.Repositories;
 using DD.Persistence.Database.Entity;
 using System.Reflection;
+using DD.Persistence.Repository.RepositoriesCached;
 
 namespace DD.Persistence.Repository;
 public static class DependencyInjection
@@ -35,15 +36,14 @@ public static class DependencyInjection
 
         MapsterSetup();
 
-        services.AddTransient<ITimeSeriesDataRepository<DataSaubDto>, TimeSeriesDataRepository<DataSaub, DataSaubDto>>();
         services.AddTransient<ISetpointRepository, SetpointRepository>();
-        services.AddTransient<ITimeSeriesDataRepository<DataSaubDto>, TimeSeriesDataCachedRepository<DataSaub, DataSaubDto>>();
         services.AddTransient<IChangeLogRepository, ChangeLogRepository>();
-        services.AddTransient<ITimestampedSetRepository, TimestampedSetRepository>();
+        services.AddTransient<ITimestampedValuesRepository, TimestampedValuesRepository>();
         services.AddTransient<ITechMessagesRepository, TechMessagesRepository>();
         services.AddTransient<IParameterRepository, ParameterRepository>();
 		services.AddTransient<IDataSourceSystemRepository, DataSourceSystemCachedRepository>();
+        services.AddTransient<IDataSchemeRepository, DataSchemeCachedRepository>();
 
-		return services;
+        return services;
     }
 }

DD.Persistence.Repository/QueryBuilders.cs

@@ -1,7 +1,9 @@
 using Microsoft.EntityFrameworkCore;
-using DD.Persistence.Database.Model;
-using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
+using DD.Persistence.Models.Common;
+using DD.Persistence.ModelsAbstractions;
+using DD.Persistence.Database.EntityAbstractions;
+using DD.Persistence.Extensions;
 
 namespace DD.Persistence.Repository;
 

DD.Persistence.Repository/Repositories/ChangeLogRepository.cs

@@ -5,6 +5,7 @@ using DD.Persistence.Models;
 using DD.Persistence.Models.Requests;
 using DD.Persistence.Repositories;
 using UuidExtensions;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Repository.Repositories;
 public class ChangeLogRepository : IChangeLogRepository

DD.Persistence.Repository/Repositories/DataSchemeRepository.cs

@@ -0,0 +1,34 @@
+using DD.Persistence.Database.Entity;
+using DD.Persistence.Models;
+using DD.Persistence.Repositories;
+using Mapster;
+using Microsoft.EntityFrameworkCore;
+
+namespace DD.Persistence.Repository.Repositories;
+public class DataSchemeRepository : IDataSchemeRepository
+{
+    protected DbContext db;
+    public DataSchemeRepository(DbContext db)
+    {
+        this.db = db;
+    }
+    protected virtual IQueryable<DataScheme> GetQueryReadOnly() => db.Set<DataScheme>();
+
+    public virtual async Task Add(DataSchemeDto dataSourceSystemDto, CancellationToken token)
+    {
+        var entity = dataSourceSystemDto.Adapt<DataScheme>();
+
+        await db.Set<DataScheme>().AddAsync(entity, token);
+        await db.SaveChangesAsync(token);
+    }
+
+    public virtual async Task<DataSchemeDto?> Get(Guid dataSchemeId, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .Where(e => e.DiscriminatorId == dataSchemeId);
+        var entity = await query.ToArrayAsync();
+        var dto = entity.Select(e => e.Adapt<DataSchemeDto>()).FirstOrDefault();
+
+        return dto;
+    }
+}

DD.Persistence.Repository/Repositories/ParameterRepository.cs

@@ -3,6 +3,7 @@ using Microsoft.EntityFrameworkCore;
 using DD.Persistence.Database.Entity;
 using DD.Persistence.Models;
 using DD.Persistence.Repositories;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Repository.Repositories;
 public class ParameterRepository : IParameterRepository

DD.Persistence.Repository/Repositories/SetpointRepository.cs

@@ -1,9 +1,10 @@
-using Mapster;
+using Mapster;
 using Microsoft.EntityFrameworkCore;
 using DD.Persistence.Database.Model;
 using DD.Persistence.Models;
 using DD.Persistence.Repositories;
 using System.Text.Json;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Repository.Repositories
 {
@@ -26,7 +27,7 @@ namespace DD.Persistence.Repository.Repositories
             var entities = await query
                 .Where(e => setpointKeys.Contains(e.Key))
                 .GroupBy(e => e.Key)
-                .Select(g => g.OrderByDescending(x => x.Created).FirstOrDefault())
+                .Select(g => g.OrderByDescending(x => x.Timestamp).FirstOrDefault())
                 .ToArrayAsync(token);
 
             var dtos = entities.Select(e => e.Adapt<SetpointValueDto>());
@@ -39,7 +40,7 @@ namespace DD.Persistence.Repository.Repositories
             var entities = await query
                 .Where(e => setpointKeys.Contains(e.Key))
                 .GroupBy(e => e.Key)
-                .Select(g => g.OrderByDescending(x => x.Created).FirstOrDefault())
+                .Select(g => g.OrderByDescending(x => x.Timestamp).FirstOrDefault())
                 .ToDictionaryAsync(x=> x.Key, x => (object)x.Value, token);
 
             return entities;
@@ -53,8 +54,8 @@ namespace DD.Persistence.Repository.Repositories
                 .ToArrayAsync(token);
             var filteredEntities = entities
                 .GroupBy(e => e.Key)
-                .Select(e => e.OrderBy(o => o.Created))
+                .Select(e => e.OrderBy(o => o.Timestamp))
-                .Select(e => e.Where(e => e.Created <= historyMoment).Last());
+                .Select(e => e.Where(e => e.Timestamp <= historyMoment).Last());
             var dtos = filteredEntities
                 .Select(e => e.Adapt<SetpointValueDto>());
 
@@ -65,7 +66,7 @@ namespace DD.Persistence.Repository.Repositories
         {
             var query = GetQueryReadOnly();
             var entities = await query
-                .Where(e => e.Created >= dateBegin)
+                .Where(e => e.Timestamp >= dateBegin)
                 .Take(take)
                 .ToArrayAsync(token);
             var dtos = entities
@@ -80,8 +81,8 @@ namespace DD.Persistence.Repository.Repositories
                 .GroupBy(e => 1)
                 .Select(group => new
                 {
-                    Min = group.Min(e => e.Created),
+                    Min = group.Min(e => e.Timestamp),
-                    Max = group.Max(e => e.Created),
+                    Max = group.Max(e => e.Timestamp),
                 });
             var values = await query.FirstOrDefaultAsync(token);
             var result = new DatesRangeDto()
@@ -113,7 +114,7 @@ namespace DD.Persistence.Repository.Repositories
                 Key = setpointKey,
                 Value = newValue,
                 IdUser = idUser,
-                Created = DateTimeOffset.UtcNow
+                Timestamp = DateTimeOffset.UtcNow.ToUniversalTime()
             };
 
             await db.Set<Setpoint>().AddAsync(entity, token);

DD.Persistence.Repository/Repositories/TechMessagesRepository.cs

@@ -1,16 +1,15 @@
-using Mapster;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Caching.Memory;
-using Newtonsoft.Json.Linq;
 using DD.Persistence.Database.Entity;
+using DD.Persistence.Extensions;
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 using DD.Persistence.Repositories;
-using UuidExtensions;
+using Mapster;
+using Microsoft.EntityFrameworkCore;
 
 namespace DD.Persistence.Repository.Repositories
 {
-	public class TechMessagesRepository : ITechMessagesRepository
+    public class TechMessagesRepository : ITechMessagesRepository
 	{
         private readonly IDataSourceSystemRepository sourceSystemRepository;
 		private DbContext db;

DD.Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs

@@ -1,103 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using DD.Persistence.Database.Model;
-using DD.Persistence.Models;
-
-namespace DD.Persistence.Repository.Repositories;
-
-public class TimeSeriesDataCachedRepository<TEntity, TDto> : TimeSeriesDataRepository<TEntity, TDto>
-    where TEntity : class, ITimestampedData, new()
-    where TDto : class, ITimeSeriesAbstractDto, new()
-{
-    public static TDto? FirstByDate { get; private set; }
-    public static CyclicArray<TDto> LastData { get; } = new CyclicArray<TDto>(CacheItemsCount);
-
-    private const int CacheItemsCount = 3600;
-
-    public TimeSeriesDataCachedRepository(DbContext db) : base(db)
-    {
-        Task.Run(async () =>
-        {
-            var firstDateItem = await base.GetFirstAsync(CancellationToken.None);
-            if (firstDateItem == null)
-            {
-                return;
-            }
-
-            FirstByDate = firstDateItem;
-
-            var dtos = await base.GetLastAsync(CacheItemsCount, CancellationToken.None);
-            dtos = dtos.OrderBy(d => d.Date);
-            LastData.AddRange(dtos);
-        }).Wait();
-    }
-
-    public override async Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset dateBegin, CancellationToken token)
-    {
-
-        if (LastData.Count == 0 || LastData[0].Date > dateBegin)
-        {
-            var dtos = await base.GetGtDate(dateBegin, token);
-            return dtos;
-        }
-
-        var items = LastData
-            .Where(i => i.Date >= dateBegin);
-
-        return items;
-    }
-
-    public override async Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token)
-    {
-        var result = await base.AddRange(dtos, token);
-        if (result > 0)
-        {
-
-            dtos = dtos.OrderBy(x => x.Date);
-
-            FirstByDate = dtos.First();
-            LastData.AddRange(dtos);
-        }
-
-        return result;
-    }
-
-    public override async Task<DatesRangeDto?> GetDatesRange(CancellationToken token)
-    {
-        if (FirstByDate == null)
-            return null;
-
-        return await Task.Run(() =>
-        {
-            return new DatesRangeDto
-            {
-                From = FirstByDate.Date,
-                To = LastData[^1].Date
-            };
-        });
-    }
-
-    public override async Task<IEnumerable<TDto>> GetResampledData(
-        DateTimeOffset dateBegin,
-        double intervalSec = 600d,
-        int approxPointsCount = 1024,
-        CancellationToken token = default)
-    {
-        var dtos = LastData.Where(i => i.Date >= dateBegin);
-        if (LastData.Count == 0 || LastData[0].Date > dateBegin)
-        {
-            dtos = await base.GetGtDate(dateBegin, token);
-        }
-
-        var dateEnd = dateBegin.AddSeconds(intervalSec);
-        dtos = dtos
-            .Where(i => i.Date <= dateEnd);
-
-        var ratio = dtos.Count() / approxPointsCount;
-        if (ratio > 1)
-            dtos = dtos
-                .Where((_, index) => index % ratio == 0);
-
-        return dtos;
-    }
-}
-

DD.Persistence.Repository/Repositories/TimeSeriesDataRepository.cs

@@ -1,99 +0,0 @@
-using Mapster;
-using Microsoft.EntityFrameworkCore;
-using DD.Persistence.Database.Model;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-
-namespace DD.Persistence.Repository.Repositories;
-public class TimeSeriesDataRepository<TEntity, TDto> : ITimeSeriesDataRepository<TDto>
-    where TEntity : class, ITimestampedData, new()
-    where TDto : class, ITimeSeriesAbstractDto, new()
-{
-    private readonly DbContext db;
-
-    public TimeSeriesDataRepository(DbContext db)
-    {
-        this.db = db;
-    }
-
-    protected virtual IQueryable<TEntity> GetQueryReadOnly() => this.db.Set<TEntity>();
-
-    public virtual async Task<DatesRangeDto?> GetDatesRange(CancellationToken token)
-    {
-        var query = GetQueryReadOnly();
-        var minDate = await query.MinAsync(o => o.Date, token);
-        var maxDate = await query.MaxAsync(o => o.Date, token);
-
-        return new DatesRangeDto
-        {
-            From = minDate,
-            To = maxDate
-        };
-    }
-
-    public virtual async Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset date, CancellationToken token)
-    {
-        var query = this.db.Set<TEntity>().Where(e => e.Date > date);
-        var entities = await query.ToArrayAsync(token);
-
-        var dtos = entities.Select(e => e.Adapt<TDto>());
-
-        return dtos;
-    }
-
-    public virtual async Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token)
-    {
-        var entities = dtos.Select(d => d.Adapt<TEntity>());
-
-        await db.Set<TEntity>().AddRangeAsync(entities, token);
-        var result = await db.SaveChangesAsync(token);
-
-        return result;
-    }
-
-    protected async Task<IEnumerable<TDto>> GetLastAsync(int takeCount, CancellationToken token)
-    {
-        var query = GetQueryReadOnly()
-            .OrderByDescending(e => e.Date)
-            .Take(takeCount);
-
-        var entities = await query.ToArrayAsync(token);
-        var dtos = entities.Select(e => e.Adapt<TDto>());
-
-        return dtos;
-    }
-
-    protected async Task<TDto?> GetFirstAsync(CancellationToken token)
-    {
-        var query = GetQueryReadOnly()
-            .OrderBy(e => e.Date);
-
-        var entity = await query.FirstOrDefaultAsync(token);
-
-        if (entity == null)
-            return null;
-
-        var dto = entity.Adapt<TDto>();
-        return dto;
-    }
-
-    public async virtual Task<IEnumerable<TDto>> GetResampledData(
-        DateTimeOffset dateBegin,
-        double intervalSec = 600d,
-        int approxPointsCount = 1024,
-        CancellationToken token = default)
-    {
-        var dtos = await GetGtDate(dateBegin, token);
-
-        var dateEnd = dateBegin.AddSeconds(intervalSec);
-        dtos = dtos
-            .Where(i => i.Date <= dateEnd);
-
-        var ratio = dtos.Count() / approxPointsCount;
-        if (ratio > 1)
-            dtos = dtos
-                .Where((_, index) => index % ratio == 0);
-
-        return dtos;
-    }
-}

DD.Persistence.Repository/Repositories/TimestampedSetRepository.cs

@@ -1,121 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using DD.Persistence.Database.Entity;
-using DD.Persistence.Models;
-using DD.Persistence.Repositories;
-
-namespace DD.Persistence.Repository.Repositories;
-
-/// <summary>
-/// Репозиторий для хранения разных наборов данных временных рядов.
-/// idDiscriminator - идентифицирует конкретный набор данных, прим.: циклы измерения АСИБР, или отчет о DrillTest.
-/// idDiscriminator формируют клиенты и только им известно что они обозначают.
-/// Так как данные приходят редко, то их прореживания для построения графиков не предусмотрено.
-/// </summary>
-public class TimestampedSetRepository : ITimestampedSetRepository
-{
-    private readonly DbContext db;
-
-    public TimestampedSetRepository(DbContext db)
-    {
-        this.db = db;
-    }
-
-    public Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token)
-    {
-        var entities = sets.Select(set => new TimestampedSet(idDiscriminator, set.Timestamp.ToUniversalTime(), set.Set));
-        var dbSet = db.Set<TimestampedSet>();
-        dbSet.AddRange(entities);
-        return db.SaveChangesAsync(token);
-    }
-
-    public async Task<IEnumerable<TimestampedSetDto>> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
-    {
-        var dbSet = db.Set<TimestampedSet>();
-        var query = dbSet.Where(entity => entity.IdDiscriminator == idDiscriminator);
-
-        if (geTimestamp.HasValue)
-            query = ApplyGeTimestamp(query, geTimestamp.Value);
-
-        query = query
-            .OrderBy(item => item.Timestamp)
-            .Skip(skip)
-            .Take(take);
-
-        var data = await Materialize(query, token);
-
-        if (columnNames is not null && columnNames.Any())
-            data = ReduceSetColumnsByNames(data, columnNames);
-
-        return data;
-    }
-
-    public async Task<IEnumerable<TimestampedSetDto>> GetLast(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token)
-    {
-        var dbSet = db.Set<TimestampedSet>();
-        var query = dbSet.Where(entity => entity.IdDiscriminator == idDiscriminator);
-
-        query = query.OrderByDescending(entity => entity.Timestamp)
-            .Take(take)
-            .OrderBy(entity => entity.Timestamp);
-
-        var data = await Materialize(query, token);
-
-        if (columnNames is not null && columnNames.Any())
-            data = ReduceSetColumnsByNames(data, columnNames);
-
-        return data;
-    }
-
-    public Task<int> Count(Guid idDiscriminator, CancellationToken token)
-    {
-        var dbSet = db.Set<TimestampedSet>();
-        var query = dbSet.Where(entity => entity.IdDiscriminator == idDiscriminator);
-        return query.CountAsync(token);
-    }
-
-    public async Task<DatesRangeDto?> GetDatesRange(Guid idDiscriminator, CancellationToken token)
-    {
-        var query = db.Set<TimestampedSet>()
-            .GroupBy(entity => entity.IdDiscriminator)
-            .Select(group => new
-            {
-                Min = group.Min(entity => entity.Timestamp),
-                Max = group.Max(entity => entity.Timestamp),
-            });
-
-        var item = await query.FirstOrDefaultAsync(token);
-        if (item is null)
-            return null;
-
-        return new DatesRangeDto
-        {
-            From = item.Min,
-            To = item.Max,
-        };
-    }
-
-    private static async Task<IEnumerable<TimestampedSetDto>> Materialize(IQueryable<TimestampedSet> query, CancellationToken token)
-    {
-        var dtoQuery = query.Select(entity => new TimestampedSetDto(entity.Timestamp, entity.Set));
-        var dtos = await dtoQuery.ToArrayAsync(token);
-        return dtos;
-    }
-
-    private static IQueryable<TimestampedSet> ApplyGeTimestamp(IQueryable<TimestampedSet> query, DateTimeOffset geTimestamp)
-    {
-        var geTimestampUtc = geTimestamp.ToUniversalTime();
-        return query.Where(entity => entity.Timestamp >= geTimestampUtc);
-    }
-
-    private static IEnumerable<TimestampedSetDto> ReduceSetColumnsByNames(IEnumerable<TimestampedSetDto> query, IEnumerable<string> columnNames)
-    {
-        var newQuery = query
-            .Select(entity => new TimestampedSetDto(
-                entity.Timestamp,
-                entity.Set
-                    .Where(prop => columnNames.Contains(prop.Key))
-                    .ToDictionary(prop => prop.Key, prop => prop.Value)
-            ));
-        return newQuery;
-    }
-}

DD.Persistence.Repository/Repositories/TimestampedValuesRepository.cs

@@ -0,0 +1,179 @@
+using DD.Persistence.Database.Entity;
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+using DD.Persistence.Repositories;
+using Microsoft.EntityFrameworkCore;
+
+namespace DD.Persistence.Repository.Repositories;
+public class TimestampedValuesRepository : ITimestampedValuesRepository
+{
+    private readonly DbContext db;
+
+    public TimestampedValuesRepository(DbContext db)
+    {
+        this.db = db;
+    }
+
+    protected virtual IQueryable<TimestampedValues> GetQueryReadOnly() => this.db.Set<TimestampedValues>();
+
+    public async virtual Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token)
+    {
+        var timestampedValuesEntities = new List<TimestampedValues>();
+        foreach (var dto in dtos)
+        {
+            var timestampedValuesEntity = new TimestampedValues()
+            {
+                DiscriminatorId = discriminatorId,
+                Timestamp = dto.Timestamp.ToUniversalTime(),
+                Values = dto.Values.Values.ToArray()
+            };
+            timestampedValuesEntities.Add(timestampedValuesEntity);
+        }
+
+        await db.Set<TimestampedValues>().AddRangeAsync(timestampedValuesEntities, token);
+
+        var result = await db.SaveChangesAsync(token);
+
+        return result;
+    }
+
+    public async virtual Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> Get(Guid discriminatorId, DateTimeOffset? timestampBegin, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .Where(entity => entity.DiscriminatorId == discriminatorId);
+
+        // Фильтрация по дате
+        if (timestampBegin.HasValue)
+        {
+            query = ApplyGeTimestamp(query, timestampBegin.Value);
+        }
+
+        query = query
+            .OrderBy(item => item.Timestamp)
+            .Skip(skip)
+            .Take(take);
+        var entities = await query.ToArrayAsync(token);
+
+        var result = entities.Select(e => Tuple.Create(
+            e.Timestamp,
+            e.Values
+        ));
+
+        return result;
+    }
+
+    public async virtual Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .OrderBy(e => e.Timestamp)
+            .Take(takeCount);
+        var entities = await query.ToArrayAsync(token);
+
+        var result = entities.Select(e => Tuple.Create(
+            e.Timestamp,
+            e.Values
+        ));
+
+        return result;
+    }
+
+    public async virtual Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetLast(Guid discriminatorId, int takeCount, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .OrderByDescending(e => e.Timestamp)
+            .Take(takeCount);
+        var entities = await query.ToArrayAsync(token);
+
+        var result = entities.Select(e => Tuple.Create(
+            e.Timestamp,
+            e.Values
+        ));
+
+        return result;
+    }
+
+    // ToDo: прореживание должно осуществляться до материализации
+    public async virtual Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetResampledData(
+        Guid discriminatorId,
+        DateTimeOffset dateBegin,
+        double intervalSec = 600d,
+        int approxPointsCount = 1024,
+        CancellationToken token = default)
+    {
+        var result = await GetGtDate(discriminatorId, dateBegin, token);
+
+        var dateEnd = dateBegin.AddSeconds(intervalSec);
+        result = result
+            .Where(i => i.Item1 <= dateEnd);
+
+        var ratio = result.Count() / approxPointsCount;
+        if (ratio > 1)
+            result = result
+                .Where((_, index) => index % ratio == 0);
+
+        return result;
+    }
+
+    public async virtual Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetGtDate(Guid discriminatorId, DateTimeOffset timestampBegin, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .Where(e => e.Timestamp > timestampBegin);
+        var entities = await query.ToArrayAsync(token);
+
+        var result = entities.Select(e => Tuple.Create(
+            e.Timestamp,
+            e.Values
+        ));
+
+        return result;
+    }
+
+    public async virtual Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token)
+    {
+        var query = GetQueryReadOnly()
+            .GroupBy(entity => entity.DiscriminatorId)
+            .Select(group => new
+            {
+                Min = group.Min(entity => entity.Timestamp),
+                Max = group.Max(entity => entity.Timestamp),
+            });
+
+        var item = await query.FirstOrDefaultAsync(token);
+        if (item is null)
+        {
+            return null;
+        }
+
+        var dto = new DatesRangeDto
+        {
+            From = item.Min,
+            To = item.Max,
+        };
+
+        return dto;
+    }
+
+    public virtual Task<int> Count(Guid discriminatorId, CancellationToken token)
+    {
+        var dbSet = db.Set<TimestampedValues>();
+        var query = dbSet.Where(entity => entity.DiscriminatorId == discriminatorId);
+
+        return query.CountAsync(token);
+    }
+
+    /// <summary>
+    /// Применить фильтр по дате
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="timestampBegin"></param>
+    /// <returns></returns>
+    private IQueryable<TimestampedValues> ApplyGeTimestamp(IQueryable<TimestampedValues> query, DateTimeOffset timestampBegin)
+    {
+        var geTimestampUtc = timestampBegin.ToUniversalTime();
+
+        var result = query
+            .Where(entity => entity.Timestamp >= geTimestampUtc);
+
+        return result;
+    }
+}

DD.Persistence.Repository/RepositoriesCached/DataSchemeCachedRepository.cs

@@ -0,0 +1,30 @@
+using DD.Persistence.Models;
+using DD.Persistence.Repository.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+
+namespace DD.Persistence.Repository.RepositoriesCached;
+public class DataSchemeCachedRepository : DataSchemeRepository
+{
+    private readonly IMemoryCache memoryCache;
+
+    public DataSchemeCachedRepository(DbContext db, IMemoryCache memoryCache) : base(db)
+    {
+        this.memoryCache = memoryCache;
+    }
+
+    public override async Task Add(DataSchemeDto dataSourceSystemDto, CancellationToken token)
+    {
+        await base.Add(dataSourceSystemDto, token);
+
+        memoryCache.Set(dataSourceSystemDto.DiscriminatorId, dataSourceSystemDto);
+    }
+
+    public override async Task<DataSchemeDto?> Get(Guid discriminatorId, CancellationToken token)
+    {
+        var result = memoryCache.Get<DataSchemeDto>(discriminatorId)
+            ?? await base.Get(discriminatorId, token);
+
+        return result;
+    }
+}

DD.Persistence.Repository/RepositoriesCached/DataSourceSystemCachedRepository.cs

@@ -1,13 +1,14 @@
-using Microsoft.EntityFrameworkCore;
+using DD.Persistence.Database.Entity;
-using Microsoft.Extensions.Caching.Memory;
 using DD.Persistence.Models;
+using DD.Persistence.Repository.Repositories;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
 
-namespace DD.Persistence.Repository.Repositories;
+namespace DD.Persistence.Repository.RepositoriesCached;
 public class DataSourceSystemCachedRepository : DataSourceSystemRepository
 {
-    private static readonly string SystemCacheKey = $"{typeof(Database.Entity.DataSourceSystem).FullName}CacheKey";
+    private static readonly string SystemCacheKey = $"{typeof(DataSourceSystem).FullName}CacheKey";
     private readonly IMemoryCache memoryCache;
-    private const int CacheExpirationInMinutes = 60;
     private readonly TimeSpan? AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(60);
 
     public DataSourceSystemCachedRepository(DbContext db, IMemoryCache memoryCache) : base(db)

DD.Persistence.Repository/RepositoriesCached/TimestampedValuesCachedRepository.cs

@@ -0,0 +1,103 @@
+//using DD.Persistence.Models;
+//using DD.Persistence.Models.Common;
+//using DD.Persistence.Repositories;
+//using Microsoft.EntityFrameworkCore;
+
+//namespace DD.Persistence.Repository.Repositories;
+
+//public class TimestampedValuesCachedRepository : TimestampedValuesRepository
+//{
+//    public static TimestampedValuesDto? FirstByDate { get; private set; }
+//    public static CyclicArray<TimestampedValuesDto> LastData { get; } = new CyclicArray<TimestampedValuesDto>(CacheItemsCount);
+
+//    private const int CacheItemsCount = 3600;
+
+//    public TimestampedValuesCachedRepository(DbContext db, IDataSourceSystemRepository<ValuesIdentityDto> relatedDataRepository) : base(db, relatedDataRepository)
+//    {
+//        //Task.Run(async () =>
+//        //{
+//        //    var firstDateItem = await base.GetFirst(CancellationToken.None);
+//        //    if (firstDateItem == null)
+//        //    {
+//        //        return;
+//        //    }
+
+//        //    FirstByDate = firstDateItem;
+
+//        //    var dtos = await base.GetLast(CacheItemsCount, CancellationToken.None);
+//        //    dtos = dtos.OrderBy(d => d.Timestamp);
+//        //    LastData.AddRange(dtos);
+//        //}).Wait();
+//    }
+
+//    public override async Task<IEnumerable<TimestampedValuesDto>> GetGtDate(Guid discriminatorId, DateTimeOffset dateBegin, CancellationToken token)
+//    {
+
+//        if (LastData.Count == 0 || LastData[0].Timestamp > dateBegin)
+//        {
+//            var dtos = await base.GetGtDate(discriminatorId, dateBegin, token);
+//            return dtos;
+//        }
+
+//        var items = LastData
+//            .Where(i => i.Timestamp >= dateBegin);
+
+//        return items;
+//    }
+
+//    public override async Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token)
+//    {
+//        var result = await base.AddRange(discriminatorId, dtos, token);
+//        if (result > 0)
+//        {
+
+//            dtos = dtos.OrderBy(x => x.Timestamp);
+
+//            FirstByDate = dtos.First();
+//            LastData.AddRange(dtos);
+//        }
+
+//        return result;
+//    }
+
+//    public override async Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token)
+//    {
+//        if (FirstByDate == null)
+//            return null;
+
+//        return await Task.Run(() =>
+//        {
+//            return new DatesRangeDto
+//            {
+//                From = FirstByDate.Timestamp,
+//                To = LastData[^1].Timestamp
+//            };
+//        });
+//    }
+
+//    public override async Task<IEnumerable<TimestampedValuesDto>> GetResampledData(
+//        Guid discriminatorId,
+//        DateTimeOffset dateBegin,
+//        double intervalSec = 600d,
+//        int approxPointsCount = 1024,
+//        CancellationToken token = default)
+//    {
+//        var dtos = LastData.Where(i => i.Timestamp >= dateBegin);
+//        if (LastData.Count == 0 || LastData[0].Timestamp > dateBegin)
+//        {
+//            dtos = await base.GetGtDate(discriminatorId, dateBegin, token);
+//        }
+
+//        var dateEnd = dateBegin.AddSeconds(intervalSec);
+//        dtos = dtos
+//            .Where(i => i.Timestamp <= dateEnd);
+
+//        var ratio = dtos.Count() / approxPointsCount;
+//        if (ratio > 1)
+//            dtos = dtos
+//                .Where((_, index) => index % ratio == 0);
+
+//        return dtos;
+//    }
+//}
+

DD.Persistence.Test/DD.Persistence.Test.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net9.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DD.Persistence\DD.Persistence.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>

DD.Persistence.Test/TimestampedValuesServiceShould.cs

@@ -0,0 +1,58 @@
+using DD.Persistence.Models;
+using DD.Persistence.Repositories;
+using DD.Persistence.Services;
+using NSubstitute;
+
+namespace DD.Persistence.Repository.Test;
+public class TimestampedValuesServiceShould
+{
+    private readonly ITimestampedValuesRepository timestampedValuesRepository = Substitute.For<ITimestampedValuesRepository>();
+    private readonly IDataSchemeRepository dataSchemeRepository = Substitute.For<IDataSchemeRepository>();
+    private TimestampedValuesService timestampedValuesService;
+
+    public TimestampedValuesServiceShould()
+    {
+        timestampedValuesService = new TimestampedValuesService(timestampedValuesRepository, dataSchemeRepository);
+    }
+
+    [Fact]
+    public async Task TestServiceEfficiency()
+    {
+        var discriminatorId = Guid.NewGuid();
+        const int count = 10;
+        var dtos = Generate(count, DateTimeOffset.UtcNow);
+        var addRangeResult = await timestampedValuesService
+            .AddRange(discriminatorId, dtos, CancellationToken.None);
+        Assert.Equal(0, addRangeResult);
+
+        var columnNames = new[] { "A", "B", "C", "D" };
+        var geTimestamp = DateTimeOffset.UtcNow
+            .AddHours(-1)
+            .ToUniversalTime();
+        var getResult = await timestampedValuesService
+            .Get(discriminatorId, geTimestamp, columnNames, 0, count, CancellationToken.None);
+        Assert.NotNull(getResult);
+        Assert.Empty(getResult);
+    }
+
+    private static IEnumerable<TimestampedValuesDto> Generate(int countToCreate, DateTimeOffset from)
+    {
+        var result = new List<TimestampedValuesDto>();
+        for (int i = 0; i < countToCreate; i++)
+        {
+            var values = new Dictionary<string, object>()
+            {
+                { "A", i },
+                { "B", i * 1.1 },
+                { "C", $"Any{i}" },
+                { "D", DateTimeOffset.Now },
+            };
+
+            yield return new TimestampedValuesDto()
+            {
+                Timestamp = from.AddSeconds(i),
+                Values = values
+            };
+        }
+    }
+}

DD.Persistence.sln

@@ -28,6 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionIt
 		Directory.Build.props = Directory.Build.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DD.Persistence.Test", "DD.Persistence.Test\DD.Persistence.Test.csproj", "{B8C774E6-6B75-41AC-B3CF-10BD3623B2FA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -74,6 +76,10 @@ Global
 		{08B03623-A1C9-482F-B60E-09F293E04999}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08B03623-A1C9-482F-B60E-09F293E04999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{08B03623-A1C9-482F-B60E-09F293E04999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8C774E6-6B75-41AC-B3CF-10BD3623B2FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8C774E6-6B75-41AC-B3CF-10BD3623B2FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8C774E6-6B75-41AC-B3CF-10BD3623B2FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8C774E6-6B75-41AC-B3CF-10BD3623B2FA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DD.Persistence/API/ISyncApi.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API;
 

DD.Persistence/API/ISyncWithDiscriminatorApi.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.API;
 

DD.Persistence/API/ITimeSeriesDataApi.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using DD.Persistence.Models;
+using DD.Persistence.ModelsAbstractions;
 
 namespace DD.Persistence.API;
 
@@ -7,7 +7,7 @@ namespace DD.Persistence.API;
 /// Интерфейс для работы с API временных данных
 /// </summary>
 public interface ITimeSeriesDataApi<TDto> : ITimeSeriesBaseDataApi<TDto>
-    where TDto : class, ITimeSeriesAbstractDto, new()
+    where TDto : class, ITimestampAbstractDto, new()
 {
     /// <summary>
     /// Получить список объектов, удовлетворяющий диапазон дат

DD.Persistence/Extensions/EFExtensions.cs

@@ -2,7 +2,7 @@
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace DD.Persistence;
+namespace DD.Persistence.Extensions;
 public static class EFExtensions
 {
     struct TypeAccessor
@@ -23,7 +23,7 @@ public static class EFExtensions
     private static ConcurrentDictionary<Type, Dictionary<string, TypeAccessor>> TypePropSelectors { get; set; } = new();
 
     private static MethodInfo GetExtOrderMethod(string methodName)
-    => typeof(System.Linq.Queryable)
+    => typeof(Queryable)
     .GetMethods()
     .Where(m => m.Name == methodName &&
         m.IsGenericMethodDefinition &&
@@ -66,7 +66,7 @@ public static class EFExtensions
     /// и опционально указания направления сортировки "asc" или "desc"
     /// </param>
     /// <example>
-    /// var query = query("Date desc");
+    /// var query = query("Timestamp desc");
     /// </example>
     /// <returns>Запрос с примененной сортировкой</returns>
     public static IOrderedQueryable<TSource> SortBy<TSource>(

DD.Persistence/Extensions/IEnumerableExtensions.cs

@@ -0,0 +1,32 @@
+namespace DD.Persistence.Extensions;
+
+public static class IEnumerableExtensions
+{
+    public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+    {
+        if (source == null)
+            throw new ArgumentNullException(nameof(source));
+        if (action == null)
+            throw new ArgumentNullException(nameof(action));
+
+        foreach (var item in source)
+        {
+            action(item);
+        }
+    }
+
+    public static bool IsNullOrEmpty<T>(this IEnumerable<T>? enumerable)
+    {
+        if (enumerable == null)
+        {
+            return true;
+        }
+
+        var collection = enumerable as ICollection<T>;
+        if (collection != null)
+        {
+            return collection.Count < 1;
+        }
+        return !enumerable.Any();
+    }
+}

DD.Persistence/Repositories/IChangeLogRepository.cs

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 
 namespace DD.Persistence.Repositories;

DD.Persistence/Repositories/IDataSchemeRepository.cs

@@ -0,0 +1,25 @@
+using DD.Persistence.Models;
+
+namespace DD.Persistence.Repositories;
+
+/// <summary>
+/// Репозиторий для работы со схемами наборов данных
+/// </summary>
+public interface IDataSchemeRepository
+{
+    /// <summary>
+    /// Добавить схему
+    /// </summary>
+    /// <param name="dataSourceSystemDto"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task Add(DataSchemeDto dataSourceSystemDto, CancellationToken token);
+
+    /// <summary>
+    /// Вычитать схему
+    /// </summary>
+    /// <param name="dataSchemeId">Идентификатор схемы</param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DataSchemeDto?> Get(Guid dataSchemeId, CancellationToken token);
+}

DD.Persistence/Repositories/IDataSourceSystemRepository.cs

@@ -3,19 +3,20 @@
 namespace DD.Persistence.Repositories;
 
 /// <summary>
-/// Интерфейс по работе с системами - источниками данных
+/// Репозиторий для работы с системами - источниками данных
 /// </summary>
 public interface IDataSourceSystemRepository
 {
-	/// <summary>
+    /// <summary>
-	/// Добавить систему
+    /// Добавить систему - источник данных
-	/// </summary>
+    /// </summary>
-	/// <param name="dataSourceSystemDto"></param>
+    /// <param name="dataSourceSystemDto"></param>
-	/// <returns></returns>
+    /// <param name="token"></param>
-	public Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token);
+    /// <returns></returns>
+    public Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token);
 
     /// <summary>
-    /// Получить список систем
+    /// Получить список систем - источников данных
     /// </summary>
     /// <returns></returns>
     public Task<IEnumerable<DataSourceSystemDto>> Get(CancellationToken token);

DD.Persistence/Repositories/IParameterRepository.cs

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Repositories;
 public interface IParameterRepository

DD.Persistence/Repositories/ISetpointRepository.cs

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using System.Text.Json;
 
 namespace DD.Persistence.Repositories;

DD.Persistence/Repositories/ISyncRepository.cs

@@ -1,25 +0,0 @@
-using DD.Persistence.Models;
-
-namespace DD.Persistence.Repositories;
-
-/// <summary>
-/// Интерфейс по работе с данными
-/// </summary>
-/// <typeparam name="TDto"></typeparam>
-public interface ISyncRepository<TDto>
-{
-    /// <summary>
-    /// Получить данные, начиная с определенной даты
-    /// </summary>
-    /// <param name="dateBegin">дата начала</param>
-    /// <param name="token"></param>    /// <returns></returns>
-    Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset dateBegin, CancellationToken token);
-
-
-    /// <summary>
-    /// Получить диапазон дат, для которых есть данные в репозитории
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<DatesRangeDto?> GetDatesRange(CancellationToken token);
-}

DD.Persistence/Repositories/ISyncWithDiscriminatorRepository.cs

@@ -1,4 +1,4 @@
-using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 
 namespace DD.Persistence.Repositories;
 

DD.Persistence/Repositories/ITechMessagesRepository.cs

@@ -1,4 +1,5 @@
 using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
 using DD.Persistence.Models.Requests;
 
 namespace DD.Persistence.Repositories

DD.Persistence/Repositories/ITimeSeriesDataRepository.cs

@@ -1,19 +0,0 @@
-using DD.Persistence.Models;
-
-namespace DD.Persistence.Repositories;
-
-/// <summary>
-/// Интерфейс по работе с временными данными
-/// </summary>
-/// <typeparam name="TDto"></typeparam>
-public interface ITimeSeriesDataRepository<TDto> : ISyncRepository<TDto>, ITimeSeriesBaseRepository<TDto>
-    where TDto : class, ITimeSeriesAbstractDto, new()
-{
-    /// <summary>
-    /// Добавление записей
-    /// </summary>
-    /// <param name="dtos"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<int> AddRange(IEnumerable<TDto> dtos, CancellationToken token);
-}

DD.Persistence/Repositories/ITimestampedValuesRepository.cs

@@ -1,17 +1,24 @@
 using DD.Persistence.Models;
+using DD.Persistence.RepositoriesAbstractions;
 
 namespace DD.Persistence.Repositories;
 
 /// <summary>
-/// Репозиторий для хранения разных наборов данных рядов.
+/// Репозиторий для работы с временными данными
-/// idDiscriminator - идентифицирует конкретный набор данных, прим.: циклы измерения АСИБР, или отчет о DrillTest.
-/// idDiscriminator формируют клиенты и только им известно что они обозначают.
-/// Так как данные приходят редко, то их прореживания для построения графиков не предусмотрено.
 /// </summary>
-public interface ITimestampedSetRepository
+public interface ITimestampedValuesRepository : ISyncRepository, ITimeSeriesBaseRepository
 {
     /// <summary>
-    /// Количество записей по указанному набору в БД. Для пагинации.
+    /// Добавление записей
+    /// </summary>
+    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
+    /// <param name="dtos"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token);
+
+    /// <summary>
+    /// Количество записей по указанному набору в БД. Для пагинации
     /// </summary>
     /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
     /// <param name="token"></param>
@@ -28,32 +35,23 @@ public interface ITimestampedSetRepository
     /// <param name="take"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IEnumerable<TimestampedSetDto>> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
+    Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, IEnumerable<string>? columnNames, int skip, int take, CancellationToken token);
 
     /// <summary>
-    /// Диапазон дат за которые есть данные
+    /// Получение данных с начала
     /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
+    /// <param name="takeCount">Количество</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<DatesRangeDto?> GetDatesRange(Guid idDiscriminator, CancellationToken token);
+    Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token);
 
     /// <summary>
-    /// Получить последние данные
+    /// Получение данных с конца
     /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
+    /// <param name="discriminatorId">Дискриминатор (идентификатор) набора</param>
-    /// <param name="columnNames">Фильтр свойств набора. Можно запросить только некоторые свойства из набора</param>
+    /// <param name="takeCount">Количество</param>
-    /// <param name="take"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IEnumerable<TimestampedSetDto>> GetLast(Guid idDiscriminator, IEnumerable<string>? columnNames, int take, CancellationToken token);
+    Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetLast(Guid discriminatorId, int takeCount, CancellationToken token);
-
+}
-    /// <summary>
-    /// Добавление новых данных
-    /// </summary>
-    /// <param name="idDiscriminator">Дискриминатор (идентификатор) набора</param>
-    /// <param name="sets"></param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<int> AddRange(Guid idDiscriminator, IEnumerable<TimestampedSetDto> sets, CancellationToken token);
-}

DD.Persistence/RepositoriesAbstractions/ISyncRepository.cs

@@ -0,0 +1,28 @@
+using DD.Persistence.Models;
+using DD.Persistence.Models.Common;
+
+namespace DD.Persistence.RepositoriesAbstractions;
+
+/// <summary>
+/// Интерфейс по работе с данными
+/// </summary>
+public interface ISyncRepository // ToDo: исчерпывающая абстракция
+{
+    /// <summary>
+    /// Получить данные, начиная с определенной даты
+    /// </summary>
+    /// <param name="discriminatorId"></param>
+    /// <param name="dateBegin">дата начала</param>
+    /// <param name="token"></param>    
+    /// <returns></returns>
+    Task<IEnumerable<Tuple<DateTimeOffset, object[]>>> GetGtDate(Guid discriminatorId, DateTimeOffset dateBegin, CancellationToken token);
+
+
+    /// <summary>
+    /// Получить диапазон дат, для которых есть данные в репозитории
+    /// </summary>
+    /// <param name="discriminatorId"></param>
+    /// <param name="token"></param>
+    /// <returns></returns>
+    Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token);
+}