diff --git a/DD.Persistence.Database/DD.Persistence.Database.csproj b/DD.Persistence.Database/DD.Persistence.Database.csproj index 65f8d54..5a34ccc 100644 --- a/DD.Persistence.Database/DD.Persistence.Database.csproj +++ b/DD.Persistence.Database/DD.Persistence.Database.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -7,6 +7,7 @@ + diff --git a/DD.Persistence.Database/Entity/TimestampedValues.cs b/DD.Persistence.Database/Entity/TimestampedValues.cs index d28e1cf..93acad9 100644 --- a/DD.Persistence.Database/Entity/TimestampedValues.cs +++ b/DD.Persistence.Database/Entity/TimestampedValues.cs @@ -7,7 +7,7 @@ namespace DD.Persistence.Database.Entity; [Table("timestamped_values")] [PrimaryKey(nameof(DiscriminatorId), nameof(Timestamp))] -public class TimestampedValues : ITimestampedItem +public class TimestampedValues : ITimestampedItem, IValuesItem { [Comment("Временная отметка"), Key] public DateTimeOffset Timestamp { get; set; } diff --git a/DD.Persistence.Database/EntityAbstractions/IValuesItem.cs b/DD.Persistence.Database/EntityAbstractions/IValuesItem.cs new file mode 100644 index 0000000..0f2d219 --- /dev/null +++ b/DD.Persistence.Database/EntityAbstractions/IValuesItem.cs @@ -0,0 +1,14 @@ +using DD.Persistence.Database.Entity; + +namespace DD.Persistence.Database.EntityAbstractions; + +/// +/// Сущность с данными, принадлежащими к определенной схеме +/// +public interface IValuesItem +{ + /// + /// Значения + /// + object[] Values { get; set; } +} \ No newline at end of file diff --git a/DD.Persistence.Database/Extensions/SpecificationExtensions.cs b/DD.Persistence.Database/Extensions/SpecificationExtensions.cs new file mode 100644 index 0000000..3bb0bc3 --- /dev/null +++ b/DD.Persistence.Database/Extensions/SpecificationExtensions.cs @@ -0,0 +1,38 @@ +using Ardalis.Specification; +using DD.Persistence.Database.Helpers; +using System.Linq.Expressions; + +namespace DD.Persistence.Database.Postgres.Extensions; + +public static class SpecificationExtensions +{ + public static Expression>? Or(this ISpecification spec, ISpecification otherSpec) + { + var parameter = Expression.Parameter(typeof(T), "x"); + + var exprSpec1 = CombineWhereExpressions(spec.WhereExpressions, parameter); + var exprSpec2 = CombineWhereExpressions(otherSpec.WhereExpressions, parameter); + + Expression? orExpression = exprSpec1 is not null && exprSpec2 is not null + ? Expression.OrElse(exprSpec1, exprSpec2) + : exprSpec1 ?? exprSpec2; + + if (orExpression is null) + return null; + + var lambdaExpr = Expression.Lambda>(orExpression, parameter); + + return lambdaExpr; + } + + public static Expression? CombineWhereExpressions(IEnumerable> whereExpressions, ParameterExpression parameter) + { + Expression? newExpr = null; + foreach (var where in whereExpressions) + { + var expr = ParameterReplacerVisitor.Replace(where.Filter.Body, where.Filter.Parameters[0], parameter); + newExpr = newExpr is null ? expr : Expression.AndAlso(newExpr, expr); + } + return newExpr; + } +} diff --git a/DD.Persistence.Database/Helpers/FilterBuilder.cs b/DD.Persistence.Database/Helpers/FilterBuilder.cs new file mode 100644 index 0000000..2d90284 --- /dev/null +++ b/DD.Persistence.Database/Helpers/FilterBuilder.cs @@ -0,0 +1,106 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; +using DD.Persistence.Database.Postgres.Extensions; +using DD.Persistence.Database.Specifications; +using DD.Persistence.Database.Specifications.ValuesItem; +using DD.Persistence.Filter.Models; +using DD.Persistence.Filter.Models.Abstractions; +using DD.Persistence.Filter.Models.Enumerations; +using DD.Persistence.Filter.Visitors; +using DD.Persistence.Models; +using System.Text.Json; + +namespace DD.Persistence.Database.Postgres.Helpers; +public static class FilterBuilder +{ + public static ISpecification? BuildFilter(this DataSchemeDto dataSchemeDto, TNode root) + where TEntity : IValuesItem + { + var result = dataSchemeDto.BuildSpecificationByNextNode(root); + + return result; + } + + private static ISpecification? BuildSpecificationByNextNode(this DataSchemeDto dataSchemeDto, TNode node) + where TEntity : IValuesItem + { + var visitor = new NodeVisitor?>( + dataSchemeDto.VertexProcessing, + dataSchemeDto.LeafProcessing + ); + + var result = node.AcceptVisitor(visitor); + + return result; + } + + private static ISpecification? VertexProcessing(this DataSchemeDto dataSchemeDto, TVertex vertex) + where TEntity : IValuesItem + { + var leftSpecification = dataSchemeDto.BuildSpecificationByNextNode(vertex.Left); + var rigthSpecification = dataSchemeDto.BuildSpecificationByNextNode(vertex.Rigth); + if (leftSpecification is null) + return rigthSpecification; + if (rigthSpecification is null) + return leftSpecification; + + ISpecification? result = null; + switch (vertex.Operation) + { + case OperationEnum.And: + result = new AndSpecification(leftSpecification, rigthSpecification); + break; + case OperationEnum.Or: + result = new OrSpecification(leftSpecification, rigthSpecification); + break; + } + + return result; + } + + private static ISpecification? LeafProcessing(this DataSchemeDto dataSchemeDto, TLeaf leaf) + where TEntity : IValuesItem + { + var schemeProperty = dataSchemeDto.FirstOrDefault(e => e.PropertyName.Equals(leaf.PropName)); + if (schemeProperty is null) + throw new ArgumentException($"Свойство {leaf.PropName} не найдено в схеме данных"); + + ISpecification? result = null; + switch (schemeProperty.PropertyKind) + { + case JsonValueKind.String: + var stringValue = Convert.ToString(leaf.Value); + var stringSpecifications = StringSpecifications(); + result = stringSpecifications[leaf.Operation](schemeProperty.Index, stringValue); + break; + case JsonValueKind.Number: + var doubleValue = Convert.ToDouble(leaf.Value); + var doubleSpecifications = DoubleSpecifications(); + result = doubleSpecifications[leaf.Operation](schemeProperty.Index, doubleValue); + break; + } + + return result; + } + + private static Dictionary>> StringSpecifications() + where TEntity : IValuesItem => new() + { + { OperationEnum.Equal, (int index, string? value) => new ValueEqaulSpecification(index, value) }, + { OperationEnum.NotEqual, (int index, string? value) => new ValueNotEqualSpecification(index, value) }, + { OperationEnum.Greate, (int index, string? value) => new ValueGreateSpecification(index, value) }, + { OperationEnum.GreateOrEqual, (int index, string? value) => new ValueGreateOrEqualSpecification(index, value) }, + { OperationEnum.Less, (int index, string? value) => new ValueLessSpecification(index, value) }, + { OperationEnum.LessOrEqual, (int index, string? value) => new ValueLessOrEqualSpecification(index, value) } + }; + private static Dictionary>> DoubleSpecifications() + where TEntity : IValuesItem => new() + { + { OperationEnum.Equal, (int index, double? value) => new ValueEqaulSpecification(index, value) }, + { OperationEnum.NotEqual, (int index, double? value) => new ValueNotEqualSpecification(index, value) }, + { OperationEnum.Greate, (int index, double? value) => new ValueGreateSpecification(index, value) }, + { OperationEnum.GreateOrEqual, (int index, double? value) => new ValueGreateOrEqualSpecification(index, value) }, + { OperationEnum.Less, (int index, double? value) => new ValueLessSpecification(index, value) }, + { OperationEnum.LessOrEqual, (int index, double? value) => new ValueLessOrEqualSpecification(index, value) } + }; +} diff --git a/DD.Persistence.Database/Helpers/ParameterReplacerVisitor.cs b/DD.Persistence.Database/Helpers/ParameterReplacerVisitor.cs new file mode 100644 index 0000000..d64ac11 --- /dev/null +++ b/DD.Persistence.Database/Helpers/ParameterReplacerVisitor.cs @@ -0,0 +1,20 @@ +using System.Linq.Expressions; + +namespace DD.Persistence.Database.Helpers; +public class ParameterReplacerVisitor : ExpressionVisitor +{ + private readonly Expression _newExpression; + private readonly ParameterExpression _oldParameter; + + private ParameterReplacerVisitor(ParameterExpression oldParameter, Expression newExpression) + { + _oldParameter = oldParameter; + _newExpression = newExpression; + } + + internal static Expression Replace(Expression expression, ParameterExpression oldParameter, Expression newExpression) + => new ParameterReplacerVisitor(oldParameter, newExpression).Visit(expression); + + protected override Expression VisitParameter(ParameterExpression p) + => p == _oldParameter ? _newExpression : p; +} diff --git a/DD.Persistence.Database/Helpers/QueryBuilders.cs b/DD.Persistence.Database/Helpers/QueryBuilders.cs index 8529230..64783b0 100644 --- a/DD.Persistence.Database/Helpers/QueryBuilders.cs +++ b/DD.Persistence.Database/Helpers/QueryBuilders.cs @@ -23,7 +23,6 @@ public static class QueryBuilders return query; } - public static async Task> ApplyPagination( this IQueryable query, PaginationRequest request, diff --git a/DD.Persistence.Database/Specifications/AndSpecification.cs b/DD.Persistence.Database/Specifications/AndSpecification.cs new file mode 100644 index 0000000..776ce3a --- /dev/null +++ b/DD.Persistence.Database/Specifications/AndSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; + +namespace DD.Persistence.Database.Specifications; +public class AndSpecification : Specification +{ + public AndSpecification(ISpecification first, ISpecification second) + { + if (first is null || second is null) + return; + + ApplyCriteria(first); + ApplyCriteria(second); + } + + private void ApplyCriteria(ISpecification specification) + { + foreach (var criteria in specification.WhereExpressions) + { + Query.Where(criteria.Filter); + } + } +} diff --git a/DD.Persistence.Database/Specifications/OrSpecification.cs b/DD.Persistence.Database/Specifications/OrSpecification.cs new file mode 100644 index 0000000..75e573e --- /dev/null +++ b/DD.Persistence.Database/Specifications/OrSpecification.cs @@ -0,0 +1,15 @@ +using Ardalis.Specification; +using DD.Persistence.Database.Postgres.Extensions; + +namespace DD.Persistence.Database.Specifications; +public class OrSpecification : Specification +{ + public OrSpecification(ISpecification first, ISpecification second) + { + var orExpression = first.Or(second); + if (orExpression == null) + return; + + Query.Where(orExpression); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpecification.cs new file mode 100644 index 0000000..f85153f --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueEqaulSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация эквивалентности значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueEqaulSpecification : Specification + where TEntity : IValuesItem +{ + public ValueEqaulSpecification(int index, string? value) + { + Query.Where(e => Convert.ToString(e.Values[index]) == value); + } + + public ValueEqaulSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) == value); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateOrEqualSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateOrEqualSpecification.cs new file mode 100644 index 0000000..695bffe --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateOrEqualSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация "больше либо равно" для значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueGreateOrEqualSpecification : Specification + where TEntity : IValuesItem +{ + public ValueGreateOrEqualSpecification(int index, string? value) + { + Query.Where(e => string.Compare(Convert.ToString(e.Values[index]), value) >= 0); + } + + public ValueGreateOrEqualSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) >= value); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateSpecification.cs new file mode 100644 index 0000000..f42a7e2 --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueGreateSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация "больше" для значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueGreateSpecification : Specification + where TEntity : IValuesItem +{ + public ValueGreateSpecification(int index, string? value) + { + Query.Where(e => string.Compare(Convert.ToString(e.Values[index]), value) > 0); + } + + public ValueGreateSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) > value); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueLessOrEqualSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueLessOrEqualSpecification.cs new file mode 100644 index 0000000..81709f0 --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueLessOrEqualSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация "меньше либо равно" для значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueLessOrEqualSpecification : Specification + where TEntity : IValuesItem +{ + public ValueLessOrEqualSpecification(int index, string? value) + { + Query.Where(e => string.Compare(Convert.ToString(e.Values[index]), value) <= 0); + } + + public ValueLessOrEqualSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) <= value); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueLessSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueLessSpecification.cs new file mode 100644 index 0000000..4c308d4 --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueLessSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация "меньше" для значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueLessSpecification : Specification + where TEntity : IValuesItem +{ + public ValueLessSpecification(int index, string? value) + { + Query.Where(e => string.Compare(Convert.ToString(e.Values[index]), value) < 0); + } + + public ValueLessSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) < value); + } +} diff --git a/DD.Persistence.Database/Specifications/ValuesItem/ValueNotEqualSpecification.cs b/DD.Persistence.Database/Specifications/ValuesItem/ValueNotEqualSpecification.cs new file mode 100644 index 0000000..668d415 --- /dev/null +++ b/DD.Persistence.Database/Specifications/ValuesItem/ValueNotEqualSpecification.cs @@ -0,0 +1,22 @@ +using Ardalis.Specification; +using DD.Persistence.Database.EntityAbstractions; + +namespace DD.Persistence.Database.Specifications.ValuesItem; + +/// +/// Спецификация неравенства значений IValuesItem в соответствии с индексацией +/// +/// +public class ValueNotEqualSpecification : Specification + where TEntity : IValuesItem +{ + public ValueNotEqualSpecification(int index, string? value) + { + Query.Where(e => Convert.ToString(e.Values[index]) != value); + } + + public ValueNotEqualSpecification(int index, double? value) + { + Query.Where(e => Convert.ToDouble(e.Values[index]) != value); + } +} diff --git a/DD.Persistence.Test/DD.Persistence.Test.csproj b/DD.Persistence.Test/DD.Persistence.Test.csproj index bd3079d..f71b186 100644 --- a/DD.Persistence.Test/DD.Persistence.Test.csproj +++ b/DD.Persistence.Test/DD.Persistence.Test.csproj @@ -16,8 +16,7 @@ - - + diff --git a/DD.Persistence.Test/FilterBuilderShould.cs b/DD.Persistence.Test/FilterBuilderShould.cs new file mode 100644 index 0000000..09735c3 --- /dev/null +++ b/DD.Persistence.Test/FilterBuilderShould.cs @@ -0,0 +1,281 @@ +using Ardalis.Specification.EntityFrameworkCore; +using DD.Persistence.Database.Entity; +using DD.Persistence.Filter.Models; +using DD.Persistence.Filter.Models.Enumerations; +using DD.Persistence.Models; +using DD.Persistence.Database.Postgres.Helpers; +using System.Text.Json; + +namespace DD.Persistence.Test; + +/// ToDo: переписать под Theory +public class FilterBuilderShould +{ + private readonly SpecificationEvaluator SpecificationEvaluator; + public FilterBuilderShould() + { + this.SpecificationEvaluator = new SpecificationEvaluator(); + } + + [Fact] + public void TestFilterBuilding() + { + //arrange + var discriminatorId = Guid.NewGuid(); + var dataSchemeProperties = new SchemePropertyDto[] + { + new SchemePropertyDto() + { + Index = 0, + PropertyName = "A", + PropertyKind = JsonValueKind.String + }, + new SchemePropertyDto() + { + Index = 1, + PropertyName = "B", + PropertyKind = JsonValueKind.Number + }, + new SchemePropertyDto() + { + Index = 2, + PropertyName = "C", + PropertyKind = JsonValueKind.String + } + }; + var dataScheme = new DataSchemeDto(discriminatorId, dataSchemeProperties); + var filterDate = DateTime.Now.AddMinutes(-1); + var root = new TVertex( + OperationEnum.Or, + new TVertex( + OperationEnum.And, + new TLeaf(OperationEnum.Greate, "A", filterDate), + new TLeaf(OperationEnum.Less, "B", 2.22) + ), + new TLeaf(OperationEnum.Equal, "C", "IsEqualText") + ); + var queryableData = new[] + { + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-1), + Values = new object[] { filterDate.AddMinutes(-1), 200, "IsEqualText" } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-2), + Values = new object[] { filterDate.AddMinutes(1), 2.21, "IsNotEqualText" } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-3), + Values = new object[] { filterDate.AddMinutes(-1), 2.22, "IsNotEqualText" } // false + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-4), + Values = new object[] { filterDate.AddMinutes(-1), 2.21, "IsNotEqualText" } // false + } + } + .AsQueryable(); + + //act + var specification = dataScheme.BuildFilter(root); + + //assert + Assert.NotNull(specification); + + var query = SpecificationEvaluator.GetQuery(queryableData, specification); + var result = query.ToList(); + + Assert.NotNull(result); + Assert.NotEmpty(result); + + var expectedCount = 2; + var actualCount = result.Count(); + Assert.Equal(expectedCount, actualCount); + } + + [Fact] + public void TestFilterOperations() + { + //arrange + var discriminatorId = Guid.NewGuid(); + var dataSchemeProperties = new SchemePropertyDto[] + { + new SchemePropertyDto() + { + Index = 0, + PropertyName = "A", + PropertyKind = JsonValueKind.Number + } + }; + var dataScheme = new DataSchemeDto(discriminatorId, dataSchemeProperties); + var root = new TVertex( + OperationEnum.Or, + new TVertex( + OperationEnum.And, + new TVertex( + OperationEnum.And, + new TVertex( + OperationEnum.And, + new TVertex( + OperationEnum.And, + new TLeaf(OperationEnum.Less, "A", 2), + new TLeaf(OperationEnum.LessOrEqual, "A", 1.99) + ), + new TLeaf(OperationEnum.GreateOrEqual, "A", 1.97) + ), + new TLeaf(OperationEnum.Greate, "A", 1.96) + ), + new TLeaf(OperationEnum.NotEqual, "A", 1.98) + ), + new TLeaf(OperationEnum.Equal, "A", 1) + ); + var queryableData = new[] + { + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-1), + Values = new object[] { 1 } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-2), + Values = new object[] { 1.96 } // false + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-3), + Values = new object[] { 1.97 } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-4), + Values = new object[] { 1.98 } // false + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-5), + Values = new object[] { 1.99 } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-6), + Values = new object[] { 2 } // false + } + } + .AsQueryable(); + + //act + var specification = dataScheme.BuildFilter(root); + + //assert + Assert.NotNull(specification); + + var query = SpecificationEvaluator.GetQuery(queryableData, specification); + var result = query.ToList(); + + Assert.NotNull(result); + Assert.NotEmpty(result); + + var expectedCount = 3; + var actualCount = result.Count(); + Assert.Equal(expectedCount, actualCount); + } + + [Fact] + public void TestFilterValues() + { + //arrange + var discriminatorId = Guid.NewGuid(); + var filterDate = DateTimeOffset.Now; + var dataSchemeProperties = new SchemePropertyDto[] + { + new SchemePropertyDto() + { + Index = 0, + PropertyName = "A", + PropertyKind = JsonValueKind.Number + }, + new SchemePropertyDto() + { + Index = 1, + PropertyName = "B", + PropertyKind = JsonValueKind.Number + }, + new SchemePropertyDto() + { + Index = 2, + PropertyName = "C", + PropertyKind = JsonValueKind.String + }, + new SchemePropertyDto() + { + Index = 3, + PropertyName = "D", + PropertyKind = JsonValueKind.String + } + }; + var dataScheme = new DataSchemeDto(discriminatorId, dataSchemeProperties); + + var root = new TVertex( + OperationEnum.Or, + new TVertex( + OperationEnum.Or, + new TVertex( + OperationEnum.Or, + new TLeaf(OperationEnum.Equal, "A", 1), + new TLeaf(OperationEnum.Equal, "B", 1.11) + ), + new TLeaf(OperationEnum.Equal, "C", "IsEqualText") + ), + new TLeaf(OperationEnum.Equal, "D", filterDate) + ); + var queryableData = new[] + { + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-1), + Values = new object[] { 1, 2.22, "IsNotEqualText", DateTimeOffset.Now.AddMinutes(-1) } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-2), + Values = new object[] { 2, 1.11, "IsNotEqualText", DateTimeOffset.Now.AddMinutes(-1) } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-3), + Values = new object[] { 2, 2.22, "IsEqualText", DateTimeOffset.Now.AddMinutes(-1) } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-4), + Values = new object[] { 2, 2.22, "IsNotEqualText", filterDate } // true + }, + new TimestampedValues { + DiscriminatorId = discriminatorId, + Timestamp = DateTimeOffset.Now.AddMinutes(-1), + Values = new object[] { 2, 2.22, "IsNotEqualText", DateTimeOffset.Now.AddMinutes(-1) } // false + } + } + .AsQueryable(); + + //act + var specification = dataScheme.BuildFilter(root); + + //assert + Assert.NotNull(specification); + + var query = SpecificationEvaluator.GetQuery(queryableData, specification); + var result = query.ToList(); + + Assert.NotNull(result); + Assert.NotEmpty(result); + + var expectedCount = 4; + var actualCount = result.Count(); + Assert.Equal(expectedCount, actualCount); + } +} diff --git a/DD.Persistence.Test/TimestampedValuesServiceShould.cs b/DD.Persistence.Test/TimestampedValuesServiceShould.cs index cb62521..e1e7cdc 100644 --- a/DD.Persistence.Test/TimestampedValuesServiceShould.cs +++ b/DD.Persistence.Test/TimestampedValuesServiceShould.cs @@ -1,14 +1,15 @@ -using DD.Persistence.Models; +using DD.Persistence.Models; using DD.Persistence.Repositories; using DD.Persistence.Services; using NSubstitute; +using System.Text.Json; namespace DD.Persistence.Test; public class TimestampedValuesServiceShould { private readonly ITimestampedValuesRepository timestampedValuesRepository = Substitute.For(); private readonly ISchemePropertyRepository dataSchemeRepository = Substitute.For(); - private readonly TimestampedValuesService timestampedValuesService; + private TimestampedValuesService timestampedValuesService; public TimestampedValuesServiceShould() { @@ -44,10 +45,10 @@ public class TimestampedValuesServiceShould { var values = new Dictionary() { - { "A", i }, - { "B", i * 1.1 }, - { "C", $"Any{i}" }, - { "D", DateTimeOffset.Now }, + { "A", GetJsonFromObject(i) }, + { "B", GetJsonFromObject(i * 1.1) }, + { "C", GetJsonFromObject($"Any{i}") }, + { "D", GetJsonFromObject(DateTimeOffset.Now) } }; yield return new TimestampedValuesDto() @@ -57,4 +58,11 @@ public class TimestampedValuesServiceShould }; } } + + private static JsonElement GetJsonFromObject(object value) + { + var jsonString = JsonSerializer.Serialize(value); + var doc = JsonDocument.Parse(jsonString); + return doc.RootElement; + } }