diff --git a/DD.Persistence.Database/Helpers/FilterBuilder.cs b/DD.Persistence.Database/Helpers/FilterBuilder.cs index 3954989..ea4a4a6 100644 --- a/DD.Persistence.Database/Helpers/FilterBuilder.cs +++ b/DD.Persistence.Database/Helpers/FilterBuilder.cs @@ -96,7 +96,7 @@ public static class FilterBuilder private static Dictionary>> StringSpecifications() where TEntity : IValuesItem => new() { - { OperationEnum.Equal, (int index, string? value) => new ValueEqaulSpec(index, value) }, + { OperationEnum.Equal, (int index, string? value) => new ValueEqualSpec(index, value) }, { OperationEnum.NotEqual, (int index, string? value) => new ValueNotEqualSpec(index, value) }, { OperationEnum.Greate, (int index, string? value) => new ValueGreateSpec(index, value) }, { OperationEnum.GreateOrEqual, (int index, string? value) => new ValueGreateOrEqualSpec(index, value) }, @@ -106,7 +106,7 @@ public static class FilterBuilder private static Dictionary>> DoubleSpecifications() where TEntity : IValuesItem => new() { - { OperationEnum.Equal, (int index, double? value) => new ValueEqaulSpec(index, value) }, + { OperationEnum.Equal, (int index, double? value) => new ValueEqualSpec(index, value) }, { OperationEnum.NotEqual, (int index, double? value) => new ValueNotEqualSpec(index, value) }, { OperationEnum.Greate, (int index, double? value) => new ValueGreateSpec(index, value) }, { OperationEnum.GreateOrEqual, (int index, double? value) => new ValueGreateOrEqualSpec(index, value) }, diff --git a/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs b/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs index 23fd5e4..4153bd0 100644 --- a/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs +++ b/DD.Persistence.Database/Repositories/TimestampedValuesRepository.cs @@ -61,15 +61,15 @@ public class TimestampedValuesRepository : ITimestampedValuesRepository resultQuery = resultQuery.Any() ? resultQuery.Union(query) : query; } var groupedQuery = resultQuery! - .GroupBy(e => e!.DiscriminatorId) + .GroupBy(e => e.DiscriminatorId) .Select(g => KeyValuePair.Create( g.Key, - g.OrderBy(i => i!.Timestamp).Skip(skip).Take(take)) + g.OrderBy(i => i.Timestamp).Skip(skip).Take(take)) ); var entities = await groupedQuery.ToArrayAsync(token); var result = entities.ToDictionary(k => k.Key, v => v.Value.Select(e => ( - e!.Timestamp, + e.Timestamp, e.Values ))); diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpec.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueEqualSpec.cs similarity index 77% rename from DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpec.cs rename to DD.Persistence.Database/Specifications/ValuesItem/ValueEqualSpec.cs index ec87fc1..2eed8c6 100644 --- a/DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpec.cs +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueEqualSpec.cs @@ -7,15 +7,15 @@ namespace DD.Persistence.Database.Specifications.ValuesItem; /// Спецификация эквивалентности значений IValuesItem в соответствии с индексацией /// /// -public class ValueEqaulSpec : Specification +public class ValueEqualSpec : Specification where TEntity : IValuesItem { - public ValueEqaulSpec(int index, string? value) + public ValueEqualSpec(int index, string? value) { Query.Where(e => Convert.ToString(e.Values[index]) == value); } - public ValueEqaulSpec(int index, double? value) + public ValueEqualSpec(int index, double? value) { Query.Where(e => Convert.ToDouble(e.Values[index]) == value); } diff --git a/DD.Persistence.IntegrationTests/Controllers/TimestampedValuesControllerTest.cs b/DD.Persistence.IntegrationTests/Controllers/TimestampedValuesControllerTest.cs index ab1ee20..4eaf415 100644 --- a/DD.Persistence.IntegrationTests/Controllers/TimestampedValuesControllerTest.cs +++ b/DD.Persistence.IntegrationTests/Controllers/TimestampedValuesControllerTest.cs @@ -56,7 +56,7 @@ public class TimestampedValuesControllerTest : BaseIntegrationTest } catch (Exception ex) { - var expectedMessage = $" , "; + var expectedMessage = $"На сервере произошла ошибка, в результате которой он не может успешно обработать запрос"; //assert Assert.Equal(expectedMessage, ex.Message); @@ -78,7 +78,7 @@ public class TimestampedValuesControllerTest : BaseIntegrationTest var timestampBegin = DateTimeOffset.UtcNow.AddDays(-1); var columnNames = new List() { "A", "C" }; var skip = 0; - var take = 6; // (\"A\">3) ( ) + var take = 6; // Ровно столько значений будет удовлетворять фильтру (\"A\">3) (для одного дискриминатора) var customFilter = "(\"A\">3)";