Populate initial value from dropdown list for questionnaire items with type reference

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/test/views/DropDownViewHolderFactoryEspressoTest.kt

@@ -19,6 +19,7 @@ package com.google.android.fhir.datacapture.test.views
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
+import androidx.test.espresso.Espresso.onData
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.typeText
@@ -35,15 +36,19 @@ import com.google.android.fhir.datacapture.test.TestActivity
 import com.google.android.fhir.datacapture.test.utilities.showDropDown
 import com.google.android.fhir.datacapture.validation.NotValidated
 import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.fhir.datacapture.views.factories.DropDownAnswerOption
 import com.google.android.fhir.datacapture.views.factories.DropDownViewHolderFactory
 import com.google.android.fhir.datacapture.views.factories.QuestionnaireItemViewHolder
 import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.common.truth.Truth.assertThat
+import org.hamcrest.Matchers.instanceOf
+import org.hamcrest.Matchers.`is`
 import org.hl7.fhir.r4.model.Attachment
 import org.hl7.fhir.r4.model.Coding
 import org.hl7.fhir.r4.model.Extension
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.StringType
 import org.junit.Before
 import org.junit.Rule
@@ -264,6 +269,53 @@ class DropDownViewHolderFactoryEspressoTest {
       .isEqualTo(0)
   }
 
+  @Test
+  fun shouldSetCorrectDropDownValueToAutoCompleteTextViewForDifferentAnswerOptionsWithSimilarDisplayString() {
+    val questionnaireItem =
+      Questionnaire.QuestionnaireItemComponent().apply {
+        addAnswerOption(
+          Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
+            value =
+              Reference().apply {
+                id = "ref_1"
+                display = "Reference"
+              }
+          }
+        )
+        addAnswerOption(
+          Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
+            value =
+              Reference().apply {
+                id = "ref_2"
+                display = "Reference"
+              }
+          }
+        )
+      }
+
+    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
+        questionnaireItem,
+        responseValueStringOptions(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers }
+      )
+
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
+
+    onView(withId(R.id.auto_complete)).perform(showDropDown())
+    onData(`is`(instanceOf(DropDownAnswerOption::class.java)))
+      .atPosition(2)
+      .inRoot(isPlatformPopup())
+      .perform(click())
+
+    assertThat(viewHolder.itemView.findViewById<TextView>(R.id.auto_complete).text.toString())
+      .isEqualTo("Reference")
+    assertThat((answerHolder!!.single().value as Reference).display).isEqualTo("Reference")
+    assertThat((answerHolder!!.single().value as Reference).id).isEqualTo("ref_2")
+  }
+
   /** Method to run code snippet on UI/main thread */
   private fun runOnUI(action: () -> Unit) {
     activityScenarioRule.scenario.onActivity { action() }
@@ -295,7 +347,11 @@ class DropDownViewHolderFactoryEspressoTest {
       responses.forEach { response ->
         addAnswer(
           QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
-            value = Coding().apply { display = response }
+            value =
+              Coding().apply {
+                code = response.replace(" ", "_")
+                display = response
+              }
           }
         )
       }

datacapture/src/androidTest/java/com/google/android/fhir/datacapture/views/factories/AutoCompleteViewHolderFactoryEspressoTest.kt

@@ -0,0 +1,160 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.android.fhir.datacapture.views.factories
+
+import android.view.View
+import android.widget.FrameLayout
+import android.widget.TextView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.RootMatchers
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.platform.app.InstrumentationRegistry
+import com.google.android.fhir.datacapture.R
+import com.google.android.fhir.datacapture.test.TestActivity
+import com.google.android.fhir.datacapture.validation.NotValidated
+import com.google.android.fhir.datacapture.views.QuestionnaireViewItem
+import com.google.android.material.chip.ChipGroup
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
+import com.google.common.truth.Truth.assertThat
+import org.hl7.fhir.r4.model.Coding
+import org.hl7.fhir.r4.model.Questionnaire
+import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class AutoCompleteViewHolderFactoryEspressoTest {
+  @Rule
+  @JvmField
+  var activityScenarioRule: ActivityScenarioRule<TestActivity> =
+    ActivityScenarioRule(TestActivity::class.java)
+
+  private lateinit var parent: FrameLayout
+  private lateinit var viewHolder: QuestionnaireItemViewHolder
+
+  @Before
+  fun setup() {
+    activityScenarioRule.scenario.onActivity { activity -> parent = FrameLayout(activity) }
+    viewHolder = AutoCompleteViewHolderFactory.create(parent)
+    setTestLayout(viewHolder.itemView)
+  }
+
+  @Test
+  fun shouldReturnFilteredDropDownMenuItems() {
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
+        answerOptions(false, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
+        responseOptions(),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
+
+    onView(ViewMatchers.withId(R.id.autoCompleteTextView)).perform(ViewActions.typeText("Coding 1"))
+    assertThat(
+        viewHolder.itemView
+          .findViewById<MaterialAutoCompleteTextView>(R.id.autoCompleteTextView)
+          .adapter.count
+      )
+      .isEqualTo(1)
+  }
+
+  @Test
+  fun shouldAddDropDownValueSelectedForMultipleAnswersAutoCompleteTextView() {
+    var answerHolder: List<QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent>? = null
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
+        answerOptions(true, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
+        responseOptions("Coding 1", "Coding 5"),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, answers, _ -> answerHolder = answers },
+      )
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
+
+    onView(ViewMatchers.withId(R.id.autoCompleteTextView)).perform(ViewActions.typeText("Coding 3"))
+    onView(ViewMatchers.withText("Coding 3"))
+      .inRoot(RootMatchers.isPlatformPopup())
+      .check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+      .perform(ViewActions.click())
+    assertThat(
+        viewHolder.itemView.findViewById<TextView>(R.id.autoCompleteTextView).text.toString()
+      )
+      .isEmpty()
+    assertThat(answerHolder!!.map { it.valueCoding.display })
+      .containsExactly("Coding 1", "Coding 5", "Coding 3")
+  }
+
+  @Test
+  fun shouldSetCorrectNumberOfChipsForSelectedAnswers() {
+    val questionnaireViewItem =
+      QuestionnaireViewItem(
+        answerOptions(true, "Coding 1", "Coding 2", "Coding 3", "Coding 4", "Coding 5"),
+        responseOptions("Coding 1", "Coding 5"),
+        validationResult = NotValidated,
+        answersChangedCallback = { _, _, _, _ -> },
+      )
+    runOnUI { viewHolder.bind(questionnaireViewItem) }
+
+    assertThat(viewHolder.itemView.findViewById<ChipGroup>(R.id.chipContainer).childCount)
+      .isEqualTo(2)
+  }
+
+  /** Method to run code snippet on UI/main thread */
+  private fun runOnUI(action: () -> Unit) {
+    activityScenarioRule.scenario.onActivity { action() }
+  }
+
+  /** Method to set content view for test activity */
+  private fun setTestLayout(view: View) {
+    activityScenarioRule.scenario.onActivity { activity -> activity.setContentView(view) }
+    InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+  }
+
+  private fun answerOptions(repeats: Boolean, vararg options: String) =
+    Questionnaire.QuestionnaireItemComponent().apply {
+      this.repeats = repeats
+      options.forEach { option ->
+        addAnswerOption(
+          Questionnaire.QuestionnaireItemAnswerOptionComponent().apply {
+            value =
+              Coding().apply {
+                code = option.replace(" ", "_")
+                display = option
+              }
+          }
+        )
+      }
+    }
+
+  private fun responseOptions(vararg options: String) =
+    QuestionnaireResponse.QuestionnaireResponseItemComponent().apply {
+      options.forEach { option ->
+        addAnswer(
+          QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent().apply {
+            value =
+              Coding().apply {
+                code = option.replace(" ", "_")
+                display = option
+              }
+          }
+        )
+      }
+    }
+}

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

@@ -109,6 +109,18 @@ fun Type.getValueAsString(context: Context): String =
     else -> context.getString(R.string.not_answered)
   }
 
+/**
+ * Returns the unique identifier of a [Type]. Used to differentiate between item answer options that
+ * may have similar display strings
+ */
+fun Type.identifierString(context: Context): String =
+  id
+    ?: when {
+      this is Coding && this.code != null -> this.code
+      this is Reference && this.reference != null -> this.reference
+      else -> displayString(context)
+    }
+
 /** Converts StringType to toUriType. */
 internal fun StringType.toUriType(): UriType {
   return UriType(value)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +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.logicalId
 import com.google.android.fhir.datacapture.extensions.targetStructureMap
 import com.google.android.fhir.datacapture.extensions.toCodeType
 import com.google.android.fhir.datacapture.extensions.toCoding
@@ -28,6 +29,7 @@ import java.lang.reflect.Field
 import java.lang.reflect.Method
 import java.lang.reflect.ParameterizedType
 import java.util.Locale
+import org.hl7.fhir.exceptions.FHIRException
 import org.hl7.fhir.r4.context.IWorkerContext
 import org.hl7.fhir.r4.model.Base
 import org.hl7.fhir.r4.model.Bundle
@@ -45,6 +47,7 @@ import org.hl7.fhir.r4.model.IntegerType
 import org.hl7.fhir.r4.model.Parameters
 import org.hl7.fhir.r4.model.Questionnaire
 import org.hl7.fhir.r4.model.QuestionnaireResponse
+import org.hl7.fhir.r4.model.Reference
 import org.hl7.fhir.r4.model.Resource
 import org.hl7.fhir.r4.model.StringType
 import org.hl7.fhir.r4.model.StructureDefinition
@@ -253,9 +256,17 @@ object ResourceMapper {
         // Set initial value for the questionnaire item. Questionnaire items should not have both
         // initial value and initial expression.
         questionnaireItem.initial =
-          mutableListOf(
-            Questionnaire.QuestionnaireItemInitialComponent().setValue(it.asExpectedType())
-          )
+          when (questionnaireItem.type) {
+            Questionnaire.QuestionnaireItemType.REFERENCE ->
+              mutableListOf(
+                Questionnaire.QuestionnaireItemInitialComponent()
+                  .setValue(it.asExpectedReferenceType())
+              )
+            else ->
+              mutableListOf(
+                Questionnaire.QuestionnaireItemInitialComponent().setValue(it.asExpectedType())
+              )
+          }
       }
 
     populateInitialValues(questionnaireItem.item, *resources)
@@ -766,6 +777,24 @@ private fun Base.asExpectedType(): Type {
   }
 }
 
+private fun Base.asExpectedReferenceType(): Type {
+  return when {
+    this.isResource -> {
+      this@asExpectedReferenceType as Resource
+      Reference().apply {
+        reference =
+          "${this@asExpectedReferenceType.resourceType}/${this@asExpectedReferenceType.logicalId}"
+      }
+    }
+    this is IdType ->
+      Reference().apply {
+        reference =
+          "${this@asExpectedReferenceType.resourceType}/${this@asExpectedReferenceType.idPart}"
+      }
+    else -> throw FHIRException("Expression supplied does not evaluate to IdType.")
+  }
+}
+
 /**
  * Returns a newly created [Resource] from the item extraction context extension if one and only one
  * such extension exists in the questionnaire item, or null otherwise.