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

Merged
merged 8 commits into from
Feb 5, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 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
aab4a98
Updated test results to match new expectations. Simplified logic for …
PTaladay Feb 2, 2025
93fd9f1
Merge remote-tracking branch 'origin/main' into personal/patalada/131564
PTaladay Feb 2, 2025
91e21ed
Fixed unit test after recent changes.
PTaladay Feb 2, 2025
f91af91
Updated more tetst based on recent changes.
PTaladay Feb 2, 2025
8986c3d
Merge remote-tracking branch 'origin/main' into personal/patalada/131564
PTaladay Feb 4, 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))",
"(And (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T00:00:00.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))",
"(And (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T00:00:00.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))",
"(And (FieldLessThan DateTimeStart 2021-01-01T23:59:59.0000000) (FieldGreaterThan DateTimeEnd 2021-01-01T00:00:00.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))",
"(And (FieldLessThanOrEqual DateTimeStart 2021-01-01T23:59:59.0000000) (FieldGreaterThanOrEqual DateTimeEnd 2021-01-01T00:00:00.0000000) (FieldEqual Number 1))",
rewrittenExpression.ToString());
}

Expand Down
7 changes: 2 additions & 5 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 @@ -46,11 +46,8 @@ public override Expression VisitMultiary(MultiaryExpression expression, object c
{
case ({ } low, { } high):
EnsureAllocatedAndPopulated(ref newExpressions, expression.Expressions, i);

newExpressions.Add(low);
newExpressions.Add(new BinaryExpression(high.BinaryOperator, low.FieldName, high.ComponentIndex, high.Value));
newExpressions.Add(high);

newExpressions.Add(new BinaryExpression(high.BinaryOperator, low.FieldName, low.ComponentIndex, high.Value));
newExpressions.Add(new BinaryExpression(low.BinaryOperator, high.FieldName, high.ComponentIndex, low.Value));
i++;
break;
default:
Expand Down
11 changes: 9 additions & 2 deletions test/Microsoft.Health.Fhir.Shared.Tests.E2E/Rest/Import/ImportDateSearchTestFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,21 @@ protected override async Task OnInitializedAsync()
p => SetObservation(p, "1980-05-11"), // 1980-05-11T00:00:00.0000000 <-> 1980-05-11T23:59:59.9999999
p => SetObservation(p, "1980-05-11T16:32:15"), // 1980-05-11T16:32:15.0000000 <-> 1980-05-11T16:32:15.9999999
p => SetObservation(p, "1980-05-11T16:32:15.500"), // 1980-05-11T16:32:15.5000000 <-> 1980-05-11T16:32:15.5000000
p => SetObservation(p, "1981-01-01")); // 1981-01-01T00:00:00.0000000 <-> 1981-12-31T23:59:59.9999999

p => SetObservation(p, "1981-01-01"), // 1981-01-01T00:00:00.0000000 <-> 1981-12-31T23:59:59.9999999
p => SetObservationWithPeriod(p, "1980-05-16", "1980-05-17")); // 1980-05-16T00:00:00.0000000 <-> 1980-05-17T23:59:59.9999999
void SetObservation(Observation observation, string date)
{
observation.Status = ObservationStatus.Final;
observation.AddTestTag(FixtureTag);
observation.Effective = new FhirDateTime(date);
}

void SetObservationWithPeriod(Observation observation, string startDate, string endDate)
{
observation.Status = ObservationStatus.Final;
observation.AddTestTag(FixtureTag);
observation.Effective = new Period(new FhirDateTime(startDate), new FhirDateTime(endDate));
}
}
}
}
Loading
Loading