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.

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

[ZEIR] - Growth Monitoring : Z-Score Computation #2745

Merged
merged 10 commits into from
Sep 14, 2023

Conversation

qaziabubakar-vd
Copy link
Contributor

@qaziabubakar-vd qaziabubakar-vd commented Sep 12, 2023

Linked Issue: https://github.com/onaio/fhir-resources/issues/1535

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

Fixes https://github.com/onaio/fhir-resources/issues/1535

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

Add basic resource in bundle when CQL is executed for zeir growth monitoring
@codecov
Copy link

codecov bot commented Sep 12, 2023

Codecov Report

Merging #2745 (b719134) into main (ad3a737) will increase coverage by 1.0%.
Report is 48 commits behind head on main.
The diff coverage is 62.7%.

Impacted file tree graph

@@            Coverage Diff            @@
##              main   #2745     +/-   ##
=========================================
+ Coverage     64.5%   65.5%   +1.0%     
+ Complexity    1075    1051     -24     
=========================================
  Files          218     220      +2     
  Lines         9635    9821    +186     
  Branches      1897    1802     -95     
=========================================
+ Hits          6218    6441    +223     
- Misses        2234    2276     +42     
+ Partials      1183    1104     -79     
Flag Coverage Δ
engine 72.3% <69.4%> (-0.4%) ⬇️
geowidget 65.5% <33.3%> (+1.1%) ⬆️
quest 60.9% <58.6%> (+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

f-odhiambo
f-odhiambo previously approved these changes Sep 12, 2023
Copy link
Contributor

@f-odhiambo f-odhiambo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment on lines 577 to 587
questionnaire.cqfLibraryIds().forEach { libraryId ->
if (
libraryId == "223758"
) { // Resource id for Library that calculates Z-score in ZEIR application
// Adding 4 basic resources which contain the Data needed for Z-score calculation
val basicResourceIds = listOf("223754", "223755", "223756", "223757")
basicResourceIds.forEach { resourceId ->
val basicResource = defaultRepository.loadResource(resourceId) as Basic?
bundle.addEntry(Bundle.BundleEntryComponent().setResource(basicResource))
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please create a new issue to make this generic with a proposal on how to do this and add a TODO on line 577 that links to that issue

bundle = newBundle,
questionnaire = questionnaire,
)
withContext(Dispatchers.IO) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use dispatcherProvider.io() here instead? The provider is already injected as a constructor parameter

pld
pld previously approved these changes Sep 13, 2023
@f-odhiambo f-odhiambo merged commit 0f0f3f4 into main Sep 14, 2023
6 checks passed
@f-odhiambo f-odhiambo deleted the issue-1535-zeir-growth-monitoring branch September 14, 2023 08:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants