Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Date search doesn't match ranges properly #4762

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fix: Date search doesn't match ranges properly #4762

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2be4c8
Fix to allow date time to be searched against a resource with a span …
PTaladay Dec 31, 2024
b24089e
Updated tests based on recent changes
PTaladay Dec 31, 2024
6b1a5c5
Updated test fixtures. Removed temporary comments.
PTaladay Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Microsoft.Health.Fhir.Core.UnitTests/Features/Search/DateTimeEqualityRewriterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void GivenStartAndEndExpressions_WhenRewritten_AnUpperBoundOnStartIsAdded
Expression rewrittenExpression = inputExpression.AcceptVisitor(DateTimeEqualityRewriter.Instance);

Assert.Equal(
"(And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000))",
"(Or (And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000)) (And (FieldLessThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000)))",
rewrittenExpression.ToString());
}

Expand Down Expand Up @@ -57,7 +57,7 @@ public void GivenStartAndEndExpressionsInReverseOrder_WhenRewritten_AnUpperBound
Expression rewrittenExpression = inputExpression.AcceptVisitor(DateTimeEqualityRewriter.Instance);

Assert.Equal(
"(And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000))",
"(Or (And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000)) (And (FieldLessThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000)))",
rewrittenExpression.ToString());
}

Expand All @@ -72,7 +72,7 @@ public void GivenStartAndEndExclusiveExpressions_WhenRewritten_AnUpperBoundOnSta
Expression rewrittenExpression = inputExpression.AcceptVisitor(DateTimeEqualityRewriter.Instance);

Assert.Equal(
"(And (FieldGreaterThan DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThan DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThan DateTimeEnd 2021-01-01T23:59:59.0000000))",
"(Or (And (FieldGreaterThan DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThan DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThan DateTimeEnd 2021-01-01T23:59:59.0000000)) (And (FieldLessThan DateTimeStart 2021-01-01T00:00:00.0000000) (FieldGreaterThan DateTimeEnd 2021-01-01T23:59:59.0000000)))",
rewrittenExpression.ToString());
}

Expand Down Expand Up @@ -115,7 +115,7 @@ public void GivenStartAndEndExpressionsAndAnUnrelatedExpression_WhenRewritten_An
Expression rewrittenExpression = inputExpression.AcceptVisitor(DateTimeEqualityRewriter.Instance);

Assert.Equal(
"(And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000) (FieldEqual Number 1))",
"(Or (And (FieldGreaterThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldLessThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000) (FieldEqual Number 1)) (And (FieldLessThanOrEqual DateTimeStart 2021-01-01T00:00:00.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T23:59:59.0000000)))",
rewrittenExpression.ToString());
}

Expand Down
10 changes: 7 additions & 3 deletions src/Microsoft.Health.Fhir.Core/Features/Search/Expressions/DateTimeEqualityRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,28 @@ public override Expression VisitSearchParameter(SearchParameterExpression expres
public override Expression VisitMultiary(MultiaryExpression expression, object context)
{
expression = (MultiaryExpression)base.VisitMultiary(expression, context);
bool checkDateTimeAgainstPeriod = false;
if (expression.MultiaryOperation != MultiaryOperator.And)
{
return expression;
}

List<Expression> newExpressions = null;
List<Expression> dateInPeriodExpression = null;
int i = 0;
for (; i < expression.Expressions.Count - 1; i++)
{
switch (MatchPattern(expression.Expressions[i], expression.Expressions[i + 1]))
{
case ({ } low, { } high):
EnsureAllocatedAndPopulated(ref newExpressions, expression.Expressions, i);

EnsureAllocatedAndPopulated(ref dateInPeriodExpression, expression.Expressions, i);
newExpressions.Add(low);
newExpressions.Add(new BinaryExpression(high.BinaryOperator, low.FieldName, high.ComponentIndex, high.Value));
newExpressions.Add(high);

checkDateTimeAgainstPeriod = true;
dateInPeriodExpression.Add(new BinaryExpression(high.BinaryOperator, low.FieldName, low.ComponentIndex, low.Value));
dateInPeriodExpression.Add(new BinaryExpression(low.BinaryOperator, high.FieldName, high.ComponentIndex, high.Value));
i++;
break;
default:
Expand All @@ -65,7 +69,7 @@ public override Expression VisitMultiary(MultiaryExpression expression, object c
newExpressions.Add(expression.Expressions[^1]);
}

return newExpressions == null ? expression : Expression.And(newExpressions);
return newExpressions == null ? expression : checkDateTimeAgainstPeriod ? Expression.Or(Expression.And(newExpressions), Expression.And(dateInPeriodExpression)) : Expression.And(newExpressions);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: For clarity, I think we shouldn't nest ternary operators :)

}

private static (BinaryExpression low, BinaryExpression high) MatchPattern(Expression e1, Expression e2)
Expand Down
Loading
Loading