Support initial expression extension in questionnaire population #1295

RaaziaTarique · 2022-04-14T11:41:31Z

IMPORTANT: All PRs must be linked to an issue (except for extremely trivial and straightforward changes).

Description
Added functionality to use FhirPath functions such as today(), now() and etc.
Previously these functions were not supported in SDK because it was only using the extracted resource from the FhirPath expression and in case of FhirPath functions, the FhirPath Expressions doesn't have any resource name in it.

Alternative(s) considered
Have you considered any alternatives? And if so, why have you chosen the approach in this PR?

Type
Choose one: Feature

Screenshots (if applicable)

Checklist

I have read and acknowledged the Code of conduct.
I have read the Contributing page.
I have signed the Google Individual CLA, or I am covered by my company's Corporate CLA.
I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the style guide of this project.
I have run ./gradlew check and ./gradlew connectedCheck to test my changes locally.
I have built and run the demo app(s) to verify my change fixes the issue and/or does not break the demo app(s).

…3_advance_behaviour

… evaluate method.

…3_advance_behaviour

- Add test cases in ResourceMapperTest.kt

…3_advance_behaviour

codecov · 2022-04-14T12:38:57Z

Codecov Report

Merging #1295 (6c33f0d) into master (d33bbf4) will increase coverage by 0.01%.
The diff coverage is 91.30%.

@@             Coverage Diff              @@
##             master    #1295      +/-   ##
============================================
+ Coverage     84.53%   84.54%   +0.01%     
- Complexity      684      688       +4     
============================================
  Files           148      148              
  Lines         10687    10699      +12     
  Branches        826      827       +1     
============================================
+ Hits           9034     9046      +12     
  Misses         1244     1244              
  Partials        409      409

Impacted Files	Coverage Δ
...android/fhir/datacapture/mapping/ResourceMapper.kt	`83.65% <91.30%> (+1.00%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fccb883...6c33f0d. Read the comment docs.

jingtang10

can you please create an issue in the codebase, so that in the validator API, we will throw an exception if inital value and intial value expression are both present.

reference this url: http:https://build.fhir.org/ig/HL7/sdc/expressions.html

and this sentence: Since both initial.value and initialExpression generate values before the user has access to the form, it is not allowed to have both present on a Questionnaire.item.

jingtang10 · 2022-04-14T14:43:43Z

datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt

+ .addItem(
+ Questionnaire.QuestionnaireItemComponent().apply {
+ linkId = "patient-dob"
+ type = Questionnaire.QuestionnaireItemType.TEXT


why isn't this DATE type?

jingtang10 · 2022-04-14T14:44:31Z

datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt

+ val patient = Patient().apply { id = "Patient/$patientId/_history/2" }
+ val questionnaireResponse = ResourceMapper.populate(questionnaire, patient)
+
+ assertThat((questionnaireResponse.item[0].answer[0].value as DateType).localDate)


Suggested change

assertThat((questionnaireResponse.item[0].answer[0].value as DateType).localDate)

assertThat((questionnaireResponse.item.single().answer.single().value as DateType).localDate)

jingtang10 · 2022-04-14T14:47:09Z

datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt

+ val patient = Patient().apply { id = "Patient/$patientId/_history/2" }
+ val questionnaireResponse = ResourceMapper.populate(questionnaire, patient)
+
+ assertThat((questionnaireResponse.item[0].answer[0].value as DateType).localDate)


can you compare the two DateTypes directly instead of converting them to local date?

look at the equalsDeep function in HAPI lib.

then your assert becomes something like this:

assert(this.equalsDeep(that)).isTrue()

I tried to use equalsDeep but it was returning false because of the minor time difference in currentDate and date returned from FHIRPath Function.
I added another assertions to make sure that FHIRPath Function returns currentDate
assertThat(fhirFunctionDateType.isToday).isTrue()

jingtang10 · 2022-04-14T14:47:41Z

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt

@@ -514,7 +548,7 @@ private fun wrapAnswerInFieldType(answer: Base, fieldType: Field): Base {
 return answer
 }

-private const val ITEM_INITIAL_EXPRESSION_URL: String =
+const val ITEM_INITIAL_EXPRESSION_URL: String =


can this be internal?

jingtang10 · 2022-04-14T14:48:06Z

datacapture/src/test/java/com/google/android/fhir/datacapture/mapping/ResourceMapperTest.kt

@@ -21,6 +21,7 @@ import android.os.Build
 import androidx.test.core.app.ApplicationProvider
 import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.parser.IParser
+import com.google.android.fhir.datacapture.views.localDate


this can be removed - see later comment.

Reason mentioned here #1295 (comment)

jingtang10 · 2022-04-14T14:50:00Z

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt

+ // extension function for evaluating provided initial expression and using the result as an
+ // initial value of the QuestionnaireItemComponent


Suggested change

// extension function for evaluating provided initial expression and using the result as an

// initial value of the QuestionnaireItemComponent

// Extension function for evaluating provided initial expression and using the result as an

// initial value of the QuestionnaireItemComponent.

jingtang10 · 2022-04-14T14:56:32Z

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt

- )
- }
- }
+ questionnaireItem.setInitialValueFromInitialExpression(resources = resources.asList())


please rename populateInitialValue to populateIntialValueWithInitialExpression.

…3_advance_behaviour

RaaziaTarique · 2022-04-19T13:26:26Z

@jingtang10, I have incorporated all the requested changes. Kindly re-review this PR.

jingtang10

What's the relationship between this PR and #1228?

I worked on #1228 and added some refactoring.

RaaziaTarique · 2022-04-21T06:56:30Z

What's the relationship between this PR and #1228?

I worked on #1228 and added some refactoring.

I created this PR as I don't have write access of https://github.com/google/android-fhir repo. I have resolved the changes that you requested earlier on this PR due to the same reason.

jingtang10 · 2022-04-21T10:33:18Z

Thanks @RaaziaTarique

RaaziaTarique and others added 30 commits March 10, 2022 09:04

- today() support added in initial expression

01ba81c

- spotless apply

117f474

- Enhance initialExpression support

cb89b67

Merge branch 'master' into 1033_advance_behaviour

9e4ca7f

- Enhance initialExpression support modifications

2b96744

Merge branch 'master' into 1033_advance_behaviour

512f760

Create blank.yml

a41fc00

Delete blank.yml

7db66c7

Merge branch 'google:master' into master

49b2be7

- Testing commit

03baeb2

- Testing commit changes reverted

b078aef

- Use ExpressionNode to evaluate expression

03ac5e9

Merge remote-tracking branch 'origin/1033_advance_behaviour' into 103…

dffe99c

…3_advance_behaviour

Merge branch 'master' into 1033_advance_behaviour

5b1d462

- Reduce step one of expression evaluation to use only one expression…

9a26aab

… evaluate method.

Merge remote-tracking branch 'origin/1033_advance_behaviour' into 103…

ed18ff5

…3_advance_behaviour

- Simplify ResourceMapper.kt

a3deda3

- Add test cases in ResourceMapperTest.kt

- Simply Code

2f004af

- Remove extract answers from expressions using definition code.

5d12a9e

Merge branch 'master' into 1033_advance_behaviour

6197c6f

- Resolve requested changes.

ffc9709

Merge branch 'master' into 1033_advance_behaviour

dacf027

- Resolve requested changes.

8d7ad14

- Fix failing test cases.

e048cb3

- Address requested changes

b630b16

Merge branch 'master' into 1033_advance_behaviour

31d78d9

- Code refactor

5284d6c

Merge branch 'master' into 1033_advance_behaviour

b2b6187

Merge branch 'master' into 1033_advance_behaviour

34e7e81

- Resolve requested changes.

5a32c3f

RaaziaTarique added 3 commits April 5, 2022 11:15

- Resolve requested changes.

c67a406

Merge branch 'master' into 1033_advance_behaviour

82f7a23

Merge branch 'google:master' into master

a6d9efd

RaaziaTarique requested review from aditya-07, jingtang10 and ktarasenko as code owners April 14, 2022 11:41

RaaziaTarique added 2 commits April 14, 2022 13:41

Merge branch 'master' into 1033_advance_behaviour

e646465

Merge remote-tracking branch 'origin/1033_advance_behaviour' into 103…

fb13ecd

…3_advance_behaviour

jingtang10 changed the title ~~Initial expression support extension~~ Support initial expression extension in questionnaire population Apr 14, 2022

jingtang10 requested changes Apr 14, 2022

View reviewed changes

- Resolve requested changes

15db2f9

RaaziaTarique requested a review from jingtang10 April 15, 2022 12:38

RaaziaTarique added 5 commits April 17, 2022 14:59

Merge branch 'google:master' into master

0952ecc

Merge branch 'master' into 1033_advance_behaviour

fac727f

Merge branch 'master' into 1033_advance_behaviour

44902c5

Merge remote-tracking branch 'origin/1033_advance_behaviour' into 103…

4df347a

…3_advance_behaviour

Merge branch 'master' into 1033_advance_behaviour

4308280

RaaziaTarique requested review from kevinmost, stevenckngaa, vvikramraj and yigit as code owners April 19, 2022 07:20

Merge branch 'master' into 1033_advance_behaviour

6c33f0d

jingtang10 reviewed Apr 20, 2022

View reviewed changes

RaaziaTarique closed this Apr 21, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support initial expression extension in questionnaire population #1295

Support initial expression extension in questionnaire population #1295

RaaziaTarique commented Apr 14, 2022

codecov bot commented Apr 14, 2022 •

edited

Loading

jingtang10 left a comment

jingtang10 Apr 14, 2022

jingtang10 Apr 14, 2022

jingtang10 Apr 14, 2022

RaaziaTarique Apr 15, 2022

jingtang10 Apr 14, 2022

jingtang10 Apr 14, 2022

RaaziaTarique Apr 15, 2022

jingtang10 Apr 14, 2022

jingtang10 Apr 14, 2022

RaaziaTarique commented Apr 19, 2022

jingtang10 left a comment

RaaziaTarique commented Apr 21, 2022 •

edited

Loading

jingtang10 commented Apr 21, 2022

	assertThat((questionnaireResponse.item[0].answer[0].value as DateType).localDate)
	assertThat((questionnaireResponse.item.single().answer.single().value as DateType).localDate)

		// extension function for evaluating provided initial expression and using the result as an
		// initial value of the QuestionnaireItemComponent

Support initial expression extension in questionnaire population #1295

Support initial expression extension in questionnaire population #1295

Conversation

RaaziaTarique commented Apr 14, 2022

codecov bot commented Apr 14, 2022 • edited Loading

Codecov Report

jingtang10 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RaaziaTarique commented Apr 19, 2022

jingtang10 left a comment

Choose a reason for hiding this comment

RaaziaTarique commented Apr 21, 2022 • edited Loading

jingtang10 commented Apr 21, 2022

codecov bot commented Apr 14, 2022 •

edited

Loading

RaaziaTarique commented Apr 21, 2022 •

edited

Loading