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.

Sign up for GitHub

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

Fix zip index based mapping issue when unpacking repeat groups #1973

Merged
merged 7 commits into from
May 3, 2023
Merged

Fix zip index based mapping issue when unpacking repeat groups #1973

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4f389a
Fix unpack repeat group issue to linkId based mapping
maimoonak Apr 12, 2023
e7d28ac
Fix the zip mapping and use linkId mapping
maimoonak Apr 13, 2023
1f8568f
Merge branch 'master' into fix_unpack_rpt_grp
dubdabasoduba Apr 19, 2023
f0fb07b
Merge branch 'master' into fix_unpack_rpt_grp
maimoonak Apr 26, 2023
5d636d0
Fix faling test
maimoonak Apr 28, 2023
e0553c9
Update datacapture/src/main/java/com/google/android/fhir/datacapture/…
jingtang10 May 3, 2023
4b017e3
Merge branch 'master' into fix_unpack_rpt_grp
maimoonak May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 74 additions & 3 deletions catalog/src/main/assets/behavior_skip_logic.json
View file
Open in desktop
maimoonak marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
]
},
{
"text": "Date of Vaccination?",
"type": "date",
"linkId": "1.1",
"text": "Confirm that vaccine date is known",
"type": "boolean",
"linkId": "2",
"enableWhen": [
{
"question": "1.0",
Expand All @@ -87,6 +87,77 @@
}
}
]
},
{
"text": "Confirm that vaccine date is unknown",
"type": "choice",
"linkId": "3",
"answerOption": [
{
"valueCoding": {
"code": "Y",
"display": "Yes"
}
},
{
"valueCoding": {
"code": "N",
"display": "No"
}
}
],
"enableWhen": [
{
"question": "1.0",
"operator": "=",
"answerCoding": {
"system": "custom",
"code": "unknown"
}
}
]
},
{
"text": "Confirm that vaccine date is not known",
"type": "boolean",
"linkId": "4",
"enableWhen": [
{
"question": "1.0",
"operator": "=",
"answerCoding": {
"system": "custom",
"code": "N"
}
}
]
},
{
"text": "Provide vaccine dates for 2 doses",
"type": "group",
"linkId": "5",
"enableWhen": [
{
"question": "1.0",
"operator": "=",
"answerCoding": {
"system": "custom",
"code": "Y"
}
}
],
"item": [
{
"text": "Date of Vaccination?",
"type": "date",
"linkId": "3.1"
}
]
},
{
"text": "Additional details",
"type": "string",
"linkId": "6"
}
]
}
10 changes: 6 additions & 4 deletions ...rc/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,12 @@ private fun unpackRepeatedGroups(
questionnaireItems: List<Questionnaire.QuestionnaireItemComponent>,
questionnaireResponseItems: List<QuestionnaireResponse.QuestionnaireResponseItemComponent>
): List<QuestionnaireResponse.QuestionnaireResponseItemComponent> {
return questionnaireItems.zip(questionnaireResponseItems).flatMap {
(questionnaireItem, questionnaireResponseItem) ->
unpackRepeatedGroups(questionnaireItem, questionnaireResponseItem)
}
return questionnaireItems
.map { qItem -> qItem to questionnaireResponseItems.find { it.linkId == qItem.linkId } }
maimoonak marked this conversation as resolved.
Show resolved Hide resolved
.filter { it.second != null }
.flatMap { (questionnaireItem, questionnaireResponseItem) ->
unpackRepeatedGroups(questionnaireItem, questionnaireResponseItem!!)
}
}

private fun unpackRepeatedGroups(
Expand Down
107 changes: 107 additions & 0 deletions ...est/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaireResponsesTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import org.hl7.fhir.r4.model.Questionnaire.QuestionnaireItemComponent
import org.hl7.fhir.r4.model.QuestionnaireResponse
import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemComponent
import org.hl7.fhir.r4.model.Reference
import org.hl7.fhir.r4.model.Resource
import org.junit.Test

Expand Down Expand Up @@ -296,6 +297,112 @@ class MoreQuestionnaireResponsesTest {
assertResourceEquals(questionnaireResponse, unpackedQuestionnaireResponse)
}

@Test
fun `should unpack repeated groups correctly with missing questionnaire response items`() {
val questionnaire =
Questionnaire().apply {
addItem(
QuestionnaireItemComponent().apply {
linkId = "simple-question-1"
type = Questionnaire.QuestionnaireItemType.STRING
}
)
addItem(
QuestionnaireItemComponent().apply {
linkId = "repeated-group"
type = Questionnaire.QuestionnaireItemType.GROUP
repeats = true
addItem(
QuestionnaireItemComponent().apply {
linkId = "nested-question-1"
type = Questionnaire.QuestionnaireItemType.BOOLEAN
}
)
addItem(
QuestionnaireItemComponent().apply {
linkId = "nested-question-2"
type = Questionnaire.QuestionnaireItemType.REFERENCE
}
)
}
)
}
val questionnaireResponse =
QuestionnaireResponse().apply {
// linkId = "simple-question-1" not present due to enablement
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "repeated-group"
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
// linkId = "nested-question-1" not present due to enablement
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "nested-question-2"
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
value = Reference().apply { reference = "Patient/123" }
}
)
}
)
}
)
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "nested-question-2"
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
value = Reference().apply { reference = "Patient/456" }
}
)
}
)
}
)
}
)
}
val unpackedQuestionnaireResponse =
QuestionnaireResponse().apply {
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "repeated-group"
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "nested-question-2"
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
value = Reference().apply { reference = "Patient/123" }
}
)
}
)
}
)
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "repeated-group"
addItem(
QuestionnaireResponseItemComponent().apply {
linkId = "nested-question-2"
addAnswer(
QuestionnaireResponseItemAnswerComponent().apply {
value = Reference().apply { reference = "Patient/456" }
}
)
}
)
}
)
}

questionnaireResponse.unpackRepeatedGroups(questionnaire)
assertResourceEquals(questionnaireResponse, unpackedQuestionnaireResponse)
}

@Test
fun `should not modify other items while unpacking repeated groups`() {
val questionnaire =
Expand Down