LaunchContext for initialExpression #2025

FikriMilano · 2023-06-06T04:08:08Z

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

Fixes #2024 #2102

Description

Pass launchContext map to fhirEngine evaluator when evaluating initialExpression
Refactor list to map when setting launchContext resources in QuestionnaireFragment
Only validates the launchContext name system and type value, since the name code and name display has become a variable
Only gets the launch contexts resource map, filtered based on the matching nameCode values found in the launchContextExtensions list

Alternative(s) considered
N/A

Type
Feature

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).

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

FikriMilano · 2023-07-31T03:12:55Z

@jingtang10 this is ready for review

@omarismail94 feel free to review as well, I updated some of the code you written

…tial-expression-cannot-find-resource-bug

omarismail94

Nice change @FikriMilano ! A few comments to address

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt

...pture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesTest.kt

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

…tial-expression-cannot-find-resource-bug

This reverts commit d2d53a2.

FikriMilano · 2023-10-06T10:19:14Z

@omarismail94 I'll be back on SDK work on Monday next week, the updates should be ready by that week. Same for my other PRs.

…tial-expression-cannot-find-resource-bug

FikriMilano · 2023-10-09T13:44:20Z

@omarismail94 @jingtang10
this PR is ready for review

omarismail94

Very nice change!

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt

...pture/src/test/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnairesTest.kt

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

…tial-expression-cannot-find-resource-bug

FikriMilano · 2023-10-13T07:17:29Z

@omarismail94 @jingtang10 this PR is ready for review again

completed

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

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

- google#2025 (comment) - google#2025 (comment)

* Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Address Jing's Review - #2025 (comment) - #2025 (comment)

* Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API

* Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Address Jing's Review - google#2025 (comment) - google#2025 (comment)

* Update material3 theme. * Support m3 night mode. * Address review comments. * Address review comments. * Apply m3 default style to survey button. * Use default typography. * Fix broken dependabot.yaml syntax (fixes #2195) (#2234) * Moves commons to Hapi 6.8, removes caffeine and forces guava-android (#2241) * Bump up common library version to 0.1.0-alpha05 (#2243) * Update material3 theme in demo app. (#2211) * Update material3 theme. * Support m3 night mode. * Address review comments. * Address review comments. * Change the color order. --------- Co-authored-by: Santosh Pingle <[email protected]> * Fix broken dependabot.yaml syntax again (re. #2195) (#2242) * SdkSuppress FhirSyncWorkerBenchmark oneTimeSync_50patients (re. #2235) (#2236) * Allow custom package server in Knowledge Manager (#2244) * Allow custom package server in Knowledge Manager * Fix downloader test * Fix workflow library * Update knowledge/src/main/java/com/google/android/fhir/knowledge/files/NpmFileManager.kt Co-authored-by: aditya-07 <[email protected]> * Fix build * Add try catch for package download --------- Co-authored-by: aditya-07 <[email protected]> * Bump up the version of knowledge manager (#2258) * Migrates engine to HAPI 6.8 while forcing Workflow to stay on 6.0 (#2245) * Migrates engine to HAPI 6.8 while forcing Workflow to stay on 6.0 * comment * Migrates Workflow to CQL Evaluator 3.0.0-PRE9-SNAPSHOT (#2259) * Updates dependencies * Updates test cases * Removes moxy and antlr from dependencies. * Migrates the workflow to the new API * Migrates workflow testing to the new API * Fixes workflow benchmark module * Fixes workflow benchmark module * Adds contents.txt file to all test repos so it can be loaded on androidTest * Normalizes path before trying to open files * Uses contents.txt when running tests on Android * Spotless * Updating Json and XML comparisons to pass when elements are just out of order. * Ignores testANCDT17 for now * LaunchContext for initialExpression (#2025) * Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Renames patientId param to subject to: (#2263) 1. clarify the need to send a full reference "type/id" instead of just the ID 2. match the evaluator's name * Follow up PR of 2025 (#2265) * Use launchContext for initialExpression * Test ResourceMapper * Fix test * Fix launchContexts for demo app when editing patient * spotlessApply * WIP * Revert "WIP" This reverts commit d2d53a2. * spotlessApply * Fix test * Refactor validateLaunchContextExtension * Remove QuestionnaireLaunchContextSet enum class * Rename vars and functions * Add code comment for MoreResourceTypes.kt * Unit testing * Fix post-merge-conflict * spotlessApply * Address review * spotlessApply * Revert un-intended changes * Fix failing checks * Remove check of must contain 2 sub-extensions * Update Kdoc * Revert * validate launch context when using populate public API * Address Jing's Review - #2025 (comment) - #2025 (comment) * Bump com.squareup:kotlinpoet from 1.12.0 to 1.14.2 (#2255) Bumps [com.squareup:kotlinpoet](https://github.com/square/kotlinpoet) from 1.12.0 to 1.14.2. - [Release notes](https://github.com/square/kotlinpoet/releases) - [Changelog](https://github.com/square/kotlinpoet/blob/main/docs/changelog.md) - [Commits](square/kotlinpoet@1.12.0...1.14.2) --- updated-dependencies: - dependency-name: com.squareup:kotlinpoet dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jing Tang <[email protected]> * Bump androidx.build.gradle.gcpbuildcache (#2266) Bumps androidx.build.gradle.gcpbuildcache from 1.0.0-beta01 to 1.0.0-beta05. --- updated-dependencies: - dependency-name: androidx.build.gradle.gcpbuildcache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Omar Ismail <[email protected]> * Bump com.spotify.ruler:ruler-gradle-plugin from 1.2.1 to 1.4.0 (#2253) Bumps [com.spotify.ruler:ruler-gradle-plugin](https://github.com/spotify/ruler) from 1.2.1 to 1.4.0. - [Release notes](https://github.com/spotify/ruler/releases) - [Changelog](https://github.com/spotify/ruler/blob/main/changelog.md) - [Commits](spotify/ruler@v1.2.1...v1.4.0) --- updated-dependencies: - dependency-name: com.spotify.ruler:ruler-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump com.diffplug.spotless:spotless-plugin-gradle from 6.21.0 to 6.22.0 (#2252) Bumps [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) from 6.21.0 to 6.22.0. - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](diffplug/spotless@gradle/6.21.0...gradle/6.22.0) --- updated-dependencies: - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/checkout from 3 to 4 (#2248) Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jing Tang <[email protected]> * Update dependencies in engine colab (#2268) * Update dependencies in engine colab * update datacapture * Bump styfle/cancel-workflow-action from 0.7.0 to 0.12.0 (#2250) Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.7.0 to 0.12.0. - [Release notes](https://github.com/styfle/cancel-workflow-action/releases) - [Commits](styfle/cancel-workflow-action@0.7.0...0.12.0) --- updated-dependencies: - dependency-name: styfle/cancel-workflow-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump actions/upload-artifact from 2 to 3 (#2249) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update the version of resource after updates are downloaded from the server (#2272) * Update the version of resource after updates are downloaded from the server * Review changes: Added tests and refactored code * Review comments updates --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Santosh Pingle <[email protected]> Co-authored-by: Michael Vorburger ⛑️ <[email protected]> Co-authored-by: Vitor Pamplona <[email protected]> Co-authored-by: Jing Tang <[email protected]> Co-authored-by: aditya-07 <[email protected]> Co-authored-by: aditya-07 <[email protected]> Co-authored-by: Fikri Milano <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Omar Ismail <[email protected]>

FikriMilano requested review from a team and santosh-pingle as code owners June 6, 2023 04:08

FikriMilano requested a review from jingtang10 June 6, 2023 04:08

FikriMilano mentioned this pull request Jun 6, 2023

Declare resources to be used to populate QuestionnaireResponse via ActionParameter opensrp/fhircore#2408

Closed

jingtang10 requested changes Jul 12, 2023

View reviewed changes

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt Outdated Show resolved Hide resolved

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt Outdated Show resolved Hide resolved

omarismail94 assigned FikriMilano Jul 18, 2023

FikriMilano changed the title ~~Fix finding resource for initialExpression bug~~ Use launchContext for initialExpression Jul 27, 2023

FikriMilano added 2 commits July 31, 2023 10:06

Use launchContext for initialExpression

9fa64b6

Test ResourceMapper

8b765fd

FikriMilano force-pushed the 2024-initial-expression-cannot-find-resource-bug branch from 96f08f8 to 8b765fd Compare July 31, 2023 03:10

FikriMilano requested a review from jingtang10 July 31, 2023 03:12

FikriMilano added 5 commits July 31, 2023 14:43

Fix test

59c7d6a

Merge branch 'master' of github.com:google/android-fhir into 2024-ini…

a4c8c8f

…tial-expression-cannot-find-resource-bug

Fix launchContexts for demo app when editing patient

45a6ae0

spotlessApply

9686da8

WIP

d2d53a2

omarismail94 assigned omarismail94 and unassigned FikriMilano Aug 10, 2023

omarismail94 reviewed Aug 14, 2023

View reviewed changes

omarismail94 assigned FikriMilano and unassigned omarismail94 Aug 15, 2023

FikriMilano added 4 commits August 23, 2023 14:56

Merge branch 'master' of github.com:google/android-fhir into 2024-ini…

14fa29c

…tial-expression-cannot-find-resource-bug

Revert "WIP"

9c4210d

This reverts commit d2d53a2.

spotlessApply

33b3d03

Fix test

45c6dbf

FikriMilano mentioned this pull request Sep 12, 2023

Support launchContext for other resource #2102

Closed

FikriMilano added 3 commits September 12, 2023 18:42

Refactor validateLaunchContextExtension

6a47a51

Remove QuestionnaireLaunchContextSet enum class

3f0b4f6

Rename vars and functions

ddc1dfc

FikriMilano added 6 commits October 9, 2023 16:27

Address review

28c86be

Merge branch 'master' of github.com:google/android-fhir into 2024-ini…

a6436e2

…tial-expression-cannot-find-resource-bug

spotlessApply

287512c

Merge branch 'master' of github.com:google/android-fhir into 2024-ini…

d5d4069

…tial-expression-cannot-find-resource-bug

Revert un-intended changes

8fec91e

Fix failing checks

a21e6f7

FikriMilano requested review from jingtang10 and omarismail94 October 9, 2023 13:43

omarismail94 reviewed Oct 11, 2023

View reviewed changes

FikriMilano added 5 commits October 13, 2023 09:06

Remove check of must contain 2 sub-extensions

8130aef

Update Kdoc

f6f6b3c

Merge branch 'master' of github.com:google/android-fhir into 2024-ini…

b412e16

…tial-expression-cannot-find-resource-bug

Revert

ad51a70

validate launch context when using populate public API

41a957d

FikriMilano changed the title ~~Use launchContext for initialExpression~~ LaunchContext for initialExpression Oct 13, 2023

FikriMilano requested a review from omarismail94 October 13, 2023 07:17

omarismail94 approved these changes Oct 13, 2023

View reviewed changes

omarismail94 merged commit caf4c14 into google:master Oct 13, 2023
5 checks passed

FikriMilano mentioned this pull request Oct 13, 2023

Migrate to the new launchContext public API opensrp/fhircore#2818

Open

jingtang10 reviewed Oct 13, 2023

View reviewed changes

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

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

FikriMilano added a commit to opensrp/android-fhir that referenced this pull request Oct 14, 2023

Address Jing's Review

8a2a52a

- google#2025 (comment) - google#2025 (comment)

FikriMilano mentioned this pull request Oct 14, 2023

Follow up PR of 2025 #2265

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LaunchContext for initialExpression #2025

LaunchContext for initialExpression #2025

FikriMilano commented Jun 6, 2023 •

edited

Loading

FikriMilano commented Jul 31, 2023

omarismail94 left a comment

FikriMilano commented Oct 6, 2023

FikriMilano commented Oct 9, 2023

omarismail94 left a comment

FikriMilano commented Oct 13, 2023

LaunchContext for initialExpression #2025

LaunchContext for initialExpression #2025

Conversation

FikriMilano commented Jun 6, 2023 • edited Loading

FikriMilano commented Jul 31, 2023

omarismail94 left a comment

Choose a reason for hiding this comment

FikriMilano commented Oct 6, 2023

FikriMilano commented Oct 9, 2023

omarismail94 left a comment

Choose a reason for hiding this comment

FikriMilano commented Oct 13, 2023

FikriMilano commented Jun 6, 2023 •

edited

Loading