Delete saved draft feature #3631
Merged
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3631 +/- ##
=========================================
+ Coverage 27.3% 27.4% +0.1%
- Complexity 787 789 +2
=========================================
Files 282 282
Lines 14699 14695 -4
Branches 2634 2632 -2
=========================================
+ Hits 4023 4040 +17
+ Misses 10132 10100 -32
- Partials 544 555 +11
Flags with carried forward coverage won't be shown. Click here to find out more.
|
move delete draft classes to questionnaire package
Add ability to set alert dialog button color
Rkareko
requested review from
ndegwamartin,
ellykits,
f-odhiambo and
dubdabasoduba
ndegwamartin
reviewed
Dec 2, 2024
| @@ -43,6 +43,12 @@ enum class AlertIntent { | |||
|
|
|||
| data class AlertDialogListItem(val key: String, val value: String) | |||
|
|
|||
| data class AlertDialogButton( | |||
ndegwamartin
reviewed
Dec 2, 2024
Comment on lines
72
to
73
| defaultRepository.update(questionnaireResponse) | ||
| defaultRepository.addOrUpdate( |
There was a problem hiding this comment.
In the unlikely event that one passes and the other fails, might be best to wrap this with a DB transaction.
There was a problem hiding this comment.
We'd probably want to create a new method in defaultRespository for this and then within it use the txn block
fhirEngine.withTransaction {
...
}
ndegwamartin
reviewed
Dec 2, 2024
...d/engine/src/test/java/org/smartregister/fhircore/engine/data/local/DefaultRepositoryTest.kt
Outdated
Show resolved
Hide resolved
ndegwamartin
reviewed
Dec 2, 2024
Comment on lines
61
to
73
| val questionnaireResponse = | ||
| defaultRepository.searchQuestionnaireResponse( | ||
| resourceId = questionnaireConfig.resourceIdentifier!!, | ||
| resourceType = questionnaireConfig.resourceType!!, | ||
| questionnaireId = questionnaireConfig.id, | ||
| encounterId = null, | ||
| questionnaireResponseStatus = QuestionnaireResponseStatus.INPROGRESS.toCode(), | ||
| ) | ||
|
|
||
| if (questionnaireResponse != null) { | ||
| questionnaireResponse.status = QuestionnaireResponseStatus.STOPPED | ||
| defaultRepository.update(questionnaireResponse) | ||
| defaultRepository.addOrUpdate( |
There was a problem hiding this comment.
Unless this is covered by another test we can add a unit test to verify that this method QuestionnaireDraftDialogViewModel.deleteDraft ,
- Searches for for the QuestionnaireResponse
- Updates the QuestionnaireResponse
- Creates the AuditEvent
Co-authored-by: Martin Ndegwa <[email protected]>
ndegwamartin
previously approved these changes
Dec 3, 2024
ndegwamartin
dismissed
their stale review
Missing change on adding the transaction block
ndegwamartin
approved these changes
Dec 4, 2024
qiarie
pushed a commit
that referenced
this pull request
Jan 15, 2025
* Add delete draft workflow * Add view model * Add logic for soft deleteing drafts * Run the search for QuestinnaireResponse in view model scope * Move searchQuestionnaireResponse function to default repository * Use interpolated questionnaire config when launching delete draft fragment * Ensure delete draft db calls complete before dialog is dismissed * Add flag to indicate a drft has been deleted * Use aduti event to keep track of deleted drafts * Rename delete draft questionnaire workflow move delete draft classes to questionnaire package * Rename draft dialog fragment and view model * Add data class to hold alert dialog button properties Add ability to set alert dialog button color * Fix failing tests * Update CHANGELOG.md * Verify filtering by encounter works when when searching for latest QR * Run spotless Apply * Update test name Co-authored-by: Martin Ndegwa <[email protected]> * Add documentation for delete draft functionality * Add qustionnaire draft dialog view tests * Run questionnaire soft deletion and audit event creation in a transaction block * Update docs --------- Co-authored-by: Martin Ndegwa <[email protected]>
asad-zaman
pushed a commit
to Mpower-social/fhircore-smart-health-bd
that referenced
this pull request
Jan 20, 2025
* Add delete draft workflow * Add view model * Add logic for soft deleteing drafts * Run the search for QuestinnaireResponse in view model scope * Move searchQuestionnaireResponse function to default repository * Use interpolated questionnaire config when launching delete draft fragment * Ensure delete draft db calls complete before dialog is dismissed * Add flag to indicate a drft has been deleted * Use aduti event to keep track of deleted drafts * Rename delete draft questionnaire workflow move delete draft classes to questionnaire package * Rename draft dialog fragment and view model * Add data class to hold alert dialog button properties Add ability to set alert dialog button color * Fix failing tests * Update CHANGELOG.md * Verify filtering by encounter works when when searching for latest QR * Run spotless Apply * Update test name Co-authored-by: Martin Ndegwa <[email protected]> * Add documentation for delete draft functionality * Add qustionnaire draft dialog view tests * Run questionnaire soft deletion and audit event creation in a transaction block * Update docs --------- Co-authored-by: Martin Ndegwa <[email protected]>
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.
IMPORTANT: Where possible all PRs must be linked to a Github issue
Fixes #3605
Link to docs
Engineer Checklist
strings.xmlfile./gradlew spotlessApplyand./gradlew spotlessCheckto check my code follows the project's style guideCode Reviewer Checklist
strings.xmlfile