Update questionnaire launchContexts to use map

Author: LZRS

android/engine/src/main/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireActivity.kt

@@ -194,11 +194,15 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
       //        Timber.e(it.encodeResourceToString())
       questionnaireFragmentBuilder.setQuestionnaireResponse(it.encodeResourceToString())
     }
-    intent.getStringArrayListExtra(QUESTIONNAIRE_LAUNCH_CONTEXT)?.let {
-      val launchContextMap = it.associateBy { resourceString ->
-        val resource = parser.parseResource(resourceString) as Resource
-        resource.resourceType.name.lowercase()
-      }
+    intent.getBundleExtra(QUESTIONNAIRE_LAUNCH_CONTEXTS)?.let { launchContextBundle ->
+      val launchContextMap =
+        buildMap<String, String> {
+          launchContextBundle.keySet().forEach {
+            this[it] =
+              launchContextBundle.getString(it)
+                ?: throw NotImplementedError("launchContext with null is not currently supported")
+          }
+        }
       questionnaireFragmentBuilder.setQuestionnaireLaunchContextMap(launchContextMap)
     }
 
@@ -503,7 +507,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
     const val QUESTIONNAIRE_ARG_BARCODE_KEY = "patient-barcode"
     const val WHO_IDENTIFIER_SYSTEM = "WHO-HCID"
     const val QUESTIONNAIRE_AGE = "PR-age"
-    const val QUESTIONNAIRE_LAUNCH_CONTEXT =
+    const val QUESTIONNAIRE_LAUNCH_CONTEXTS =
       "org.smartregister.fhircore.engine.ui.questionnaire.launchContext"
     const val QUESTIONNAIRE_TRACE = "Questionnaire.renderFragment"
 
@@ -514,7 +518,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
       questionnaireType: QuestionnaireType = QuestionnaireType.DEFAULT,
       questionnaireResponse: QuestionnaireResponse? = null,
       backReference: String? = null,
-      launchContexts: ArrayList<Resource>? = null,
+      launchContexts: Map<String, Resource> = emptyMap(),
       populationResources: ArrayList<out Resource> = ArrayList(),
     ) =
       bundleOf(
@@ -536,12 +540,11 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
             )
           }
           launchContexts
-            ?.takeIf { it.isNotEmpty() }
-            ?.let { list ->
-              putStringArrayList(
-                QUESTIONNAIRE_LAUNCH_CONTEXT,
-                ArrayList(list.map { it.encodeResourceToString() }),
-              )
+            .takeIf { it.isNotEmpty() }
+            ?.let { kv ->
+              val launchContextsBundlePairs =
+                kv.map { it.key to it.value.encodeResourceToString() }.toTypedArray()
+              putBundle(QUESTIONNAIRE_LAUNCH_CONTEXTS, bundleOf(*launchContextsBundlePairs))
             }
         }
 
@@ -552,7 +555,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
       groupIdentifier: String? = null,
       questionnaireType: QuestionnaireType = QuestionnaireType.DEFAULT,
       intentBundle: Bundle = Bundle.EMPTY,
-      launchContexts: ArrayList<Resource>? = null,
+      launchContexts: Map<String, Resource> = emptyMap(),
       populationResources: ArrayList<Resource>? = null,
     ) {
       context.startActivity(
@@ -578,7 +581,7 @@ open class QuestionnaireActivity : BaseMultiLanguageActivity(), View.OnClickList
       questionnaireType: QuestionnaireType = QuestionnaireType.DEFAULT,
       backReference: String? = null,
       intentBundle: Bundle = Bundle.EMPTY,
-      launchContexts: ArrayList<Resource>? = null,
+      launchContexts: Map<String, Resource> = emptyMap(),
       populationResources: ArrayList<Resource>? = null,
     ) {
       context.startActivityForResult(

android/engine/src/test/java/org/smartregister/fhircore/engine/ui/questionnaire/QuestionnaireActivityTest.kt

@@ -132,7 +132,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     intent =
       Intent().apply {
         putExtra(QuestionnaireActivity.QUESTIONNAIRE_TITLE_KEY, "Patient registration")
-        putStringArrayListExtra(QuestionnaireActivity.QUESTIONNAIRE_LAUNCH_CONTEXT, arrayListOf())
+        putExtra(QuestionnaireActivity.QUESTIONNAIRE_LAUNCH_CONTEXTS, bundleOf())
         putExtra(QuestionnaireActivity.QUESTIONNAIRE_ARG_FORM, "patient-registration")
         putExtra(QuestionnaireActivity.QUESTIONNAIRE_ARG_PATIENT_KEY, "1234")
       }
@@ -710,7 +710,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     QuestionnaireActivity.launchQuestionnaireForResult(
       ctx,
       questionnaireId = "testQuestionnaire",
-      launchContexts = null,
+      launchContexts = emptyMap(),
       populationResources = arrayListOf(),
     )
     verify { ctx.startActivityForResult(any(), withArg { Assert.assertEquals(0, it) }) }
@@ -725,7 +725,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     QuestionnaireActivity.launchQuestionnaire(
       ctx,
       questionnaireId = "testQuestionnaire",
-      launchContexts = null,
+      launchContexts = emptyMap(),
       populationResources = arrayListOf(),
     )
     verify { ctx.startActivity(any()) }
@@ -739,7 +739,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     val groupIdentifier = "group_identifier"
     val intentBundle = Bundle.EMPTY
     val questionnaireType = QuestionnaireType.DEFAULT
-    val launchContexts = mockk<ArrayList<Resource>>(relaxed = true)
+    val launchContexts = mockk<Map<String, Resource>>(relaxed = true)
     val populationResources = mockk<ArrayList<Resource>>(relaxed = true)
 
     val ctx = spyk<Activity>()
@@ -811,7 +811,7 @@ class QuestionnaireActivityTest : ActivityRobolectricTest() {
     val backReference = "back_reference"
     val intentBundle = Bundle.EMPTY
     val questionnaireType = QuestionnaireType.DEFAULT
-    val launchContexts = mockk<ArrayList<Resource>>(relaxed = true)
+    val launchContexts = mockk<Map<String, Resource>>(relaxed = true)
     val populationResources = mockk<ArrayList<Resource>>(relaxed = true)
 
     val ctx = spyk<Activity>()