Skip to content

Migrate the push preferences and create channel members to the generated models #6731

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

Merged
gpunto merged 3 commits into from
Sep 25, 2026
Merged

Migrate the push preferences and create channel members to the generated models #6731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99b6872
Parse the channel and user push preferences with the generated models
gpunto Sep 24, 2026
f103e64
Send the create channel members with the generated ChannelMemberRequest
gpunto Sep 24, 2026
4763968
Rename UpstreamReactionDtoAdapter to ReactionRequestAdapter
gpunto Sep 24, 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
2 changes: 1 addition & 1 deletion stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4659,7 +4659,7 @@ internal constructor(
params: CreateChannelParams,
): Call<Channel> {
val currentUser = getCurrentUser()
val members = with(dtoMapping) { params.members.map { it.toDto() } }
val members = with(dtoMapping) { params.members.map { it.toChannelMemberRequest() } }
val queryChannelRequest = QueryChannelRequest()
.withData(params.extraData + mapOf(QueryChannelRequest.KEY_MEMBERS to members))
return queryChannelInternal(
Expand Down
7 changes: 0 additions & 7 deletions ...droid-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DomainMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamLocationDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderInfoDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadDto
Expand Down Expand Up @@ -1199,12 +1198,6 @@ internal class DomainMapping(
messagesCount = unreadCount,
)

internal fun DownstreamPushPreferenceDto.toDomain(): PushPreference = PushPreference(
level = PushPreferenceLevel.fromValue(chat_level),
disabledUntil = disabled_until,
chatPreferences = chat_preferences?.toDomain(),
)

internal fun PushPreferencesResponse.toDomain(): PushPreference = PushPreference(
level = PushPreferenceLevel.fromValue(chatLevel),
disabledUntil = disabledUntil,
Expand Down
17 changes: 0 additions & 17 deletions ...-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ package io.getstream.chat.android.client.api2.mapping
import io.getstream.chat.android.PrivacySettings
import io.getstream.chat.android.client.api2.model.dto.DeviceDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamConnectedEventDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamLocationDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamMemberDataDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamUserDto
import io.getstream.chat.android.client.events.ConnectedEvent
import io.getstream.chat.android.models.Attachment
Expand Down Expand Up @@ -66,21 +64,6 @@ internal class DtoMapping(
push_provider_name = providerName,
)

/**
* Maps the domain [MemberData] model to a network [UpstreamMemberDataDto] model.
*/
internal fun MemberData.toDto(): UpstreamMemberDataDto = UpstreamMemberDataDto(
user_id = userId,
extraData = extraData,
)

internal fun Location.toDto(): UpstreamLocationDto = UpstreamLocationDto(
latitude = latitude,
longitude = longitude,
created_by_device_id = deviceId,
end_at = endAt,
)

/**
* Maps the domain [Attachment] to the generated network [AttachmentRequest] model.
*
Expand Down
8 changes: 0 additions & 8 deletions ...roid/client/api2/model/dto/LocationDto.kt → ...t/api2/model/dto/DownstreamLocationDto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,13 @@
import com.squareup.moshi.JsonClass
import java.util.Date

@JsonClass(generateAdapter = true)
internal data class UpstreamLocationDto(
val latitude: Double,
val longitude: Double,
val created_by_device_id: String,
val end_at: Date?,
)

@JsonClass(generateAdapter = true)
internal data class DownstreamLocationDto(
val channel_cid: String,

Check warning on line 24 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamLocationDto.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX73toeTqKiBuI6hq&open=AaDXX73toeTqKiBuI6hq&pullRequest=6731
val message_id: String,

Check warning on line 25 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamLocationDto.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX73toeTqKiBuI6hr&open=AaDXX73toeTqKiBuI6hr&pullRequest=6731
val user_id: String,

Check warning on line 26 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamLocationDto.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX73toeTqKiBuI6hs&open=AaDXX73toeTqKiBuI6hs&pullRequest=6731
val latitude: Double,
val longitude: Double,
val created_by_device_id: String,

Check warning on line 29 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamLocationDto.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX73toeTqKiBuI6ht&open=AaDXX73toeTqKiBuI6ht&pullRequest=6731
val end_at: Date?,

Check warning on line 30 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamLocationDto.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX73toeTqKiBuI6hu&open=AaDXX73toeTqKiBuI6hu&pullRequest=6731
)
35 changes: 0 additions & 35 deletions .../main/java/io/getstream/chat/android/client/api2/model/dto/DownstreamPushPreferenceDto.kt
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ...nt/src/main/java/io/getstream/chat/android/client/api2/model/dto/UpstreamMemberDataDto.kt
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.squareup.moshi.JsonClass
import io.getstream.chat.android.core.internal.StreamHandsOff
import io.getstream.chat.android.network.models.PrivacySettingsResponse
import io.getstream.chat.android.network.models.PushPreferencesResponse
import io.getstream.chat.android.network.models.UserMuteResponse
import java.util.Date
import io.getstream.chat.android.network.models.ChannelMute as ChannelMuteResponse
Expand Down Expand Up @@ -82,6 +83,6 @@
val channel_mutes: List<ChannelMuteResponse>?,
val blocked_user_ids: List<String>?,
val avg_response_time: Long?,
val push_preferences: DownstreamPushPreferenceDto?,
val push_preferences: PushPreferencesResponse?,

Check warning on line 86 in stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Rename this parameter to match the regular expression ^`?[_a-z][a-zA-Z0-9]*`?$ 


See more on https://sonarcloud.io/project/issues?id=GetStream_stream-chat-android&issues=AaDXX70IoeTqKiBuI6hp&open=AaDXX70IoeTqKiBuI6hp&pullRequest=6731
val extraData: Map<String, Any>,
) : ExtraDataDto
4 changes: 2 additions & 2 deletions ...ent/src/main/java/io/getstream/chat/android/client/api2/model/response/ChannelResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamChannelDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamDraftDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamUserDto
import io.getstream.chat.android.network.models.ChannelMemberResponse
import io.getstream.chat.android.network.models.ChannelPushPreferencesResponse
import io.getstream.chat.android.network.models.ReadStateResponse
import java.util.Date

Expand All @@ -33,7 +33,7 @@ internal data class ChannelResponse(
val messages: List<DownstreamMessageDto> = emptyList(),
val pending_messages: List<DownstreamPendingMessageDto> = emptyList(),
val pinned_messages: List<DownstreamMessageDto> = emptyList(),
val push_preferences: DownstreamPushPreferenceDto? = null,
val push_preferences: ChannelPushPreferencesResponse? = null,
val members: List<ChannelMemberResponse> = emptyList(),
val membership: ChannelMemberResponse?,
val watchers: List<DownstreamUserDto> = emptyList(),
Expand Down
6 changes: 2 additions & 4 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 @@ -57,11 +57,10 @@ 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.PollResponseDataAdapter
import io.getstream.chat.android.client.parser2.adapters.ReactionRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.ReactionResponseAdapter
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.UpstreamReactionDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UpstreamUserDtoAdapter
import io.getstream.chat.android.client.parser2.adapters.UserRequestAdapter
import io.getstream.chat.android.client.parser2.adapters.UserResponseAdapter
Expand Down Expand Up @@ -97,7 +96,7 @@ internal class MoshiChatParser(
.add(DownstreamMessageDtoAdapter)
.add(DownstreamModerationDetailsDtoAdapter)
.add(DownstreamChannelDtoAdapter)
.add(UpstreamReactionDtoAdapter)
.add(ReactionRequestAdapter)
.add(DownstreamUserDtoAdapter)
.add(UpstreamUserDtoAdapter)
.add(FullUserResponseAdapter)
Expand All @@ -113,7 +112,6 @@ internal class MoshiChatParser(
.add(ChannelResponseAdapter)
.add(ChannelMemberResponseAdapter)
.add(ChannelMemberPartialResponseAdapter)
.add(UpstreamMemberDataDtoAdapter)
.add(FlagRequestAdapterFactory)
.add(DownstreamThreadDtoAdapter)
.add(DownstreamThreadInfoDtoAdapter)
Expand Down
2 changes: 1 addition & 1 deletion ...r2/adapters/UpstreamReactionDtoAdapter.kt → ...arser2/adapters/ReactionRequestAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import com.squareup.moshi.ToJson
import io.getstream.chat.android.network.models.ReactionRequest

// extraDataPropertyName must match the @Json(name = ...) of ReactionRequest's overflow field.
internal object UpstreamReactionDtoAdapter :
internal object ReactionRequestAdapter :
CustomObjectDtoAdapter<ReactionRequest>(ReactionRequest::class, extraDataPropertyName = "custom") {

@FromJson
Expand Down
44 changes: 0 additions & 44 deletions ...in/java/io/getstream/chat/android/client/parser2/adapters/UpstreamMemberDataDtoAdapter.kt
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions stream-chat-android-client/src/test/java/io/getstream/chat/android/client/Mother.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import io.getstream.chat.android.client.api2.model.dto.DownstreamFlagDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamModerationDetailsDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPendingMessageDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamReminderDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadDto
import io.getstream.chat.android.client.api2.model.dto.DownstreamThreadInfoDto
Expand Down Expand Up @@ -90,6 +89,7 @@ import io.getstream.chat.android.network.models.PollResponseData
import io.getstream.chat.android.network.models.PollVoteResponseData
import io.getstream.chat.android.network.models.PollVotesResponse
import io.getstream.chat.android.network.models.PrivacySettingsResponse
import io.getstream.chat.android.network.models.PushPreferencesResponse
import io.getstream.chat.android.network.models.QueryPollsResponse
import io.getstream.chat.android.network.models.ReactionGroupResponse
import io.getstream.chat.android.network.models.ReactionResponse
Expand Down Expand Up @@ -401,7 +401,7 @@ internal object Mother {
channel_mutes: List<ChannelMuteResponse>? = emptyList(),
blocked_user_ids: List<String>? = emptyList(),
avg_response_time: Long? = null,
push_preferences: DownstreamPushPreferenceDto? = randomDownstreamPushPreferenceDto(),
push_preferences: PushPreferencesResponse? = randomPushPreferencesResponse(),
extraData: Map<String, Any> = emptyMap(),
): DownstreamUserDto = DownstreamUserDto(
id = id,
Expand Down Expand Up @@ -1464,12 +1464,12 @@ internal object Mother {
unreadCount = unreadCount,
)

fun randomDownstreamPushPreferenceDto(
fun randomPushPreferencesResponse(
chatLevel: String? = randomString(),
disabledUntil: Date? = randomDateOrNull(),
): DownstreamPushPreferenceDto = DownstreamPushPreferenceDto(
chat_level = chatLevel,
disabled_until = disabledUntil,
): PushPreferencesResponse = PushPreferencesResponse(
chatLevel = chatLevel,
disabledUntil = disabledUntil,
)

fun randomUserGroupMemberDto(
Expand Down
12 changes: 6 additions & 6 deletions ...d-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ import io.getstream.chat.android.client.Mother.randomUserGroupMemberDto
import io.getstream.chat.android.client.Mother.randomUserGroupResponse
import io.getstream.chat.android.client.Mother.randomUserResponse
import io.getstream.chat.android.client.api2.mapping.DomainMappingTest.Companion.toSortDomainArguments
import io.getstream.chat.android.client.api2.model.dto.DownstreamPushPreferenceDto
import io.getstream.chat.android.client.api2.model.response.MessageResponse
import io.getstream.chat.android.client.extensions.internal.sortedByLastReply
import io.getstream.chat.android.client.parser2.testdata.ChannelDtoTestData
Expand Down Expand Up @@ -129,6 +128,7 @@ import io.getstream.chat.android.network.models.ChatPreferencesResponse
import io.getstream.chat.android.network.models.DeliveryReceiptsResponse
import io.getstream.chat.android.network.models.FullUserResponse
import io.getstream.chat.android.network.models.PrivacySettingsResponse
import io.getstream.chat.android.network.models.PushPreferencesResponse
import io.getstream.chat.android.network.models.ReadReceiptsResponse
import io.getstream.chat.android.network.models.SortParamRequest
import io.getstream.chat.android.network.models.TypingIndicatorsResponse
Expand Down Expand Up @@ -1730,14 +1730,14 @@ internal class DomainMappingTest {
}

@Test
fun `DownstreamPushPreferenceDto keeps every chat preference toggle`() {
fun `PushPreferencesResponse keeps every chat preference toggle`() {
val sut = Fixture().get()

val result = with(sut) {
DownstreamPushPreferenceDto(
chat_level = "all",
disabled_until = Date(1000),
chat_preferences = ChatPreferencesResponse(
PushPreferencesResponse(
chatLevel = "all",
disabledUntil = Date(1000),
chatPreferences = ChatPreferencesResponse(
directMentions = "all",
roleMentions = "none",
groupMentions = "all",
Expand Down
13 changes: 0 additions & 13 deletions ...roid-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import io.getstream.chat.android.ReadReceipts
import io.getstream.chat.android.TypingIndicators
import io.getstream.chat.android.client.api2.model.dto.DeviceDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamConnectedEventDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamMemberDataDto
import io.getstream.chat.android.client.api2.model.dto.UpstreamUserDto
import io.getstream.chat.android.client.test.randomConnectedEvent
import io.getstream.chat.android.models.MessageTransformer
Expand Down Expand Up @@ -72,18 +71,6 @@ internal class DtoMappingTest {
dto shouldBeEqualTo expected
}

@Test
fun `MemberData is correctly mapped to Dto`() {
val memberData = randomMemberData()
val mapping = Fixture().get()
val dto = with(mapping) { memberData.toDto() }
val expected = UpstreamMemberDataDto(
user_id = memberData.userId,
extraData = memberData.extraData,
)
dto shouldBeEqualTo expected
}

@Test
fun `DraftMessage is correctly mapped to the generated request model`() {
// Pinned rather than random: an empty extraData or a random `silent` would let a mapper
Expand Down
Loading
Loading