From c751f74b35e05f1aa09b9fdf4f24542ea3b83a75 Mon Sep 17 00:00:00 2001
From: Olga Nemt <on.nemtina@digitaldrilling.ru>
Date: Thu, 21 Nov 2024 17:02:36 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D1=81=D1=83?=
 =?UTF-8?q?=D1=84=D1=84=D0=B8=D0=BA=D1=81=20"Async"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/TimeSeriesController.cs       | 18 +++++++----
 Persistence.API/Program.cs                    |  3 ++
 .../TimeSeriesDataCachedRepository.cs         | 27 ++++++++++++----
 .../Repositories/TimeSeriesDataRepository.cs  | 30 +++++++++--------
 Persistence/API/IChangeLogApi.cs              | 12 +++----
 Persistence/API/IDictionaryElementApi.cs      |  8 ++---
 Persistence/API/ISetpointApi.cs               |  8 ++---
 Persistence/API/ISyncApi.cs                   |  2 +-
 Persistence/API/ITableDataApi.cs              |  2 +-
 ...phDataApi.cs => ITimeSeriesBaseDataApi.cs} | 10 +++---
 Persistence/API/ITimeSeriesDataApi.cs         | 14 ++------
 Persistence/Models/ChangeLogDto.cs            |  2 +-
 .../Repositories/ISetpointRepository.cs       |  6 ++--
 .../Repositories/ITableDataRepository.cs      |  2 +-
 ...sitory.cs => ITimeSeriesBaseRepository.cs} |  6 ++--
 .../Repositories/ITimeSeriesDataRepository.cs | 32 +------------------
 16 files changed, 85 insertions(+), 97 deletions(-)
 rename Persistence/API/{IGraphDataApi.cs => ITimeSeriesBaseDataApi.cs} (61%)
 rename Persistence/Repositories/{IGraphDataRepository.cs => ITimeSeriesBaseRepository.cs} (76%)

diff --git a/Persistence.API/Controllers/TimeSeriesController.cs b/Persistence.API/Controllers/TimeSeriesController.cs
index e6c74ef..d4491cc 100644
--- a/Persistence.API/Controllers/TimeSeriesController.cs
+++ b/Persistence.API/Controllers/TimeSeriesController.cs
@@ -19,24 +19,30 @@ public class TimeSeriesController<TDto> : ControllerBase, ITimeSeriesDataApi<TDt
 
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
-    public async Task<IActionResult> GetAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token)
+    public async Task<IActionResult> Get(DateTimeOffset dateBegin, CancellationToken token)
     {
-        var result = await this.timeSeriesDataRepository.GetAsync(dateBegin, dateEnd, token);
+        var result = await this.timeSeriesDataRepository.GetGtDate(dateBegin, token);
         return Ok(result);
-
     }
 
     [HttpGet("datesRange")]
-    public async Task<IActionResult> GetDatesRangeAsync(CancellationToken token)
+    public async Task<IActionResult> GetDatesRange(CancellationToken token)
     {
-        var result = await this.timeSeriesDataRepository.GetDatesRangeAsync(token);
+        var result = await this.timeSeriesDataRepository.GetDatesRange(token);
         return Ok(result);
     }
 
+    public Task<IActionResult> GetResampledData(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024)
+    {
+        throw new NotImplementedException();
+    }
+
     [HttpPost]
-    public async Task<IActionResult> InsertRangeAsync(IEnumerable<TDto> dtos, CancellationToken token)
+    public async Task<IActionResult> InsertRange(IEnumerable<TDto> dtos, CancellationToken token)
     {
         var result = await this.timeSeriesDataRepository.InsertRange(dtos, token);
         return Ok(result);
     }
+
+
 }
diff --git a/Persistence.API/Program.cs b/Persistence.API/Program.cs
index 93e62a1..bc54d92 100644
--- a/Persistence.API/Program.cs
+++ b/Persistence.API/Program.cs
@@ -1,10 +1,13 @@
 
+using Persistence.Models;
+
 namespace Persistence.API;
 
 public class Program
 {
     public static void Main(string[] args)
     {
+
         var host = CreateHostBuilder(args).Build();
         Startup.BeforeRunHandler(host);
         host.Run();
diff --git a/Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs b/Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs
index 4a553ac..7c9d06e 100644
--- a/Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs
+++ b/Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs
@@ -10,8 +10,8 @@ public class TimeSeriesDataCachedRepository<TEntity, TDto> : TimeSeriesDataRepos
     where TEntity : class, ITimestampedData, new()
     where TDto : class, ITimeSeriesAbstractDto, new()
 {
-    public static TDto FirstByDate { get; set; } = default!;
-    public static CyclicArray<TDto> LastData { get; set; } = null!;
+    public static TDto? FirstByDate { get; private set; }
+    public static CyclicArray<TDto> LastData { get; } = new CyclicArray<TDto>(CacheItemsCount);
 
     private const int CacheItemsCount = 3600;
 
@@ -19,8 +19,6 @@ public class TimeSeriesDataCachedRepository<TEntity, TDto> : TimeSeriesDataRepos
     {
         Task.Run(async () =>
         {
-            LastData = new CyclicArray<TDto>(CacheItemsCount);
-            
             var firstDateItem = await base.GetFirstAsync(CancellationToken.None);
             if (firstDateItem == null)
             {
@@ -35,17 +33,17 @@ public class TimeSeriesDataCachedRepository<TEntity, TDto> : TimeSeriesDataRepos
         }).Wait();
     }
 
-    public override async Task<IEnumerable<TDto>> GetAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token)
+    public override async Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset dateBegin, CancellationToken token)
     {
 
         if (LastData.Count() == 0 || LastData[0].Date > dateBegin)
         {
-            var dtos = await base.GetAsync(dateBegin, dateEnd, token);
+            var dtos = await base.GetGtDate(dateBegin, token);
             return dtos;
         }
 
         var items = LastData
-            .Where(i => i.Date >= dateBegin && i.Date <= dateEnd);
+            .Where(i => i.Date >= dateBegin);
 
         return items;
     }
@@ -64,5 +62,20 @@ public class TimeSeriesDataCachedRepository<TEntity, TDto> : TimeSeriesDataRepos
 
         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
+            };
+        });        
+    }
 }
 
diff --git a/Persistence.Repository/Repositories/TimeSeriesDataRepository.cs b/Persistence.Repository/Repositories/TimeSeriesDataRepository.cs
index 9b339a5..ec255cb 100644
--- a/Persistence.Repository/Repositories/TimeSeriesDataRepository.cs
+++ b/Persistence.Repository/Repositories/TimeSeriesDataRepository.cs
@@ -18,16 +18,7 @@ public class TimeSeriesDataRepository<TEntity, TDto> : ITimeSeriesDataRepository
 
     protected virtual IQueryable<TEntity> GetQueryReadOnly() => this.db.Set<TEntity>();
 
-    public virtual async Task<IEnumerable<TDto>> GetAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token)
-    {
-        var query = GetQueryReadOnly();
-        var entities = await query.ToArrayAsync(token);
-        var dtos = entities.Select(e => e.Adapt<TDto>());
-
-        return dtos;
-    }
-
-    public virtual async Task<DatesRangeDto> GetDatesRangeAsync(CancellationToken token)
+    public virtual async Task<DatesRangeDto?> GetDatesRange(CancellationToken token)
     {
         var query = GetQueryReadOnly();
         var minDate = await query.MinAsync(o => o.Date, token);
@@ -42,6 +33,13 @@ public class TimeSeriesDataRepository<TEntity, TDto> : ITimeSeriesDataRepository
 
     public virtual async Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset date, CancellationToken token)
     {
+        //var query = GetQueryReadOnly()
+        //    .Where(q => q.Date >= dateBegin);
+        //var entities = await query.ToArrayAsync(token);
+        //var dtos = entities.Select(e => e.Adapt<TDto>());
+
+        //return dtos;
+
         var query = this.db.Set<TEntity>().Where(e => e.Date > date);
         var entities = await query.ToArrayAsync(token);
 
@@ -60,7 +58,7 @@ public class TimeSeriesDataRepository<TEntity, TDto> : ITimeSeriesDataRepository
         return result;
     }
 
-    public async Task<IEnumerable<TDto>> GetLastAsync(int takeCount, CancellationToken token)
+    protected async Task<IEnumerable<TDto>> GetLastAsync(int takeCount, CancellationToken token)
     {
         var query = GetQueryReadOnly()
             .OrderByDescending(e => e.Date)
@@ -72,17 +70,23 @@ public class TimeSeriesDataRepository<TEntity, TDto> : ITimeSeriesDataRepository
         return dtos;
     }
 
-    public async Task<TDto?> GetFirstAsync(CancellationToken token)
+    protected async Task<TDto?> GetFirstAsync(CancellationToken token)
     {
         var query = GetQueryReadOnly()
             .OrderBy(e => e.Date);
 
         var entity = await query.FirstOrDefaultAsync(token);
 
-        if(entity == null)
+        if (entity == null)
             return null;
 
         var dto = entity.Adapt<TDto>();
         return dto;
     }
+
+    public Task<IEnumerable<TDto>> GetResampledData(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024)
+    {
+        //todo
+        throw new NotImplementedException();
+    }
 }
diff --git a/Persistence/API/IChangeLogApi.cs b/Persistence/API/IChangeLogApi.cs
index 716944e..bb4a3c3 100644
--- a/Persistence/API/IChangeLogApi.cs
+++ b/Persistence/API/IChangeLogApi.cs
@@ -31,7 +31,7 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="dto"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> AddAsync(TDto dto, CancellationToken token);
+    Task<ActionResult<int>> Add(TDto dto, CancellationToken token);
 
     /// <summary>
     /// Добавить несколько записей
@@ -39,7 +39,7 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="dtos"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> AddRangeAsync(IEnumerable<TDto> dtos, CancellationToken token);
+    Task<ActionResult<int>> AddRange(IEnumerable<TDto> dtos, CancellationToken token);
 
     /// <summary>
     /// Обновить одну запись
@@ -47,7 +47,7 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="dto"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> UpdateAsync(TDto dto, CancellationToken token);
+    Task<ActionResult<int>> Update(TDto dto, CancellationToken token);
 
     /// <summary>
     /// Обновить несколько записей
@@ -55,7 +55,7 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="dtos"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> UpdateRangeAsync(IEnumerable<TDto> dtos, CancellationToken token);
+    Task<ActionResult<int>> UpdateRange(IEnumerable<TDto> dtos, CancellationToken token);
 
     /// <summary>
     /// Удалить одну запись
@@ -63,7 +63,7 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="id"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> DeleteAsync(int id, CancellationToken token);
+    Task<ActionResult<int>> Delete(int id, CancellationToken token);
 
     /// <summary>
     /// Удалить несколько записей
@@ -71,5 +71,5 @@ public interface IChangeLogApi<TDto, TChangeLogDto>
     /// <param name="ids"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> DeleteRangeAsync(IEnumerable<int> ids, CancellationToken token);
+    Task<ActionResult<int>> DeleteRange(IEnumerable<int> ids, CancellationToken token);
 }
diff --git a/Persistence/API/IDictionaryElementApi.cs b/Persistence/API/IDictionaryElementApi.cs
index 540d454..fac7870 100644
--- a/Persistence/API/IDictionaryElementApi.cs
+++ b/Persistence/API/IDictionaryElementApi.cs
@@ -13,7 +13,7 @@ public interface IDictionaryElementApi<TDto> where TDto : class, new()
     /// <param name="dictionaryKey">ключ справочника</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<TDto>>> GetAsync(Guid dictionaryKey, CancellationToken token);
+    Task<ActionResult<IEnumerable<TDto>>> Get(Guid dictionaryKey, CancellationToken token);
 
     /// <summary>
     /// Добавить элемент в справочник
@@ -22,7 +22,7 @@ public interface IDictionaryElementApi<TDto> where TDto : class, new()
     /// <param name="dto"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<Guid>> AddAsync(Guid dictionaryKey, TDto dto, CancellationToken token);
+    Task<ActionResult<Guid>> Add(Guid dictionaryKey, TDto dto, CancellationToken token);
 
     /// <summary>
     /// Изменить одну запись
@@ -32,7 +32,7 @@ public interface IDictionaryElementApi<TDto> where TDto : class, new()
     /// <param name="dto"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<Guid>> UpdateAsync(Guid dictionaryKey, Guid dictionaryElementKey, TDto dto, CancellationToken token);
+    Task<ActionResult<Guid>> Update(Guid dictionaryKey, Guid dictionaryElementKey, TDto dto, CancellationToken token);
 
     /// <summary>
     /// Удалить одну запись
@@ -41,5 +41,5 @@ public interface IDictionaryElementApi<TDto> where TDto : class, new()
     /// <param name="dictionaryElementKey">ключ элемента в справочнике</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> DeleteAsync(Guid dictionaryKey, Guid dictionaryElementKey, CancellationToken token);
+    Task<ActionResult<int>> Delete(Guid dictionaryKey, Guid dictionaryElementKey, CancellationToken token);
 }
diff --git a/Persistence/API/ISetpointApi.cs b/Persistence/API/ISetpointApi.cs
index d086557..7af0895 100644
--- a/Persistence/API/ISetpointApi.cs
+++ b/Persistence/API/ISetpointApi.cs
@@ -14,7 +14,7 @@ public interface ISetpointApi
     /// <param name="setpoitKeys">ключи уставок</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrentAsync(IEnumerable<Guid> setpoitKeys, CancellationToken token);
+    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetCurrent(IEnumerable<Guid> setpoitKeys, CancellationToken token);
 
     /// <summary>
     /// Получить значения уставок за определенный момент времени
@@ -23,7 +23,7 @@ public interface ISetpointApi
     /// <param name="historyMoment">дата, на которую получаем данные</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistoryAsync(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
+    Task<ActionResult<IEnumerable<SetpointValueDto>>> GetHistory(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
 
     /// <summary>
     /// Получить историю изменений значений уставок
@@ -31,7 +31,7 @@ public interface ISetpointApi
     /// <param name="setpoitKeys">ключи уставок</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLogAsync(IEnumerable<Guid> setpoitKeys, CancellationToken token);
+    Task<ActionResult<Dictionary<Guid, IEnumerable<SetpointLogDto>>>> GetLog(IEnumerable<Guid> setpoitKeys, CancellationToken token);
 
     /// <summary>
     /// Метод сохранения уставки
@@ -40,5 +40,5 @@ public interface ISetpointApi
     /// <param name="newValue">значение</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<int>> SaveAsync(Guid setpointKey, object newValue, CancellationToken token);
+    Task<ActionResult<int>> Save(Guid setpointKey, object newValue, CancellationToken token);
 }
diff --git a/Persistence/API/ISyncApi.cs b/Persistence/API/ISyncApi.cs
index 9df4301..7f72812 100644
--- a/Persistence/API/ISyncApi.cs
+++ b/Persistence/API/ISyncApi.cs
@@ -15,7 +15,7 @@ public interface ISyncApi<TDto> where TDto : class, new()
     /// <param name="take">количество записей</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<TDto>>> GetPartAsync(DateTimeOffset dateBegin, int take = 24 * 60 * 60, CancellationToken token = default);
+    Task<ActionResult<IEnumerable<TDto>>> GetPart(DateTimeOffset dateBegin, int take = 24 * 60 * 60, CancellationToken token = default);
 
     /// <summary>
     /// Получить диапазон дат, для которых есть данные в репозитории
diff --git a/Persistence/API/ITableDataApi.cs b/Persistence/API/ITableDataApi.cs
index ae7099c..a310799 100644
--- a/Persistence/API/ITableDataApi.cs
+++ b/Persistence/API/ITableDataApi.cs
@@ -19,5 +19,5 @@ public interface ITableDataApi<TDto, TRequest>
     /// <param name="request">параметры фильтрации</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<PaginationContainer<TDto>>> GetPageAsync(TRequest request, CancellationToken token);
+    Task<ActionResult<PaginationContainer<TDto>>> GetPage(TRequest request, CancellationToken token);
 }
diff --git a/Persistence/API/IGraphDataApi.cs b/Persistence/API/ITimeSeriesBaseDataApi.cs
similarity index 61%
rename from Persistence/API/IGraphDataApi.cs
rename to Persistence/API/ITimeSeriesBaseDataApi.cs
index b609f2f..16b7f2b 100644
--- a/Persistence/API/IGraphDataApi.cs
+++ b/Persistence/API/ITimeSeriesBaseDataApi.cs
@@ -4,23 +4,23 @@ using Persistence.Models;
 namespace Persistence.API;
 
 /// <summary>
-/// Интерфейс для работы с API графиков
+/// Базовый интерфейс для работы с временными рядами
 /// </summary>
-public interface IGraphDataApi<TDto>
+public interface ITimeSeriesBaseDataApi<TDto>
 {
     /// <summary>
-    /// Получить список объектов с прореживанием, удовлетворящий диапазону дат
+    /// Получить список объектов с прореживанием, удовлетворяющий диапазону дат
     /// </summary>
     /// <param name="dateBegin">дата начала</param>
     /// <param name="dateEnd">дата окончания</param>
     /// <param name="approxPointsCount"></param>
     /// <returns></returns>
-    Task<ActionResult<IEnumerable<TDto>>> GetThinnedDataAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024);
+    Task<IActionResult> GetResampledData(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024);
 
     /// <summary>
     /// Получить диапазон дат, для которых есть данные в репозитории
     /// </summary>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<ActionResult<DatesRangeDto>> GetDatesRangeAsync(CancellationToken token);
+    Task<IActionResult> GetDatesRange(CancellationToken token);
 }
diff --git a/Persistence/API/ITimeSeriesDataApi.cs b/Persistence/API/ITimeSeriesDataApi.cs
index a6a0363..a2406aa 100644
--- a/Persistence/API/ITimeSeriesDataApi.cs
+++ b/Persistence/API/ITimeSeriesDataApi.cs
@@ -11,24 +11,16 @@ namespace Persistence.API;
 /// <summary>
 /// Интерфейс для работы с API временных данных
 /// </summary>
-public interface ITimeSeriesDataApi<TDto>
+public interface ITimeSeriesDataApi<TDto> : ITimeSeriesBaseDataApi<TDto>
     where TDto : class, ITimeSeriesAbstractDto, new()
 {
     /// <summary>
     /// Получить список объектов, удовлетворяющий диапазон дат
     /// </summary>
     /// <param name="dateBegin">дата начала</param>
-    /// <param name="dateEnd">дата окончания</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IActionResult> GetAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token);
-
-    /// <summary>
-    /// Получить диапазон дат, для которых есть данные в репозитории
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<IActionResult> GetDatesRangeAsync(CancellationToken token);
+    Task<IActionResult> Get(DateTimeOffset dateBegin, CancellationToken token);
 
     /// <summary>
     /// Добавление записей
@@ -36,7 +28,7 @@ public interface ITimeSeriesDataApi<TDto>
     /// <param name="dtos"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IActionResult> InsertRangeAsync(IEnumerable<TDto> dtos, CancellationToken token);
+    Task<IActionResult> InsertRange(IEnumerable<TDto> dtos, CancellationToken token);
 
 
 }
diff --git a/Persistence/Models/ChangeLogDto.cs b/Persistence/Models/ChangeLogDto.cs
index 5d5e7f5..6b2a090 100644
--- a/Persistence/Models/ChangeLogDto.cs
+++ b/Persistence/Models/ChangeLogDto.cs
@@ -26,7 +26,7 @@ public class ChangeLogDto<T> where T: class
     public DateTimeOffset Creation { get; set; }
 
     /// <summary>
-    /// Дата устаревания (например при удалении)
+    /// Дата устаревания (например, при удалении)
     /// </summary>
     public DateTimeOffset? Obsolete { get; set; }
 
diff --git a/Persistence/Repositories/ISetpointRepository.cs b/Persistence/Repositories/ISetpointRepository.cs
index 4253657..1e1e2c3 100644
--- a/Persistence/Repositories/ISetpointRepository.cs
+++ b/Persistence/Repositories/ISetpointRepository.cs
@@ -15,7 +15,7 @@ public interface ISetpointRepository
     /// <param name="historyMoment">дата, на которую получаем данные</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IEnumerable<SetpointValueDto>> GetHistoryAsync(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
+    Task<IEnumerable<SetpointValueDto>> GetHistory(IEnumerable<Guid> setpoitKeys, DateTimeOffset historyMoment, CancellationToken token);
 
     /// <summary>
     /// Получить историю изменений значений уставок
@@ -23,7 +23,7 @@ public interface ISetpointRepository
     /// <param name="setpoitKeys"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLogAsync(IEnumerable<Guid> setpoitKeys, CancellationToken token);
+    Task<Dictionary<Guid, IEnumerable<SetpointLogDto>>> GetLog(IEnumerable<Guid> setpoitKeys, CancellationToken token);
 
     /// <summary>
     /// Метод сохранения уставки
@@ -35,5 +35,5 @@ public interface ISetpointRepository
     /// <returns></returns>
     /// to do
     /// id User учесть в соответствующем методе репозитория
-    Task<int> SaveAsync(Guid setpointKey, int idUser, object newValue, CancellationToken token);
+    Task<int> Save(Guid setpointKey, int idUser, object newValue, CancellationToken token);
 }
diff --git a/Persistence/Repositories/ITableDataRepository.cs b/Persistence/Repositories/ITableDataRepository.cs
index 22ec55c..73d332d 100644
--- a/Persistence/Repositories/ITableDataRepository.cs
+++ b/Persistence/Repositories/ITableDataRepository.cs
@@ -15,5 +15,5 @@ public interface ITableDataRepository<TDto, TRequest>
     /// <param name="request">параметры фильтрации</param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IEnumerable<TDto>> GetAsync(TRequest request, CancellationToken token);
+    Task<IEnumerable<TDto>> Get(TRequest request, CancellationToken token);
 }
diff --git a/Persistence/Repositories/IGraphDataRepository.cs b/Persistence/Repositories/ITimeSeriesBaseRepository.cs
similarity index 76%
rename from Persistence/Repositories/IGraphDataRepository.cs
rename to Persistence/Repositories/ITimeSeriesBaseRepository.cs
index d110ffa..5e99582 100644
--- a/Persistence/Repositories/IGraphDataRepository.cs
+++ b/Persistence/Repositories/ITimeSeriesBaseRepository.cs
@@ -5,7 +5,7 @@ namespace Persistence.Repositories;
 /// <summary>
 /// Интерфейс по работе с прореженными данными
 /// </summary>
-public interface IGraphDataRepository<TDto>
+public interface ITimeSeriesBaseRepository<TDto>
     where TDto : class, new()
 {
     /// <summary>
@@ -15,12 +15,12 @@ public interface IGraphDataRepository<TDto>
     /// <param name="dateEnd">дата окончания</param>
     /// <param name="approxPointsCount"></param>
     /// <returns></returns>
-    Task<IEnumerable<TDto>> GetThinnedDataAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024);
+    Task<IEnumerable<TDto>> GetResampledData(DateTimeOffset dateBegin, DateTimeOffset dateEnd, int approxPointsCount = 1024);
 
     /// <summary>
     /// Получить диапазон дат, для которых есть данные в репозитории
     /// </summary>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<DatesRangeDto> GetDatesRangeAsync(CancellationToken token);
+    Task<DatesRangeDto?> GetDatesRange(CancellationToken token);
 }
diff --git a/Persistence/Repositories/ITimeSeriesDataRepository.cs b/Persistence/Repositories/ITimeSeriesDataRepository.cs
index f3e49eb..9de7fc7 100644
--- a/Persistence/Repositories/ITimeSeriesDataRepository.cs
+++ b/Persistence/Repositories/ITimeSeriesDataRepository.cs
@@ -6,24 +6,9 @@ namespace Persistence.Repositories;
 /// Интерфейс по работе с временными данными
 /// </summary>
 /// <typeparam name="TDto"></typeparam>
-public interface ITimeSeriesDataRepository<TDto> : ISyncRepository<TDto>
+public interface ITimeSeriesDataRepository<TDto> : ISyncRepository<TDto>, ITimeSeriesBaseRepository<TDto>
     where TDto : class, ITimeSeriesAbstractDto, new()
 {
-    /// <summary>
-    /// Получить страницу списка объектов
-    /// </summary>
-    /// <param name="dateBegin">дата начала</param>
-    /// <param name="dateEnd">дата окончания</param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<IEnumerable<TDto>> GetAsync(DateTimeOffset dateBegin, DateTimeOffset dateEnd, CancellationToken token);
-
-    /// <summary>
-    /// Получить диапазон дат, для которых есть данные в репозитории
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<DatesRangeDto> GetDatesRangeAsync(CancellationToken token);
     /// <summary>
     /// Добавление записей
     /// </summary>
@@ -31,19 +16,4 @@ public interface ITimeSeriesDataRepository<TDto> : ISyncRepository<TDto>
     /// <param name="token"></param>
     /// <returns></returns>
     Task<int> InsertRange(IEnumerable<TDto> dtos, CancellationToken token);
-
-    /// <summary>
-    /// Получение списка последних записей
-    /// </summary>
-    /// <param name="takeCount">количество записей</param>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<IEnumerable<TDto>> GetLastAsync(int takeCount, CancellationToken token);
-
-    /// <summary>
-    /// Получение первой записи
-    /// </summary>
-    /// <param name="token"></param>
-    /// <returns></returns>
-    Task<TDto?> GetFirstAsync(CancellationToken token);
 }