Skip to content

Migrate poll write request bodies to generated models #6607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gpunto wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Migrate poll write request bodies to generated models #6607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90ddcc9
Migrate poll write request bodies to generated CreatePollRequest, Upd…
gpunto Jul 30, 2026
8a3d46f
Add serialization tests for the remaining poll write request custom-f…
gpunto Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 34 additions & 30 deletions ...m-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ import io.getstream.chat.android.client.api2.model.dto.UpstreamPushPreferenceInp
import io.getstream.chat.android.client.api2.model.requests.AcceptInviteRequest
import io.getstream.chat.android.client.api2.model.requests.AddMembersRequest
import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
import io.getstream.chat.android.client.api2.model.requests.FlagMessageRequest
import io.getstream.chat.android.client.api2.model.requests.FlagRequest
import io.getstream.chat.android.client.api2.model.requests.FlagUserRequest
Expand Down Expand Up @@ -80,7 +79,6 @@ import io.getstream.chat.android.client.api2.model.requests.UpdateLiveLocationRe
import io.getstream.chat.android.client.api2.model.requests.UpdateMessageRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateUsersRequest
import io.getstream.chat.android.client.api2.model.requests.UpsertPushPreferencesRequest
import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
import io.getstream.chat.android.client.api2.model.response.ChannelResponse
import io.getstream.chat.android.client.api2.model.response.PushPreferencesResponse
import io.getstream.chat.android.client.api2.model.response.TranslateMessageRequest
Expand Down Expand Up @@ -148,6 +146,8 @@ import io.getstream.chat.android.network.models.AddUserGroupMembersResponse
import io.getstream.chat.android.network.models.BlockUsersRequest
import io.getstream.chat.android.network.models.CastPollVoteRequest
import io.getstream.chat.android.network.models.CreateDeviceRequest
import io.getstream.chat.android.network.models.CreatePollOptionRequest
import io.getstream.chat.android.network.models.CreatePollRequest
import io.getstream.chat.android.network.models.CreateUserGroupRequest
import io.getstream.chat.android.network.models.CreateUserGroupResponse
import io.getstream.chat.android.network.models.DeliveredMessagePayload
Expand All @@ -159,6 +159,8 @@ import io.getstream.chat.android.network.models.MarkReadRequest
import io.getstream.chat.android.network.models.MarkUnreadRequest
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.QueryPollVotesRequest
import io.getstream.chat.android.network.models.QueryPollsRequest
import io.getstream.chat.android.network.models.QueryReactionsRequest
Expand All @@ -170,6 +172,7 @@ import io.getstream.chat.android.network.models.SortParamRequest
import io.getstream.chat.android.network.models.UnblockUsersRequest
import io.getstream.chat.android.network.models.UpdateChannelPartialRequest
import io.getstream.chat.android.network.models.UpdateMemberPartialRequest
import io.getstream.chat.android.network.models.UpdatePollOptionRequest
import io.getstream.chat.android.network.models.UpdatePollPartialRequest
import io.getstream.chat.android.network.models.UpdateUserGroupRequest
import io.getstream.chat.android.network.models.UpdateUserGroupResponse
Expand All @@ -190,6 +193,7 @@ import okhttp3.ResponseBody
import java.io.File
import java.util.Date
import io.getstream.chat.android.client.api.models.SendActionRequest as DomainSendActionRequest
import io.getstream.chat.android.network.models.UpdatePollRequest as UpdatePollRequestDto

@Suppress("TooManyFunctions", "LargeClass")
internal class MoshiChatApi
Expand Down Expand Up @@ -1823,18 +1827,18 @@ constructor(
}

override fun createPollOption(pollId: String, option: PollOption): Call<PollOption> {
val body = UpstreamOptionDto(
val body = CreatePollOptionRequest(
text = option.text,
extraData = option.extraData,
custom = option.extraData,
)
return pollsApi.createPollOption(pollId, body).mapDomain { it.poll_option.toPollOption() }
}

override fun updatePollOption(pollId: String, option: PollOption): Call<PollOption> {
val body = UpstreamOptionDto(
id = option.id,
val body = UpdatePollOptionRequest(
id = option.id.orEmpty(),
text = option.text,
extraData = option.extraData,
custom = option.extraData,
)
return pollsApi.updatePollOption(pollId, body).mapDomain { it.poll_option.toPollOption() }
}
Expand Down Expand Up @@ -1877,49 +1881,49 @@ constructor(
override fun createPoll(createPollParams: CreatePollParams): Call<Poll> {
return pollsApi.createPoll(
CreatePollRequest(
allow_answers = createPollParams.allowAnswers,
allow_user_suggested_options = createPollParams.allowUserSuggestedOptions,
allowAnswers = createPollParams.allowAnswers,
allowUserSuggestedOptions = createPollParams.allowUserSuggestedOptions,
description = createPollParams.description,
enforce_unique_vote = createPollParams.enforceUniqueVote,
max_votes_allowed = createPollParams.maxVotesAllowed,
enforceUniqueVote = createPollParams.enforceUniqueVote,
maxVotesAllowed = createPollParams.maxVotesAllowed,
name = createPollParams.name,
options = createPollParams.optionsWithExtraData.map {
UpstreamOptionDto(
PollOptionInput(
text = it.text,
extraData = it.extraData,
custom = it.extraData,
)
},
voting_visibility = when (createPollParams.votingVisibility) {
VotingVisibility.PUBLIC -> CreatePollRequest.VOTING_VISIBILITY_PUBLIC
VotingVisibility.ANONYMOUS -> CreatePollRequest.VOTING_VISIBILITY_ANONYMOUS
votingVisibility = when (createPollParams.votingVisibility) {
VotingVisibility.PUBLIC -> CreatePollRequest.VotingVisibility.Public
VotingVisibility.ANONYMOUS -> CreatePollRequest.VotingVisibility.Anonymous
},
extraData = createPollParams.extraData,
custom = createPollParams.extraData,
),
).mapDomain { it.poll.toDomain() }
}

override fun updatePoll(request: UpdatePollRequest): Call<Poll> {
val body = io.getstream.chat.android.client.api2.model.requests.UpdatePollRequest(
allow_answers = request.allowAnswers,
allow_user_suggested_options = request.allowUserSuggestedOptions,
val body = UpdatePollRequestDto(
allowAnswers = request.allowAnswers,
allowUserSuggestedOptions = request.allowUserSuggestedOptions,
description = request.description,
enforce_unique_vote = request.enforceUniqueVote,
enforceUniqueVote = request.enforceUniqueVote,
id = request.id,
is_closed = request.isClosed,
max_votes_allowed = request.maxVotesAllowed,
isClosed = request.isClosed,
maxVotesAllowed = request.maxVotesAllowed,
name = request.name,
options = request.options?.map {
UpstreamOptionDto(
id = it.id,
PollOptionRequest(
id = it.id.orEmpty(),
text = it.text,
extraData = it.extraData,
custom = it.extraData,
)
},
voting_visibility = when (request.votingVisibility) {
VotingVisibility.PUBLIC -> CreatePollRequest.VOTING_VISIBILITY_PUBLIC
VotingVisibility.ANONYMOUS -> CreatePollRequest.VOTING_VISIBILITY_ANONYMOUS
votingVisibility = when (request.votingVisibility) {
VotingVisibility.PUBLIC -> UpdatePollRequestDto.VotingVisibility.Public
VotingVisibility.ANONYMOUS -> UpdatePollRequestDto.VotingVisibility.Anonymous
},
extraData = request.extraData,
custom = request.extraData,
)
return pollsApi.updatePoll(body).mapDomain { it.poll.toDomain() }
}
Expand Down
11 changes: 6 additions & 5 deletions ...t-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/PollsApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@
package io.getstream.chat.android.client.api2.endpoint

import io.getstream.chat.android.client.api.AuthenticatedApi
import io.getstream.chat.android.client.api2.model.requests.CreatePollRequest
import io.getstream.chat.android.client.api2.model.requests.UpdatePollRequest
import io.getstream.chat.android.client.api2.model.requests.UpstreamOptionDto
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
import io.getstream.chat.android.client.api2.model.response.QueryPollsResponse
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.QueryPollVotesRequest
import io.getstream.chat.android.network.models.QueryPollsRequest
import io.getstream.chat.android.network.models.Response
import io.getstream.chat.android.network.models.UpdatePollOptionRequest
import io.getstream.chat.android.network.models.UpdatePollPartialRequest
import io.getstream.chat.android.network.models.UpdatePollRequest
import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
Expand Down Expand Up @@ -119,7 +120,7 @@ internal interface PollsApi {
@POST("/polls/{poll_id}/options")
fun createPollOption(
@Path("poll_id") pollId: String,
@Body body: UpstreamOptionDto,
@Body body: CreatePollOptionRequest,
): RetrofitCall<PollOptionResponse>

/**
Expand All @@ -133,7 +134,7 @@ internal interface PollsApi {
@PUT("/polls/{poll_id}/options")
fun updatePollOption(
@Path("poll_id") pollId: String,
@Body body: UpstreamOptionDto,
@Body body: UpdatePollOptionRequest,
): RetrofitCall<PollOptionResponse>

/**
Expand Down
96 changes: 0 additions & 96 deletions ...client/src/main/java/io/getstream/chat/android/client/api2/model/requests/PollRequests.kt
View file
Open in desktop

This file was deleted.

22 changes: 20 additions & 2 deletions ...-android-client/src/main/java/io/getstream/chat/android/client/parser2/MoshiChatParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import io.getstream.chat.android.client.events.ConnectedEvent
import io.getstream.chat.android.client.extensions.internal.enrichIfNeeded
import io.getstream.chat.android.client.parser.ChatParser
import io.getstream.chat.android.client.parser2.adapters.AttachmentDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.CreatePollOptionRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.CreatePollRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.DownstreamChannelDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.DownstreamMemberDtoAdapter
Expand All @@ -44,15 +45,20 @@ import io.getstream.chat.android.client.parser2.adapters.DownstreamThreadInfoDto
import io.getstream.chat.android.client.parser2.adapters.DownstreamUserDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.EventAdapterFactory
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.UpdatePollOptionRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.UpdatePollRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDataDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamMemberDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamMessageDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamOptionDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamReactionDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamUserDtoAdapter
import io.getstream.chat.android.client.socket.ErrorResponse
import io.getstream.chat.android.client.socket.SocketErrorMessage
import io.getstream.chat.android.network.infrastructure.Serializer
import io.getstream.chat.android.network.models.CreatePollRequest
import io.getstream.chat.android.network.models.UpdatePollRequest
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory

Expand Down Expand Up @@ -84,7 +90,19 @@ internal class MoshiChatParser(
.add(DownstreamPollDtoAdapter)
.add(DownstreamPollOptionDtoAdapter)
.add(CreatePollRequestAdapter)
.add(UpstreamOptionDtoAdapter)
.add(UpdatePollRequestAdapter)
.add(CreatePollOptionRequestAdapter)
.add(UpdatePollOptionRequestAdapter)
.add(PollOptionInputAdapter)
.add(PollOptionRequestAdapter)
.add(
CreatePollRequest.VotingVisibility::class.java,
CreatePollRequest.VotingVisibility.VotingVisibilityAdapter(),
)
.add(
UpdatePollRequest.VotingVisibility::class.java,
UpdatePollRequest.VotingVisibility.VotingVisibilityAdapter(),
)
.build()
}

Expand Down
Loading
Loading