Skip to content

Migrate read-state request bodies to generated models #6550

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

Open
gpunto wants to merge 2 commits into
base: develop
Choose a base branch
from
+55 −26
Open

Migrate read-state request bodies to generated models #6550

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
17cefd6
Migrate mark read and mark unread requests to generated models
gpunto Jul 6, 2026
7859ac8
Merge branch 'develop' into migrate/read-state-requests
gpunto Jul 8, 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
14 changes: 7 additions & 7 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 @@ -62,8 +62,6 @@ import io.getstream.chat.android.client.api2.model.requests.GuestUserRequest
import io.getstream.chat.android.client.api2.model.requests.HideChannelRequest
import io.getstream.chat.android.client.api2.model.requests.InviteMembersRequest
import io.getstream.chat.android.client.api2.model.requests.MarkDeliveredRequest
import io.getstream.chat.android.client.api2.model.requests.MarkReadRequest
import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
import io.getstream.chat.android.client.api2.model.requests.MuteChannelRequest
import io.getstream.chat.android.client.api2.model.requests.MuteUserRequest
import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest
Expand Down Expand Up @@ -168,6 +166,8 @@ import io.getstream.chat.android.models.VotingVisibility
import io.getstream.chat.android.models.querysort.QuerySorter
import io.getstream.chat.android.network.models.BlockUsersRequest
import io.getstream.chat.android.network.models.CreateDeviceRequest
import io.getstream.chat.android.network.models.MarkReadRequest
import io.getstream.chat.android.network.models.MarkUnreadRequest
import io.getstream.chat.android.network.models.UnblockUsersRequest
import io.getstream.log.taggedLogger
import io.getstream.result.Error
Expand Down Expand Up @@ -1148,7 +1148,7 @@ constructor(
return channelApi.markRead(
channelType = channelType,
channelId = channelId,
request = MarkReadRequest(message_id = messageId),
request = MarkReadRequest(messageId = messageId),
).toUnitCall()
}

Expand All @@ -1161,7 +1161,7 @@ constructor(
return channelApi.markRead(
channelType = channelType,
channelId = channelId,
request = MarkReadRequest(thread_id = threadId),
request = MarkReadRequest(threadId = threadId),
).toUnitCall()
}

Expand All @@ -1173,9 +1173,9 @@ constructor(
threadId: String?,
): Call<Unit> {
val request = MarkUnreadRequest(
message_id = messageId,
message_timestamp = messageTimestamp,
thread_id = threadId,
messageId = messageId,
messageTimestamp = messageTimestamp,
threadId = threadId,
)
return channelApi.markUnread(channelType, channelId, request).toUnitCall()
}
Expand Down
4 changes: 2 additions & 2 deletions ...android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import io.getstream.chat.android.client.api2.model.requests.AddMembersRequest
import io.getstream.chat.android.client.api2.model.requests.HideChannelRequest
import io.getstream.chat.android.client.api2.model.requests.InviteMembersRequest
import io.getstream.chat.android.client.api2.model.requests.MarkDeliveredRequest
import io.getstream.chat.android.client.api2.model.requests.MarkReadRequest
import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
import io.getstream.chat.android.client.api2.model.requests.PinnedMessagesRequest
import io.getstream.chat.android.client.api2.model.requests.QueryChannelRequest
import io.getstream.chat.android.client.api2.model.requests.QueryChannelsRequest
Expand All @@ -45,6 +43,8 @@ import io.getstream.chat.android.client.api2.model.response.MessagesResponse
import io.getstream.chat.android.client.api2.model.response.QueryChannelsResponse
import io.getstream.chat.android.client.api2.model.response.QueryGroupedChannelsResponse
import io.getstream.chat.android.client.call.RetrofitCall
import io.getstream.chat.android.network.models.MarkReadRequest
import io.getstream.chat.android.network.models.MarkUnreadRequest
import io.getstream.chat.android.network.models.Response
import retrofit2.http.Body
import retrofit2.http.DELETE
Expand Down
24 changes: 19 additions & 5 deletions ...nt/api2/model/requests/MarkReadRequest.kt → ...android/network/models/MarkReadRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,26 @@
* limitations under the License.
*/

package io.getstream.chat.android.client.api2.model.requests
@file:Suppress(
"ArrayInDataClass",
"EnumEntryName",
"RemoveRedundantQualifierName",
"UnusedImport",
)

package io.getstream.chat.android.network.models

import com.squareup.moshi.Json

import com.squareup.moshi.JsonClass
/**
*
*/

@JsonClass(generateAdapter = true)
@com.squareup.moshi.JsonClass(generateAdapter = true)
internal data class MarkReadRequest(
val message_id: String = "",
val thread_id: String? = null,
@Json(name = "message_id")
internal val messageId: String? = null,

@Json(name = "thread_id")
internal val threadId: String? = null,
)
29 changes: 22 additions & 7 deletions .../api2/model/requests/MarkUnreadRequest.kt → ...droid/network/models/MarkUnreadRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,29 @@
* limitations under the License.
*/

package io.getstream.chat.android.client.api2.model.requests
@file:Suppress(
"ArrayInDataClass",
"EnumEntryName",
"RemoveRedundantQualifierName",
"UnusedImport",
)

package io.getstream.chat.android.network.models

import com.squareup.moshi.JsonClass
import java.util.Date
import com.squareup.moshi.Json

@JsonClass(generateAdapter = true)
/**
*
*/

@com.squareup.moshi.JsonClass(generateAdapter = true)
internal data class MarkUnreadRequest(
val message_id: String? = null,
val message_timestamp: Date? = null,
val thread_id: String? = null,
@Json(name = "message_id")
internal val messageId: String? = null,

@Json(name = "message_timestamp")
internal val messageTimestamp: java.util.Date? = null,

@Json(name = "thread_id")
internal val threadId: String? = null,
)
10 changes: 5 additions & 5 deletions ...at-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ import io.getstream.chat.android.client.api2.model.requests.FlagUserRequest
import io.getstream.chat.android.client.api2.model.requests.GuestUserRequest
import io.getstream.chat.android.client.api2.model.requests.HideChannelRequest
import io.getstream.chat.android.client.api2.model.requests.MarkDeliveredRequest
import io.getstream.chat.android.client.api2.model.requests.MarkReadRequest
import io.getstream.chat.android.client.api2.model.requests.MarkUnreadRequest
import io.getstream.chat.android.client.api2.model.requests.MuteChannelRequest
import io.getstream.chat.android.client.api2.model.requests.MuteUserRequest
import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest
Expand Down Expand Up @@ -166,6 +164,8 @@ import io.getstream.chat.android.network.models.BlockUsersRequest
import io.getstream.chat.android.network.models.BlockUsersResponse
import io.getstream.chat.android.network.models.CreateDeviceRequest
import io.getstream.chat.android.network.models.ListDevicesResponse
import io.getstream.chat.android.network.models.MarkReadRequest
import io.getstream.chat.android.network.models.MarkUnreadRequest
import io.getstream.chat.android.network.models.Response
import io.getstream.chat.android.network.models.UnblockUsersRequest
import io.getstream.chat.android.network.models.UnblockUsersResponse
Expand Down Expand Up @@ -1448,7 +1448,7 @@ internal class MoshiChatApiTest {
val messageId = randomString()
val result = sut.markRead(channelType, channelId, messageId).await()
// then
val expectedRequest = MarkReadRequest(message_id = messageId)
val expectedRequest = MarkReadRequest(messageId = messageId)
result `should be instance of` expected
verify(api, times(1)).markRead(channelType, channelId, expectedRequest)
}
Expand Down Expand Up @@ -1493,7 +1493,7 @@ internal class MoshiChatApiTest {
val threadId = randomString()
val result = sut.markThreadRead(channelType, channelId, threadId).await()
// then
val expectedRequest = MarkReadRequest(thread_id = threadId)
val expectedRequest = MarkReadRequest(threadId = threadId)
result `should be instance of` expected
verify(api, times(1)).markRead(channelType, channelId, expectedRequest)
}
Expand All @@ -1516,7 +1516,7 @@ internal class MoshiChatApiTest {
val result = sut.markUnread(channelType, channelId, messageId, messageTimestamp, threadId).await()
// then
val expectedRequest =
MarkUnreadRequest(message_id = messageId, message_timestamp = messageTimestamp, thread_id = threadId)
MarkUnreadRequest(messageId = messageId, messageTimestamp = messageTimestamp, threadId = threadId)
result `should be instance of` expected
verify(api, times(1)).markUnread(channelType, channelId, expectedRequest)
}
Expand Down
Loading