Migrate poll option responses to the generated PollOptionResponse model

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt

@@ -1834,7 +1834,7 @@ constructor(
             text = option.text,
             custom = option.extraData,
         )
-        return pollsApi.createPollOption(pollId, body).mapDomain { it.poll_option.toPollOption() }
+        return pollsApi.createPollOption(pollId, body).mapDomain { it.pollOption.toDomain() }
     }
 
     override fun updatePollOption(pollId: String, option: PollOption): Call<PollOption> {
@@ -1847,7 +1847,7 @@ constructor(
             text = option.text,
             custom = option.extraData,
         )
-        return pollsApi.updatePollOption(pollId, body).mapDomain { it.poll_option.toPollOption() }
+        return pollsApi.updatePollOption(pollId, body).mapDomain { it.pollOption.toDomain() }
     }
 
     override fun deletePollOption(pollId: String, optionId: String): Call<Unit> {

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt

@@ -17,7 +17,6 @@
 package io.getstream.chat.android.client.api2.endpoint
 
 import io.getstream.chat.android.client.api.AuthenticatedApi
-import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
 import io.getstream.chat.android.client.api2.model.response.QueryPollVotesResponse
@@ -26,6 +25,7 @@ import io.getstream.chat.android.client.call.RetrofitCall
 import io.getstream.chat.android.network.models.CastPollVoteRequest
 import io.getstream.chat.android.network.models.CreatePollOptionRequest
 import io.getstream.chat.android.network.models.CreatePollRequest
+import io.getstream.chat.android.network.models.PollOptionResponse
 import io.getstream.chat.android.network.models.QueryPollVotesRequest
 import io.getstream.chat.android.network.models.QueryPollsRequest
 import io.getstream.chat.android.network.models.Response

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt

@@ -131,6 +131,7 @@ import io.getstream.chat.android.network.models.AppResponseFields
 import io.getstream.chat.android.network.models.BlockUsersResponse
 import io.getstream.chat.android.network.models.DeviceResponse
 import io.getstream.chat.android.network.models.GetApplicationResponse
+import io.getstream.chat.android.network.models.PollOptionResponseData
 import io.getstream.chat.android.network.models.UnreadCountsChannel
 import io.getstream.chat.android.network.models.UnreadCountsChannelType
 import io.getstream.chat.android.network.models.UnreadCountsThread
@@ -498,6 +499,15 @@ internal class DomainMapping(
         )
     }
 
+    /**
+     * Transforms [PollOptionResponseData] into [PollOption]
+     */
+    internal fun PollOptionResponseData.toDomain(): PollOption = PollOption(
+        id = id,
+        text = text,
+        extraData = custom.mapNotNull { (key, value) -> value?.let { key to it } }.toMap(),
+    )
+
     /**
      * Transforms [DownstreamPollOptionDto] to [Option]
      *

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt

@@ -48,6 +48,7 @@ import io.getstream.chat.android.client.parser2.adapters.EventRequestAdapter
 import io.getstream.chat.android.client.parser2.adapters.ExactDateAdapter
 import io.getstream.chat.android.client.parser2.adapters.PollOptionInputAdapter
 import io.getstream.chat.android.client.parser2.adapters.PollOptionRequestAdapter
+import io.getstream.chat.android.client.parser2.adapters.PollOptionResponseDataAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpdatePollOptionRequestAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpdatePollRequestAdapter
 import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDataDtoAdapter
@@ -99,6 +100,7 @@ internal class MoshiChatParser(
             .add(PollOptionInputAdapter)
             .add(PollOptionRequestAdapter)
             .add(EventRequestAdapter)
+            .add(PollOptionResponseDataAdapter)
             .add(
                 CreatePollRequest.VotingVisibility::class.java,
                 CreatePollRequest.VotingVisibility.VotingVisibilityAdapter(),

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/parser2/adapters/PollOptionResponseDataAdapter.kt

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * 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 io.getstream.chat.android.client.parser2.adapters
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import io.getstream.chat.android.network.models.PollOptionResponseData
+
+/**
+ * Collects the root-level custom fields of a poll option into `custom`, which is how the API sends
+ * them.
+ */
+internal object PollOptionResponseDataAdapter :
+    CustomObjectDtoAdapter<PollOptionResponseData>(
+        PollOptionResponseData::class,
+        extraDataPropertyName = "custom",
+    ) {
+
+    @FromJson
+    fun fromJson(
+        jsonReader: JsonReader,
+        mapAdapter: JsonAdapter<MutableMap<String, Any>>,
+        valueAdapter: JsonAdapter<PollOptionResponseData>,
+    ): PollOptionResponseData? = parseWithExtraData(jsonReader, mapAdapter, valueAdapter)
+
+    @ToJson
+    @Suppress("UNUSED_PARAMETER")
+    fun toJson(jsonWriter: JsonWriter, value: PollOptionResponseData): Unit =
+        error("Can't convert this to Json")
+}

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/PollOptionResponse.kt → stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/PollOptionResponse.kt

@@ -14,19 +14,25 @@
  * limitations under the License.
  */
 
-package io.getstream.chat.android.client.api2.model.response
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
 
-import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DownstreamPollOptionDto
+import com.squareup.moshi.Json
 
 /**
- * Response for creating/updating a poll option.
  *
- * @param duration The duration of the request.
- * @param poll_option The poll option object.
  */
-@JsonClass(generateAdapter = true)
+@com.squareup.moshi.JsonClass(generateAdapter = true)
 internal data class PollOptionResponse(
-    val duration: String,
-    val poll_option: DownstreamPollOptionDto,
+    @Json(name = "duration")
+    internal val duration: String,
+
+    @Json(name = "poll_option")
+    internal val pollOption: io.getstream.chat.android.network.models.PollOptionResponseData,
 )

stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/PollOptionResponseData.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * 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.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport",
+)
+
+package io.getstream.chat.android.network.models
+
+import com.squareup.moshi.Json
+
+/**
+ *
+ */
+@com.squareup.moshi.JsonClass(generateAdapter = true)
+internal data class PollOptionResponseData(
+    @Json(name = "id")
+    internal val id: String,
+
+    @Json(name = "text")
+    internal val text: String,
+
+    @Json(name = "custom")
+    internal val custom: Map<String, Any?> = emptyMap(),
+)

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt

@@ -98,6 +98,7 @@ import io.getstream.chat.android.network.models.BlockUsersResponse
 import io.getstream.chat.android.network.models.DeviceResponse
 import io.getstream.chat.android.network.models.FileUploadConfig
 import io.getstream.chat.android.network.models.GetApplicationResponse
+import io.getstream.chat.android.network.models.PollOptionResponseData
 import io.getstream.chat.android.network.models.UnblockUsersResponse
 import io.getstream.chat.android.network.models.UnreadCountsChannel
 import io.getstream.chat.android.network.models.UnreadCountsChannelType
@@ -1156,6 +1157,16 @@ internal object Mother {
         extraData = extraData,
     )
 
+    fun randomPollOptionResponseData(
+        id: String = randomString(),
+        text: String = randomString(),
+        custom: Map<String, Any?> = emptyMap(),
+    ): PollOptionResponseData = PollOptionResponseData(
+        id = id,
+        text = text,
+        custom = custom,
+    )
+
     fun randomDownstreamOptionDto(
         id: String = randomString(),
         text: String = randomString(),

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt

@@ -63,7 +63,6 @@ import io.getstream.chat.android.client.api2.model.response.MessageResponse
 import io.getstream.chat.android.client.api2.model.response.MessagesResponse
 import io.getstream.chat.android.client.api2.model.response.MuteUserResponse
 import io.getstream.chat.android.client.api2.model.response.ParsedPredefinedFilterResponse
-import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
 import io.getstream.chat.android.client.api2.model.response.PushPreferencesResponse
@@ -155,6 +154,7 @@ import io.getstream.chat.android.network.models.MessageActionRequest
 import io.getstream.chat.android.network.models.MuteChannelRequest
 import io.getstream.chat.android.network.models.PollOptionInput
 import io.getstream.chat.android.network.models.PollOptionRequest
+import io.getstream.chat.android.network.models.PollOptionResponse
 import io.getstream.chat.android.network.models.QueryDraftsRequest
 import io.getstream.chat.android.network.models.QueryPollVotesRequest
 import io.getstream.chat.android.network.models.QueryPollsRequest

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTestArguments.kt

@@ -39,7 +39,6 @@ import io.getstream.chat.android.client.api2.model.response.MessageResponse
 import io.getstream.chat.android.client.api2.model.response.MessagesResponse
 import io.getstream.chat.android.client.api2.model.response.MuteUserResponse
 import io.getstream.chat.android.client.api2.model.response.ParsedPredefinedFilterResponse
-import io.getstream.chat.android.client.api2.model.response.PollOptionResponse
 import io.getstream.chat.android.client.api2.model.response.PollResponse
 import io.getstream.chat.android.client.api2.model.response.PollVoteResponse
 import io.getstream.chat.android.client.api2.model.response.QueryBannedUsersResponse
@@ -79,6 +78,7 @@ import io.getstream.chat.android.network.models.GetApplicationResponse
 import io.getstream.chat.android.network.models.GetUserGroupResponse
 import io.getstream.chat.android.network.models.ListDevicesResponse
 import io.getstream.chat.android.network.models.ListUserGroupsResponse
+import io.getstream.chat.android.network.models.PollOptionResponse
 import io.getstream.chat.android.network.models.RemoveUserGroupMembersResponse
 import io.getstream.chat.android.network.models.Response
 import io.getstream.chat.android.network.models.SearchRolesResponse
@@ -901,7 +901,7 @@ internal object MoshiChatApiTestArguments {
             RetroSuccess(
                 PollOptionResponse(
                     duration = randomString(),
-                    poll_option = Mother.randomDownstreamOptionDto(),
+                    pollOption = Mother.randomPollOptionResponseData(),
                 ),
             ).toRetrofitCall(),
             Result.Success::class,

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/parser2/PollOptionResponseParsingTest.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-chat-android/blob/main/LICENSE
+ *
+ * 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 io.getstream.chat.android.client.parser2
+
+import io.getstream.chat.android.network.models.PollOptionResponse
+import org.amshove.kluent.shouldBeEmpty
+import org.amshove.kluent.shouldBeEqualTo
+import org.junit.jupiter.api.Test
+
+internal class PollOptionResponseParsingTest {
+    private val parser = ParserFactory.createMoshiChatParser()
+
+    @Test
+    fun `Deserialize a poll option response`() {
+        val response = parser.fromJson(POLL_OPTION_JSON, PollOptionResponse::class.java)
+
+        response.duration shouldBeEqualTo "12ms"
+        response.pollOption.id shouldBeEqualTo "optionId"
+        response.pollOption.text shouldBeEqualTo "Option text"
+    }
+
+    @Test
+    fun `Collect the root-level custom fields of a poll option`() {
+        val response = parser.fromJson(POLL_OPTION_JSON, PollOptionResponse::class.java)
+
+        response.pollOption.custom shouldBeEqualTo mapOf("sentiment" to "positive")
+    }
+
+    @Test
+    fun `Deserialize a poll option without custom fields`() {
+        val response = parser.fromJson(POLL_OPTION_WITHOUT_CUSTOM_JSON, PollOptionResponse::class.java)
+
+        response.pollOption.custom.shouldBeEmpty()
+    }
+
+    companion object {
+        private const val POLL_OPTION_JSON =
+            """{
+                "duration": "12ms",
+                "poll_option": {
+                    "id": "optionId",
+                    "text": "Option text",
+                    "sentiment": "positive"
+                }
+            }"""
+
+        private const val POLL_OPTION_WITHOUT_CUSTOM_JSON =
+            """{
+                "duration": "12ms",
+                "poll_option": {
+                    "id": "optionId",
+                    "text": "Option text"
+                }
+            }"""
+    }
+}