Don't set customTag with property name value. (#2645)

google · Aug 13, 2024 · cde332e · cde332e
1 parent 473427f
commit cde332e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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
@@ -23,7 +23,6 @@ import com.google.android.ground.model.geometry.LinearRing
 import com.google.android.ground.model.geometry.MultiPolygon
 import com.google.android.ground.model.geometry.Point
 import com.google.android.ground.model.geometry.Polygon
-import com.google.android.ground.model.locationofinterest.LOI_NAME_PROPERTY
 import com.google.android.ground.model.locationofinterest.LoiProperties
 import com.google.android.ground.model.mutation.LocationOfInterestMutation
 import com.google.android.ground.model.mutation.Mutation
@@ -103,7 +102,7 @@ fun LocationOfInterestMutation.createLoiMessage(user: User) = locationOfInterest
   jobId = me.jobId
   submissionCount = me.submissionCount
   ownerId = me.userId
-  customTag = me.customId.ifEmpty { me.properties[LOI_NAME_PROPERTY]?.toString() ?: "" }
+  customTag = me.customId
 
   properties.putAll(me.properties.toMessageMap())
 

diff --git a/...om/google/android/ground/persistence/remote/firebase/protobuf/LoiMutationConverterTest.kt b/...om/google/android/ground/persistence/remote/firebase/protobuf/LoiMutationConverterTest.kt
@@ -130,7 +130,8 @@ class LoiMutationConverterTest {
   }
 
   @Test
-  fun `toMap() customTag falls back to name property when empty`() {
+  fun `toMap() customTag is empty when empty`() {
+    // NOTE(#2626): Was previously erroneously set to the property name.
     val mutation =
       LocationOfInterestMutation(
         userId = TEST_USER.id,
@@ -140,7 +141,7 @@ class LoiMutationConverterTest {
       )
 
     val map = mutation.createLoiMessage(TEST_USER).toFirestoreMap()
-    assertThat(map[CUSTOM_TAG_FIELD_NUMBER.toString()]).isEqualTo(LOCATION_OF_INTEREST_NAME)
+    assertThat(map[CUSTOM_TAG_FIELD_NUMBER.toString()]).isNull()
   }
 
   @Test