Fix nested answer perceived as not having any answer (#3682)

opensrp · Jan 15, 2025 · e13ebde · e13ebde
1 parent a902176
commit e13ebde
Showing 1 changed file with 3 additions and 14 deletions.
diff --git a/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt b/...src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt
@@ -79,6 +79,7 @@ import org.smartregister.fhircore.engine.task.FhirCarePlanGenerator
 import org.smartregister.fhircore.engine.util.DispatcherProvider
 import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.SharedPreferencesHelper
+import org.smartregister.fhircore.engine.util.extension.allItems
 import org.smartregister.fhircore.engine.util.extension.appendOrganizationInfo
 import org.smartregister.fhircore.engine.util.extension.appendPractitionerInfo
 import org.smartregister.fhircore.engine.util.extension.appendRelatedEntityLocation
@@ -711,19 +712,7 @@ constructor(
     questionnaireResponse: QuestionnaireResponse,
     questionnaireConfig: QuestionnaireConfig,
   ) {
-    val hasPages = questionnaireResponse.item.any { it.hasItem() }
-    val questionnaireHasAnswer =
-      questionnaireResponse.item.any {
-        if (!hasPages) {
-          it.answer.any { answerComponent -> answerComponent.hasValue() }
-        } else {
-          questionnaireResponse.item.any { page ->
-            page.item.any { pageItem ->
-              pageItem.answer.any { answerComponent -> answerComponent.hasValue() }
-            }
-          }
-        }
-      }
+    val hasAnswer = questionnaireResponse.allItems.any { it.hasAnswer() }
     questionnaireResponse.questionnaire =
       questionnaireConfig.id.asReference(ResourceType.Questionnaire).reference
     if (
@@ -735,7 +724,7 @@ constructor(
           questionnaireConfig.resourceType!!,
         )
     }
-    if (questionnaireHasAnswer) {
+    if (hasAnswer) {
       questionnaireResponse.status = QuestionnaireResponse.QuestionnaireResponseStatus.INPROGRESS
       defaultRepository.addOrUpdate(
         addMandatoryTags = true,