Fix: Date search doesn't match ranges properly #4762
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and if included in the span that resource will be returned.
PTaladay
added
Bug
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
test/Microsoft.Health.Fhir.Shared.Tests.E2E/Rest/Search/DateSearchTests.cs
Dismissed
Show dismissed
Hide dismissed
| @@ -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); | |||
There was a problem hiding this comment.
nit: For clarity, I think we shouldn't nest ternary operators :)
| @@ -214,5 +214,27 @@ public async Task GivenAnOutOfRangeDateTimeSearchParam_WhenSearched_ThenExceptio | |||
| fce.StatusCode == HttpStatusCode.BadRequest, | |||
| $"A '{nameof(FhirClientException)}' with '{HttpStatusCode.BadRequest}' status code was expected, but instead a '{nameof(FhirClientException)}' with '{fce.StatusCode}' status code was raised. Url: {Client.HttpClient.BaseAddress}. Activity Id: {fce.Response.GetRequestId()}. Error: {fce.Message}"); | |||
| } | |||
|
|
|||
| [Theory] | |||
| [InlineData("1981-05-16T16:32:15.500", 7)] // This should include the observation containing a period since the date is in that effective period. | |||
There was a problem hiding this comment.
This test shouldn't pass. The search is for 1981 but the data is in 1980.
|
|
||
| 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)); |
There was a problem hiding this comment.
I think this could be simplified by having it be:
newExpressions.Add(new BinaryExpression(high.BinaryOperator, low.FieldName, low.ComponentIndex, high.Value));
newExpressions.Add(new BinaryExpression(low.BinaryOperator, high.FieldName, high.ComponentIndex, low.Value));
You could then remove the dateInPeriodExpression variable, the old newExpressions assignments on lines 52-54, and the Or Expression on line 72.
The current generated SQL is
(StartDateTime >= '2022-05-01T00:00:00.0000000Z' AND StartDateTime <= '2022-05-01T23:59:59.9999999Z' AND EndDateTime <= '2022-05-01T23:59:59.9999999Z' )
OR
(StartDateTime <= '2022-05-01T00:00:00.0000000Z' AND EndDateTime >= '2022-05-01T23:59:59.9999999Z' )
and this would change it to be
StartDateTime <= '2022-05-01T23:59:59.9999999Z' AND EndDateTime >= '2022-05-01T00:00:00.0000000Z'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Updates the logic to check if the date time is within the range on a given resource and if so will return that resource.
Related issues
Addresses [issue AB#131564].
Testing
Added additional unit test for validation and ran existing test to verify no new issues introduced.
FHIR Team Checklist
Semver Change (docs)
Patch|Skip|Feature|Breaking (reason)