From 27b9728912655210c7f65d9a6c9c48733427d82f Mon Sep 17 00:00:00 2001 From: Roman Efremov Date: Thu, 13 Feb 2025 16:53:29 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B4?= =?UTF-8?q?=D0=B8=D1=84=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80=D1=8B=20virtua?= =?UTF-8?q?l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/DataSourceSystemRepository.cs | 2 +- .../Repositories/ParameterRepository.cs | 2 +- .../Repositories/SchemePropertyRepository.cs | 2 +- .../Repositories/SetpointRepository.cs | 6 +++--- .../Repositories/TechMessagesRepository.cs | 2 +- .../TimestampedValuesRepository.cs | 18 +++++++++--------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/DD.Persistence.Database/Repositories/DataSourceSystemRepository.cs b/DD.Persistence.Database/Repositories/DataSourceSystemRepository.cs index d9e7fa7..ddde95e 100644 --- a/DD.Persistence.Database/Repositories/DataSourceSystemRepository.cs +++ b/DD.Persistence.Database/Repositories/DataSourceSystemRepository.cs @@ -12,7 +12,7 @@ public class DataSourceSystemRepository : IDataSourceSystemRepository { this.db = db; } - protected virtual IQueryable GetQueryReadOnly() => db.Set(); + protected IQueryable GetQueryReadOnly() => db.Set(); public virtual async Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token) { diff --git a/DD.Persistence.Database/Repositories/ParameterRepository.cs b/DD.Persistence.Database/Repositories/ParameterRepository.cs index c489cd7..5e5d19a 100644 --- a/DD.Persistence.Database/Repositories/ParameterRepository.cs +++ b/DD.Persistence.Database/Repositories/ParameterRepository.cs @@ -15,7 +15,7 @@ public class ParameterRepository : IParameterRepository this.db = db; } - protected virtual IQueryable GetQueryReadOnly() => db.Set(); + protected IQueryable GetQueryReadOnly() => db.Set(); public async Task GetDatesRangeAsync(Guid idDiscriminator, CancellationToken token) { diff --git a/DD.Persistence.Database/Repositories/SchemePropertyRepository.cs b/DD.Persistence.Database/Repositories/SchemePropertyRepository.cs index 26bb8aa..2bfef6c 100644 --- a/DD.Persistence.Database/Repositories/SchemePropertyRepository.cs +++ b/DD.Persistence.Database/Repositories/SchemePropertyRepository.cs @@ -12,7 +12,7 @@ public class SchemePropertyRepository : ISchemePropertyRepository { this.db = db; } - protected virtual IQueryable GetQueryReadOnly() => db.Set(); + protected IQueryable GetQueryReadOnly() => db.Set(); public virtual async Task AddRange(DataSchemeDto dataSchemeDto, CancellationToken token) { diff --git a/DD.Persistence.Database/Repositories/SetpointRepository.cs b/DD.Persistence.Database/Repositories/SetpointRepository.cs index 3cfd9b1..b621a1e 100644 --- a/DD.Persistence.Database/Repositories/SetpointRepository.cs +++ b/DD.Persistence.Database/Repositories/SetpointRepository.cs @@ -16,11 +16,11 @@ namespace DD.Persistence.Database.Postgres.Repositories this.db = db; } - protected virtual IQueryable GetQueryReadOnly() => db.Set(); + protected IQueryable GetQueryReadOnly() => db.Set(); public async Task> GetCurrent( - IEnumerable setpointKeys, - CancellationToken token) + IEnumerable setpointKeys, + CancellationToken token) { var query = GetQueryReadOnly(); diff --git a/DD.Persistence.Database/Repositories/TechMessagesRepository.cs b/DD.Persistence.Database/Repositories/TechMessagesRepository.cs index 15d8fe8..458aa12 100644 --- a/DD.Persistence.Database/Repositories/TechMessagesRepository.cs +++ b/DD.Persistence.Database/Repositories/TechMessagesRepository.cs @@ -20,7 +20,7 @@ namespace DD.Persistence.Database.Postgres.Repositories this.sourceSystemRepository = sourceSystemRepository; } - protected virtual IQueryable GetQueryReadOnly() => db.Set() + protected IQueryable GetQueryReadOnly() => db.Set() .Include(e => e.System); public async Task> GetPage(PaginationRequest request, CancellationToken token) diff --git a/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs b/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs index 4153bd0..63154b1 100644 --- a/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs +++ b/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs @@ -17,9 +17,9 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository this.schemePropertyRepository = schemePropertyRepository; } - protected virtual IQueryable GetQueryReadOnly() => db.Set(); + protected IQueryable GetQueryReadOnly() => db.Set(); - public async virtual Task AddRange(Guid discriminatorId, IEnumerable dtos, CancellationToken token) + public async Task AddRange(Guid discriminatorId, IEnumerable dtos, CancellationToken token) { var timestampedValuesEntities = dtos.Select(dto => new TimestampedValues() { @@ -35,7 +35,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return result; } - public async virtual Task>> Get(IEnumerable discriminatorIds, + public async Task>> Get(IEnumerable discriminatorIds, DateTimeOffset? geTimestamp, TNode? filterTree, IEnumerable? columnNames, @@ -76,7 +76,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return result; } - public async virtual Task> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token) + public async Task> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token) { var query = GetQueryReadOnly() .OrderBy(e => e.Timestamp) @@ -91,7 +91,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return result; } - public async virtual Task> GetLast(Guid discriminatorId, int takeCount, CancellationToken token) + public async Task> GetLast(Guid discriminatorId, int takeCount, CancellationToken token) { var query = GetQueryReadOnly() .OrderByDescending(e => e.Timestamp) @@ -107,7 +107,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository } // ToDo: прореживание должно осуществляться до материализации - public async virtual Task> GetResampledData( + public async Task> GetResampledData( Guid discriminatorId, DateTimeOffset dateBegin, double intervalSec = 600d, @@ -128,7 +128,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return result; } - public async virtual Task> GetGtDate(Guid discriminatorId, DateTimeOffset gtTimestamp, CancellationToken token) + public async Task> GetGtDate(Guid discriminatorId, DateTimeOffset gtTimestamp, CancellationToken token) { var gtTimestampUtc = gtTimestamp.ToUniversalTime(); var query = GetQueryReadOnly() @@ -143,7 +143,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return result; } - public async virtual Task GetDatesRange(Guid discriminatorId, CancellationToken token) + public async Task GetDatesRange(Guid discriminatorId, CancellationToken token) { var query = GetQueryReadOnly() .GroupBy(entity => entity.DiscriminatorId) @@ -168,7 +168,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository return dto; } - public async virtual Task Count(Guid discriminatorId, CancellationToken token) + public async Task Count(Guid discriminatorId, CancellationToken token) { var query = GetQueryReadOnly() .Where(e => e.DiscriminatorId == discriminatorId); -- 2.45.2