Pack QuestionnaireResponse repeatedGroup items before validation

android/engine/src/main/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireResponseExtension.kt

@@ -34,6 +34,34 @@ private fun List<QuestionnaireResponseItemComponent>.clearText() {
   }
 }
 
+/** Borrows from: https://github.com/google/android-fhir/pull/1936 */
+fun QuestionnaireResponse.packRepeatedGroups() {
+  item = item.packRepeatedGroups()
+}
+
+private fun List<QuestionnaireResponse.QuestionnaireResponseItemComponent>.packRepeatedGroups():
+  List<QuestionnaireResponse.QuestionnaireResponseItemComponent> {
+  forEach { it ->
+    it.item = it.item.packRepeatedGroups()
+    it.answer.forEach { it.item = it.item.packRepeatedGroups() }
+  }
+  val linkIdToPackedResponseItems =
+    groupBy { it.linkId }
+      .mapValues { (linkId, questionnaireResponseItems) ->
+        questionnaireResponseItems.singleOrNull()
+          ?: QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+            this.linkId = linkId
+            answer =
+              questionnaireResponseItems.map {
+                QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                  item = it.item
+                }
+              }
+          }
+      }
+  return map { it.linkId }.distinct().map { linkIdToPackedResponseItems[it]!! }
+}
+
 /** Pre-order list of all questionnaire response items in the questionnaire. */
 val QuestionnaireResponse.allItems: List<QuestionnaireResponse.QuestionnaireResponseItemComponent>
   get() = item.flatMap { it.descendant }

android/engine/src/test/java/org/smartregister/fhircore/engine/configuration/ConfigurationRegistryTest.kt

@@ -773,7 +773,7 @@ class ConfigurationRegistryTest : RobolectricTest() {
   }
 
   @Test
-  fun testThatNextIsInvokedWhenItExistsInABundleLink() = runTest {
+  fun testThatNextIsInvokedWhenItExistsInABundleLink() {
     val appId = "theAppId"
     val compositionSections = mutableListOf<SectionComponent>()
     compositionSections.add(
@@ -804,14 +804,14 @@ class ConfigurationRegistryTest : RobolectricTest() {
           },
         )
       }
+    val nextPageUrlLink = bundle.getLink(PAGINATION_NEXT).url
 
     val finalBundle =
       Bundle().apply { entry = listOf(BundleEntryComponent().setResource(listResource)) }
 
     configRegistry.sharedPreferencesHelper.write(SharedPreferenceKey.APP_ID.name, appId)
 
-    fhirEngine.create(composition)
-
+    runBlocking { fhirEngine.create(composition) }
     coEvery {
       fhirResourceDataSource.getResource("Composition?identifier=theAppId&_count=200")
     } returns Bundle().apply { addEntry().resource = composition }
@@ -823,16 +823,14 @@ class ConfigurationRegistryTest : RobolectricTest() {
       )
     } returns bundle
 
-    val nextPageUrlLink = bundle.getLink(PAGINATION_NEXT).url
-
     coEvery {
       fhirResourceDataSource.getResourceWithGatewayModeHeader(
         "list-entries",
         nextPageUrlLink,
       )
     } returns finalBundle
 
-    configRegistry.fetchNonWorkflowConfigResources()
+    runBlocking { configRegistry.fetchNonWorkflowConfigResources() }
 
     coVerify {
       fhirResourceDataSource.getResourceWithGatewayModeHeader(

android/engine/src/test/java/org/smartregister/fhircore/engine/util/extension/QuestionnaireResponseExtensionTest.kt

@@ -16,7 +16,9 @@
 
 package org.smartregister.fhircore.engine.util.extension
 
+import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.StringType
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -47,4 +49,85 @@ class QuestionnaireResponseExtensionTest {
     val item2 = item1.itemFirstRep
     Assert.assertNull(item2.text)
   }
+
+  @Test
+  fun testQuestionnaireResponsePackingRepeatedGroups() {
+    val unPackedRepeatingGroupQuestionnaireResponse =
+      QuestionnaireResponse().apply {
+        addItem(
+          QuestionnaireResponse.QuestionnaireResponseItemComponent(StringType("page-1")).apply {
+            addItem(
+              QuestionnaireResponse.QuestionnaireResponseItemComponent(
+                  StringType("repeating-group"),
+                )
+                .apply {
+                  addItem(
+                    QuestionnaireResponse.QuestionnaireResponseItemComponent(StringType("bp"))
+                      .apply {
+                        addAnswer(
+                          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                            value =
+                              IntegerType(
+                                124,
+                              )
+                          },
+                        )
+                      },
+                  )
+                },
+            )
+
+            addItem(
+              QuestionnaireResponse.QuestionnaireResponseItemComponent(
+                  StringType("repeating-group"),
+                )
+                .apply {
+                  addItem(
+                    QuestionnaireResponse.QuestionnaireResponseItemComponent(StringType("bp"))
+                      .apply {
+                        addAnswer(
+                          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                            value =
+                              IntegerType(
+                                104,
+                              )
+                          },
+                        )
+                      },
+                  )
+                },
+            )
+
+            addItem(
+              QuestionnaireResponse.QuestionnaireResponseItemComponent(
+                  StringType("repeating-group"),
+                )
+                .apply {
+                  addItem(
+                    QuestionnaireResponse.QuestionnaireResponseItemComponent(StringType("bp"))
+                      .apply {
+                        addAnswer(
+                          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+                            value =
+                              IntegerType(
+                                138,
+                              )
+                          },
+                        )
+                      },
+                  )
+                },
+            )
+          },
+        )
+      }
+    Assert.assertEquals(3, unPackedRepeatingGroupQuestionnaireResponse.itemFirstRep.item.size)
+    val packedRepeatingGroupsQuestionnaireResponse =
+      unPackedRepeatingGroupQuestionnaireResponse.copy().apply { this.packRepeatedGroups() }
+    Assert.assertEquals(1, packedRepeatingGroupsQuestionnaireResponse.itemFirstRep.item.size)
+    Assert.assertEquals(
+      3,
+      packedRepeatingGroupsQuestionnaireResponse.itemFirstRep.itemFirstRep.answer.size,
+    )
+  }
 }

android/quest/src/androidTest/java/org/smartregister/fhircore/quest/integration/ui/shared/components/ExtendedFabTest.kt

@@ -127,8 +127,8 @@ class ExtendedFabTest {
 
   @Test
   fun testFloatingButtonWhenAnimateIsFalse() {
+    composeRule.mainClock.autoAdvance = false
     composeRule.setContent {
-      composeRule.mainClock.autoAdvance = false
       ExtendedFab(
         fabActions =
           listOf(
@@ -165,8 +165,8 @@ class ExtendedFabTest {
 
   @Test
   fun testFloatingButtonWhenAnimateIsTrue() {
+    composeRule.mainClock.autoAdvance = false
     composeRule.setContent {
-      composeRule.mainClock.autoAdvance = false
       ExtendedFab(
         fabActions =
           listOf(

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModel.kt

@@ -91,6 +91,7 @@
 import org.smartregister.fhircore.engine.util.extension.find
 import org.smartregister.fhircore.engine.util.extension.generateMissingId
 import org.smartregister.fhircore.engine.util.extension.isIn
+import org.smartregister.fhircore.engine.util.extension.packRepeatedGroups
 import org.smartregister.fhircore.engine.util.extension.prePopulateInitialValues
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForEditing
 import org.smartregister.fhircore.engine.util.extension.prepareQuestionsForReadingOrEditing
@@ -799,7 +800,10 @@
     return QuestionnaireResponseValidator.validateQuestionnaireResponse(
         questionnaire = Questionnaire().apply { item = validQuestionnaireItems },
         questionnaireResponse =
-          QuestionnaireResponse().apply { item = validQuestionnaireResponseItems },
+          QuestionnaireResponse().apply {
+            item = validQuestionnaireResponseItems
+            packRepeatedGroups()
+          },
         context = context,
       )
       .values