on.nemtina/persistence
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request '#1003 Убрать ненужные модификаторы virtual' (#29) from VirtualCleaning into master
All checks were successful
Unit tests / tests-and-publication (push) Successful in 2m29s
Details

Browse Source 
Reviewed-on: #29
This commit is contained in:
on.nemtina 2025-02-20 14:41:44 +05:00
commit a5037b8967
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DD.Persistence.Database/Repositories/DataSourceSystemRepository.cs
View File

@ -12,7 +12,7 @@ public class DataSourceSystemRepository : IDataSourceSystemRepository
{ {
this.db = db; this.db = db;
} }
protected virtual IQueryable<DataSourceSystem> GetQueryReadOnly() => db.Set<DataSourceSystem>(); protected IQueryable<DataSourceSystem> GetQueryReadOnly() => db.Set<DataSourceSystem>();
public virtual async Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token) public virtual async Task Add(DataSourceSystemDto dataSourceSystemDto, CancellationToken token)
{ {

2
DD.Persistence.Database/Repositories/ParameterRepository.cs
View File

@ -15,7 +15,7 @@ public class ParameterRepository : IParameterRepository
this.db = db; this.db = db;
} }
protected virtual IQueryable<ParameterData> GetQueryReadOnly() => db.Set<ParameterData>(); protected IQueryable<ParameterData> GetQueryReadOnly() => db.Set<ParameterData>();
public async Task<DatesRangeDto> GetDatesRangeAsync(Guid idDiscriminator, CancellationToken token) public async Task<DatesRangeDto> GetDatesRangeAsync(Guid idDiscriminator, CancellationToken token)
{ {

2
DD.Persistence.Database/Repositories/SchemePropertyRepository.cs
View File

@ -12,7 +12,7 @@ public class SchemePropertyRepository : ISchemePropertyRepository
{ {
this.db = db; this.db = db;
} }
protected virtual IQueryable<SchemeProperty> GetQueryReadOnly() => db.Set<SchemeProperty>(); protected IQueryable<SchemeProperty> GetQueryReadOnly() => db.Set<SchemeProperty>();
public virtual async Task AddRange(DataSchemeDto dataSchemeDto, CancellationToken token) public virtual async Task AddRange(DataSchemeDto dataSchemeDto, CancellationToken token)
{ {

2
DD.Persistence.Database/Repositories/SetpointRepository.cs
View File

@ -16,7 +16,7 @@ namespace DD.Persistence.Database.Postgres.Repositories
this.db = db; this.db = db;
} }
protected virtual IQueryable<Setpoint> GetQueryReadOnly() => db.Set<Setpoint>(); protected IQueryable<Setpoint> GetQueryReadOnly() => db.Set<Setpoint>();
public async Task<IEnumerable<SetpointValueDto>> GetCurrent( public async Task<IEnumerable<SetpointValueDto>> GetCurrent(
IEnumerable<Guid> setpointKeys, IEnumerable<Guid> setpointKeys,

2
DD.Persistence.Database/Repositories/TechMessagesRepository.cs
View File

@ -20,7 +20,7 @@ namespace DD.Persistence.Database.Postgres.Repositories
this.sourceSystemRepository = sourceSystemRepository; this.sourceSystemRepository = sourceSystemRepository;
} }
protected virtual IQueryable<TechMessage> GetQueryReadOnly() => db.Set<TechMessage>() protected IQueryable<TechMessage> GetQueryReadOnly() => db.Set<TechMessage>()
.Include(e => e.System); .Include(e => e.System);
public async Task<PaginationContainer<TechMessageDto>> GetPage(PaginationRequest request, CancellationToken token) public async Task<PaginationContainer<TechMessageDto>> GetPage(PaginationRequest request, CancellationToken token)

18
DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs
View File

@ -17,9 +17,9 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
this.schemePropertyRepository = schemePropertyRepository; this.schemePropertyRepository = schemePropertyRepository;
} }
protected virtual IQueryable<TimestampedValues> GetQueryReadOnly() => db.Set<TimestampedValues>(); protected IQueryable<TimestampedValues> GetQueryReadOnly() => db.Set<TimestampedValues>();
public async virtual Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token) public async Task<int> AddRange(Guid discriminatorId, IEnumerable<TimestampedValuesDto> dtos, CancellationToken token)
{ {
var timestampedValuesEntities = dtos.Select(dto => new TimestampedValues() var timestampedValuesEntities = dtos.Select(dto => new TimestampedValues()
{ {
@ -35,7 +35,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return result; return result;
} }
public async virtual Task<IDictionary<Guid, IEnumerable<(DateTimeOffset Timestamp, object[] Values)>>> Get(IEnumerable<Guid> discriminatorIds, public async Task<IDictionary<Guid, IEnumerable<(DateTimeOffset Timestamp, object[] Values)>>> Get(IEnumerable<Guid> discriminatorIds,
DateTimeOffset? geTimestamp, DateTimeOffset? geTimestamp,
TNode? filterTree, TNode? filterTree,
IEnumerable<string>? columnNames, IEnumerable<string>? columnNames,
@ -76,7 +76,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return result; return result;
} }
public async virtual Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token) public async Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetFirst(Guid discriminatorId, int takeCount, CancellationToken token)
{ {
var query = GetQueryReadOnly() var query = GetQueryReadOnly()
.OrderBy(e => e.Timestamp) .OrderBy(e => e.Timestamp)
@ -91,7 +91,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return result; return result;
} }
public async virtual Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetLast(Guid discriminatorId, int takeCount, CancellationToken token) public async Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetLast(Guid discriminatorId, int takeCount, CancellationToken token)
{ {
var query = GetQueryReadOnly() var query = GetQueryReadOnly()
.OrderByDescending(e => e.Timestamp) .OrderByDescending(e => e.Timestamp)
@ -107,7 +107,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
} }
// ToDo: прореживание должно осуществляться до материализации // ToDo: прореживание должно осуществляться до материализации
public async virtual Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetResampledData( public async Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetResampledData(
Guid discriminatorId, Guid discriminatorId,
DateTimeOffset dateBegin, DateTimeOffset dateBegin,
double intervalSec = 600d, double intervalSec = 600d,
@ -128,7 +128,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return result; return result;
} }
public async virtual Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetGtDate(Guid discriminatorId, DateTimeOffset gtTimestamp, CancellationToken token) public async Task<IEnumerable<(DateTimeOffset Timestamp, object[] Values)>> GetGtDate(Guid discriminatorId, DateTimeOffset gtTimestamp, CancellationToken token)
{ {
var gtTimestampUtc = gtTimestamp.ToUniversalTime(); var gtTimestampUtc = gtTimestamp.ToUniversalTime();
var query = GetQueryReadOnly() var query = GetQueryReadOnly()
@ -143,7 +143,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return result; return result;
} }
public async virtual Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token) public async Task<DatesRangeDto?> GetDatesRange(Guid discriminatorId, CancellationToken token)
{ {
var query = GetQueryReadOnly() var query = GetQueryReadOnly()
.GroupBy(entity => entity.DiscriminatorId) .GroupBy(entity => entity.DiscriminatorId)
@ -168,7 +168,7 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository
return dto; return dto;
} }
public async virtual Task<int> Count(Guid discriminatorId, CancellationToken token) public async Task<int> Count(Guid discriminatorId, CancellationToken token)
{ {
var query = GetQueryReadOnly() var query = GetQueryReadOnly()
.Where(e => e.DiscriminatorId == discriminatorId); .Where(e => e.DiscriminatorId == discriminatorId);