Migrate to latest FHIR engine SDK #2718

ellykits · 2023-08-29T09:18:35Z

IMPORTANT: Where possible all PRs must be linked to a Github issue

Fixes #2563 or Closes #2708

Engineer Checklist

I have written Unit tests for any new feature(s) and edge cases for bug fixes
I have added any strings visible on UI components to the strings.xml file
I have updated the CHANGELOG.md file for any notable changes to the codebase
I have run ./gradlew spotlessApply and ./gradlew spotlessCheck to check my code follows the project's style guide
I have built and run the FHIRCore app to verify my change fixes the issue and/or does not break the app
I have checked that this PR does NOT introduce breaking changes that require an update to Content and/or Configs? If it does add a sample here or a link to exactly what changes need to be made to the content.

Code Reviewer Checklist

I have verified Unit tests have been written for any new feature(s) and edge cases
I have verified any strings visible on UI components are in the strings.xml file
I have verifed the CHANGELOG.md file has any notable changes to the codebase
I have verified the solution has been implemented in a configurable and generic way for reuseable components
I have built and run the FHIRCore app to verify the change fixes the issue and/or does not break the app

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

- Update sync and other code implementations using FhirEngine Search API Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

codecov · 2023-09-01T09:35:06Z

Codecov Report

Merging #2718 (fd51f26) into main (ad3a737) will increase coverage by 1.0%.
Report is 47 commits behind head on main.
The diff coverage is 62.9%.

@@            Coverage Diff            @@
##              main   #2718     +/-   ##
=========================================
+ Coverage     64.5%   65.6%   +1.0%     
+ Complexity    1075    1050     -25     
=========================================
  Files          218     220      +2     
  Lines         9635    9814    +179     
  Branches      1897    1801     -96     
=========================================
+ Hits          6218    6439    +221     
- Misses        2234    2272     +38     
+ Partials      1183    1103     -80

Flag	Coverage Δ
engine	`72.3% <69.3%> (-0.4%)`	⬇️
geowidget	`65.5% <33.3%> (+1.1%)`	⬆️
quest	`61.0% <58.9%> (+2.0%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
...ata/remote/fhir/resource/FhirResourceDataSource.kt	`93.3% <0.0%> (+0.4%)`	⬆️
...hircore/engine/domain/model/FhirResourceConfigs.kt	`43.2% <0.0%> (-1.3%)`	⬇️
...ster/fhircore/engine/p2p/dao/BaseP2PTransferDao.kt	`86.6% <0.0%> (-3.8%)`	⬇️
...martregister/fhircore/engine/sync/AppSyncWorker.kt	`91.6% <0.0%> (-8.4%)`	⬇️
...ter/fhircore/engine/sync/OpenSrpDownloadManager.kt	`42.8% <0.0%> (ø)`
...rtregister/fhircore/engine/sync/SyncBroadcaster.kt	`30.4% <0.0%> (-2.9%)`	⬇️
...rcore/engine/util/extension/BigDecimalExtension.kt	`0.0% <0.0%> (ø)`
...ore/engine/util/helper/TransformSupportServices.kt	`80.0% <0.0%> (-2.8%)`	⬇️
...ter/fhircore/quest/data/QuestXFhirQueryResolver.kt	`0.0% <0.0%> (-100.0%)`	⬇️
...fhircore/quest/ui/appsetting/AppSettingActivity.kt	`0.0% <0.0%> (-48.4%)`	⬇️
... and 51 more

... and 33 files with indirect coverage changes

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

pld · 2023-09-12T09:14:20Z

android/engine/src/main/java/org/smartregister/fhircore/engine/p2p/dao/BaseP2PTransferDao.kt

@@ -92,7 +91,7 @@ constructor(
    classType: Class<out Resource>,
  ): List<Resource> {
    return withContext(dispatcherProvider.io()) {
-      val searchQuery =
+      /* val searchQuery =


can we remove these lines?

This will be done in a separate PR #2730

pld · 2023-09-12T18:06:34Z

...oid/engine/src/test/java/org/smartregister/fhircore/engine/p2p/dao/BaseP2PTransferDaoTest.kt

@@ -158,7 +159,7 @@ class BaseP2PTransferDaoTest : RobolectricTest() {
    }
    val searchQuerySlot = slot<SearchQuery>()

-    coVerify { fhirEngine.search<Patient>(capture(searchQuerySlot)) }
+    //    coVerify { fhirEngine.search<Patient>(capture(searchQuerySlot)) }


can we remove

Will be addressed via PR #2730

pld · 2023-09-12T18:10:32Z

...est/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireActivity.kt

@@ -130,8 +130,6 @@ class QuestionnaireActivity : BaseMultiLanguageActivity() {
          }

          registerFragmentResultListener()
-
-          viewModel.setProgressState(QuestionnaireProgressState.QuestionnaireLaunch(false))


why is this no longer necessary?

The progress dialog is dismissed in the finally section of the try-catch block.

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits · 2023-09-13T11:14:51Z

This PR requires re-installation of the app.

* Upgrade dependencies Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix app crash Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Upgrade more gradle dependencies Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Upgrade test dependencies Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Delete unused class Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor repositories to use new Search API SearchResult Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor code with latest SDK changes - Update sync and other code implementations using FhirEngine Search API Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix focus requester on PinCell UI Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor geowidget and engine tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor quest module tests Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix failing tests for engine module Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Delete duplicated test classes Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Fix package name on CI script Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Resolve failing tests in quest module Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Refactor QuestionnaireResponse/Questionnaire validation implementation Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Format code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Replace the resource.db file in assets Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Cleanup unused code Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> * Replace resources.zip file Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com> --------- Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits added 19 commits August 23, 2023 14:15

Upgrade dependencies

3d54a4e

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix app crash

bef9c87

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Upgrade more gradle dependencies

7e740a7

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Upgrade test dependencies

5536c50

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into upgrade-gradle-dependencies

32559a4

Delete unused class

128d1be

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into upgrade-gradle-dependencies

afeb385

Merge branch 'main' into upgrade-gradle-dependencies

f8dcfbf

Refactor repositories to use new Search API SearchResult

a29d5a5

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Refactor code with latest SDK changes

79e01fb

- Update sync and other code implementations using FhirEngine Search API Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix failing tests

3ceadb8

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into upgrade-gradle-dependencies

ce78e63

Merge branch 'main' into refactor-repositories

40abb62

Fix focus requester on PinCell UI

ece42e7

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into upgrade-gradle-dependencies

c12e92b

Merge branch 'upgrade-gradle-dependencies' into refactor-repositories

8af3518

Refactor geowidget and engine tests

de24f4b

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into refactor-repositories

ffd9b29

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Refactor quest module tests

053835d

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits added 6 commits September 6, 2023 16:51

Fix failing tests for engine module

048b8c0

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Delete duplicated test classes

5337c39

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into refactor-repositories

1ee8eea

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Fix package name on CI script

2b15b78

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Resolve failing tests in quest module

29604a6

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Refactor QuestionnaireResponse/Questionnaire validation implementation

0cc66f4

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits marked this pull request as ready for review September 12, 2023 07:14

ellykits added 3 commits September 12, 2023 12:57

Merge branch 'main' into refactor-repositories

0587295

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Merge branch 'main' into refactor-repositories

b0d5b53

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Format code

d5d55f0

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

Replace the resource.db file in assets

c653ebe

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

pld previously approved these changes Sep 12, 2023

View reviewed changes

Cleanup unused code

14fe317

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits dismissed pld’s stale review via 14fe317 September 13, 2023 09:47

Replace resources.zip file

fd51f26

Signed-off-by: Elly Kitoto <junkmailstoelly@gmail.com>

ellykits requested a review from pld September 13, 2023 11:06

pld approved these changes Sep 13, 2023

View reviewed changes

ellykits merged commit ebe71b9 into main Sep 13, 2023

ellykits deleted the refactor-repositories branch September 13, 2023 15:36

allan-on mentioned this pull request Sep 18, 2023

Add Register filtering #2698

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate to latest FHIR engine SDK #2718

Migrate to latest FHIR engine SDK #2718

ellykits commented Aug 29, 2023

codecov bot commented Sep 1, 2023 •

edited

Loading

pld Sep 12, 2023

ellykits Sep 12, 2023

pld Sep 12, 2023

ellykits Sep 12, 2023

pld Sep 12, 2023

ellykits Sep 12, 2023

ellykits commented Sep 13, 2023

Migrate to latest FHIR engine SDK #2718

Migrate to latest FHIR engine SDK #2718

Conversation

ellykits commented Aug 29, 2023

codecov bot commented Sep 1, 2023 • edited Loading

Codecov Report

pld Sep 12, 2023

Choose a reason for hiding this comment

ellykits Sep 12, 2023

Choose a reason for hiding this comment

pld Sep 12, 2023

Choose a reason for hiding this comment

ellykits Sep 12, 2023

Choose a reason for hiding this comment

pld Sep 12, 2023

Choose a reason for hiding this comment

ellykits Sep 12, 2023

Choose a reason for hiding this comment

ellykits commented Sep 13, 2023

codecov bot commented Sep 1, 2023 •

edited

Loading