Address review

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireFragment.kt

@@ -322,7 +322,7 @@ class QuestionnaireFragment : Fragment() {
      * @param launchContextMap map of launchContext name and serialized resources
      */
     fun setQuestionnaireLaunchContextMap(launchContextMap: Map<String, String>) = apply {
-      args.add(EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS to launchContextMap)
+      args.add(EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP to launchContextMap)
     }
 
     /**
@@ -419,8 +419,7 @@ class QuestionnaireFragment : Fragment() {
     /**
      * A map of launchContext name and JSON encoded strings extra for each questionnaire context.
      */
-    internal const val EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS =
-      "questionnaire-launch-contexts"
+    internal const val EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP = "questionnaire-launch-contexts"
     /**
      * A [URI][android.net.Uri] extra for streaming a JSON encoded questionnaire response.
      *

datacapture/src/main/java/com/google/android/fhir/datacapture/QuestionnaireViewModel.kt

@@ -33,7 +33,7 @@ import com.google.android.fhir.datacapture.extensions.allItems
 import com.google.android.fhir.datacapture.extensions.cqfExpression
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
 import com.google.android.fhir.datacapture.extensions.entryMode
-import com.google.android.fhir.datacapture.extensions.filterLaunchContextsByCodeInNameExtension
+import com.google.android.fhir.datacapture.extensions.filterByCodeInNameExtension
 import com.google.android.fhir.datacapture.extensions.flattened
 import com.google.android.fhir.datacapture.extensions.hasDifferentAnswerSet
 import com.google.android.fhir.datacapture.extensions.isDisplayItem
@@ -167,19 +167,16 @@ internal class QuestionnaireViewModel(application: Application, state: SavedStat
 
   init {
     questionnaireLaunchContextMap =
-      if (state.contains(QuestionnaireFragment.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS)) {
+      if (state.contains(QuestionnaireFragment.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP)) {
 
         val launchContextMapString: Map<String, String> =
-          state[QuestionnaireFragment.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS]!!
+          state[QuestionnaireFragment.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP]!!
 
         val launchContextMapResource =
           launchContextMapString.mapValues { parser.parseResource(it.value) as Resource }
         questionnaire.questionnaireLaunchContexts?.let { launchContextExtensions ->
           validateLaunchContextExtensions(launchContextExtensions)
-          filterLaunchContextsByCodeInNameExtension(
-            launchContextMapResource,
-            launchContextExtensions
-          )
+          filterByCodeInNameExtension(launchContextMapResource, launchContextExtensions)
         }
       } else {
         null

datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreQuestionnaires.kt

@@ -16,13 +16,15 @@
 
 package com.google.android.fhir.datacapture.extensions
 
+import org.hl7.fhir.exceptions.FHIRException
 import org.hl7.fhir.r4.model.CanonicalType
 import org.hl7.fhir.r4.model.CodeType
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Expression
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.Resource
+import org.hl7.fhir.r4.model.ResourceType
 
 /**
  * The StructureMap url in the
@@ -65,12 +67,7 @@ internal fun Questionnaire.findVariableExpression(variableName: String): Express
  */
 internal fun validateLaunchContextExtensions(launchContextExtensions: List<Extension>) =
   launchContextExtensions.forEach { launchExtension ->
-    validateLaunchContextExtension(
-      Extension().apply {
-        addExtension(launchExtension.extension.firstOrNull { it.url == "name" })
-        addExtension(launchExtension.extension.firstOrNull { it.url == "type" })
-      }
-    )
+    validateLaunchContextExtension(launchExtension)
   }
 
 /**
@@ -79,21 +76,31 @@ internal fun validateLaunchContextExtensions(launchContextExtensions: List<Exten
  */
 private fun validateLaunchContextExtension(launchExtension: Extension) {
   check(launchExtension.extension.size == 2) {
-    "The extension:name or extension:type extension is missing in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT"
+    "Expected 2 extensions (name and type) in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT but found ${launchExtension.extension.size}."
   }
 
-  val nameCoding = launchExtension.getExtensionByUrl("name").value as Coding
-  val typeCodeType = launchExtension.getExtensionByUrl("type").value as CodeType
-
-  val hasNameCodingSystem = nameCoding.system == EXTENSION_LAUNCH_CONTEXT
-  val isValidResourceType = MoreResourceTypes.isValidCode(typeCodeType.value)
-
-  val isValidExtension = hasNameCodingSystem && isValidResourceType
+  val nameCoding =
+    launchExtension.getExtensionByUrl("name")?.value as? Coding
+      ?: error(
+        "The extension:name is missing or is not of type Coding in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT"
+      )
+
+  val typeCodeType =
+    launchExtension.getExtensionByUrl("type")?.value as? CodeType
+      ?: error(
+        "The extension:type is missing or is not of type CodeType in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT"
+      )
+
+  val isValidResourceType =
+    try {
+      ResourceType.fromCode(typeCodeType.value) != null
+    } catch (exception: FHIRException) {
+      false
+    }
 
-  if (!isValidExtension) {
+  if (nameCoding.system != EXTENSION_LAUNCH_CONTEXT || !isValidResourceType) {
     error(
-      "The extension:name extension and/or extension:type extension do not follow the format " +
-        "specified in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT"
+      "The extension:name and/or extension:type do not follow the format specified in $EXTENSION_SDC_QUESTIONNAIRE_LAUNCH_CONTEXT"
     )
   }
 }
@@ -102,14 +109,14 @@ private fun validateLaunchContextExtension(launchExtension: Extension) {
  * Filters the provided launch contexts by matching the keys with the `code` values found in the
  * "name" extensions.
  */
-internal fun filterLaunchContextsByCodeInNameExtension(
+internal fun filterByCodeInNameExtension(
   launchContexts: Map<String, Resource>,
   launchContextExtensions: List<Extension>
 ): Map<String, Resource> {
   val nameCodes =
-    launchContextExtensions.mapNotNull { extension ->
-      (extension.getExtensionByUrl("name").value as? Coding)?.code
-    }
+    launchContextExtensions
+      .mapNotNull { extension -> (extension.getExtensionByUrl("name").value as? Coding)?.code }
+      .toSet()
 
   return launchContexts.filterKeys { nameCodes.contains(it) }
 }

datacapture/src/main/java/com/google/android/fhir/datacapture/mapping/ResourceMapper.kt

@@ -18,7 +18,7 @@ package com.google.android.fhir.datacapture.mapping
 
 import com.google.android.fhir.datacapture.DataCapture
 import com.google.android.fhir.datacapture.extensions.createQuestionnaireResponseItem
-import com.google.android.fhir.datacapture.extensions.filterLaunchContextsByCodeInNameExtension
+import com.google.android.fhir.datacapture.extensions.filterByCodeInNameExtension
 import com.google.android.fhir.datacapture.extensions.initialExpression
 import com.google.android.fhir.datacapture.extensions.logicalId
 import com.google.android.fhir.datacapture.extensions.questionnaireLaunchContexts
@@ -226,7 +226,7 @@ object ResourceMapper {
     launchContexts: Map<String, Resource>
   ): QuestionnaireResponse {
     val filteredLaunchContexts =
-      filterLaunchContextsByCodeInNameExtension(
+      filterByCodeInNameExtension(
         launchContexts,
         questionnaire.questionnaireLaunchContexts ?: listOf()
       )

datacapture/src/test/java/com/google/android/fhir/datacapture/QuestionnaireViewModelTest.kt

@@ -25,7 +25,7 @@ import ca.uhn.fhir.context.FhirContext
 import ca.uhn.fhir.parser.IParser
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_ENABLE_REVIEW_PAGE
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_QUESTIONNAIRE_JSON_STRING
-import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS
+import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_QUESTIONNAIRE_RESPONSE_JSON_STRING
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_READ_ONLY
 import com.google.android.fhir.datacapture.QuestionnaireFragment.Companion.EXTRA_SHOW_REVIEW_PAGE_FIRST
@@ -4170,7 +4170,7 @@ class QuestionnaireViewModelTest {
       }
     state.set(EXTRA_QUESTIONNAIRE_JSON_STRING, printer.encodeResourceToString(questionnaire))
     state.set(
-      EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP_STRINGS,
+      EXTRA_QUESTIONNAIRE_LAUNCH_CONTEXT_MAP,
       mapOf("patient" to printer.encodeResourceToString(patient))
     )