Merge branch 'master' into ashobhit/2832/draft-position

google · Nov 28, 2024 · 0e46c8b · 0e46c8b
2 parents af2026a + f2441dd
commit 0e46c8b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/ground/build.gradle b/ground/build.gradle
@@ -362,7 +362,7 @@ dependencies {
     api("com.google.protobuf:protobuf-kotlin-lite:4.26.1")
 
     // Pulls protodefs from the specified commit in the ground-platform repo.
-    groundProtoJar "com.github.google:ground-platform:e0cc72b@jar"
+    groundProtoJar "com.github.google:ground-platform:125cf86@jar"
 }
 
 protobuf {

diff --git a/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt b/ground/src/main/java/com/google/android/ground/model/submission/MultipleChoiceTaskData.kt
@@ -30,7 +30,7 @@ class MultipleChoiceTaskData(
   fun getSelectedOptionsIdsExceptOther(): List<String> =
     selectedOptionIds.filterNot { it.isOtherText() }
 
-  fun hasOtherText(): Boolean = selectedOptionIds.any { it.isOtherText() }
+  fun isOtherTextSelected(): Boolean = selectedOptionIds.any { it.isOtherText() }
 
   fun getOtherText(): String =
     selectedOptionIds

diff --git a/...in/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt b/...in/java/com/google/android/ground/persistence/remote/firebase/protobuf/ModelToProtoExt.kt
@@ -138,7 +138,8 @@ private fun toTaskData(id: String, newTaskData: TaskData) = taskData {
       }
     is MultipleChoiceTaskData -> multipleChoiceResponses = multipleChoiceResponses {
         newTaskData.getSelectedOptionsIdsExceptOther().forEach { selectedOptionIds.add(it) }
-        if (newTaskData.hasOtherText()) {
+        if (newTaskData.isOtherTextSelected()) {
+          otherSelected = true
           otherText = newTaskData.getOtherText()
         }
       }

diff --git a/...ogle/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt b/...ogle/android/ground/persistence/remote/firebase/schema/SubmissionMutationConverterTest.kt
@@ -60,6 +60,7 @@ import com.google.android.ground.proto.TaskData.DRAW_GEOMETRY_RESULT_FIELD_NUMBE
 import com.google.android.ground.proto.TaskData.DateTimeResponse.DATE_TIME_FIELD_NUMBER
 import com.google.android.ground.proto.TaskData.DrawGeometryResult.GEOMETRY_FIELD_NUMBER
 import com.google.android.ground.proto.TaskData.MULTIPLE_CHOICE_RESPONSES_FIELD_NUMBER
+import com.google.android.ground.proto.TaskData.MultipleChoiceResponses.OTHER_SELECTED_FIELD_NUMBER
 import com.google.android.ground.proto.TaskData.MultipleChoiceResponses.OTHER_TEXT_FIELD_NUMBER
 import com.google.android.ground.proto.TaskData.MultipleChoiceResponses.SELECTED_OPTION_IDS_FIELD_NUMBER
 import com.google.android.ground.proto.TaskData.NUMBER_RESPONSE_FIELD_NUMBER
@@ -136,6 +137,18 @@ class SubmissionMutationConverterTest {
       ids = listOf("option id 1", "option id 2", "[ other value ]"),
     )
 
+  private val multipleChoiceTaskDataOtherEmpty =
+    MultipleChoiceTaskData.fromList(
+      MultipleChoice(
+        persistentListOf(
+          Option("option id 1", "code1", "Option 1"),
+          Option("option id 2", "code2", "Option 2"),
+        ),
+        MultipleChoice.Cardinality.SELECT_MULTIPLE,
+      ),
+      ids = listOf("[  ]"),
+    )
+
   private val numberTaskData = NumberTaskData.fromNumber("123")
 
   private val dropPinTaskResult = DropPinTaskData(Point(Coordinates(10.0, 20.0)))
@@ -196,6 +209,11 @@ class SubmissionMutationConverterTest {
             taskType = Task.Type.MULTIPLE_CHOICE,
             newTaskData = multipleChoiceTaskDataOther,
           ),
+          ValueDelta(
+            taskId = "multiple_choice_task_other_empty_value",
+            taskType = Task.Type.MULTIPLE_CHOICE,
+            newTaskData = multipleChoiceTaskDataOtherEmpty,
+          ),
           ValueDelta(
             taskId = "number_task",
             taskType = Task.Type.NUMBER,
@@ -234,7 +252,10 @@ class SubmissionMutationConverterTest {
       ),
       mapOf(
         MULTIPLE_CHOICE_RESPONSES_FIELD_NUMBER.toString() to
-          mapOf(OTHER_TEXT_FIELD_NUMBER.toString() to "other value"),
+          mapOf(
+            OTHER_TEXT_FIELD_NUMBER.toString() to "other value",
+            OTHER_SELECTED_FIELD_NUMBER.toString() to true,
+          ),
         TASK_ID_FIELD_NUMBER.toString() to "single_choice_task_other",
       ),
       mapOf(
@@ -249,9 +270,15 @@ class SubmissionMutationConverterTest {
           mapOf(
             SELECTED_OPTION_IDS_FIELD_NUMBER.toString() to listOf("option id 1", "option id 2"),
             OTHER_TEXT_FIELD_NUMBER.toString() to "other value",
+            OTHER_SELECTED_FIELD_NUMBER.toString() to true,
           ),
         TASK_ID_FIELD_NUMBER.toString() to "multiple_choice_task_other",
       ),
+      mapOf(
+        MULTIPLE_CHOICE_RESPONSES_FIELD_NUMBER.toString() to
+          mapOf(OTHER_SELECTED_FIELD_NUMBER.toString() to true),
+        TASK_ID_FIELD_NUMBER.toString() to "multiple_choice_task_other_empty_value",
+      ),
       mapOf(
         NUMBER_RESPONSE_FIELD_NUMBER.toString() to mapOf(NUMBER_FIELD_NUMBER.toString() to 123.0),
         TASK_ID_FIELD_NUMBER.toString() to "number_task",