diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt index 2b0bc153390..646ea433605 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt @@ -61,8 +61,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.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.MuteUserRequest import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest @@ -166,6 +164,8 @@ 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.HideChannelRequest +import io.getstream.chat.android.network.models.MarkReadRequest +import io.getstream.chat.android.network.models.MarkUnreadRequest import io.getstream.chat.android.network.models.MuteChannelRequest import io.getstream.chat.android.network.models.UnblockUsersRequest import io.getstream.chat.android.network.models.UpdateChannelPartialRequest @@ -1148,7 +1148,7 @@ constructor( return channelApi.markRead( channelType = channelType, channelId = channelId, - request = MarkReadRequest(message_id = messageId), + request = MarkReadRequest(messageId = messageId), ).toUnitCall() } @@ -1161,7 +1161,7 @@ constructor( return channelApi.markRead( channelType = channelType, channelId = channelId, - request = MarkReadRequest(thread_id = threadId), + request = MarkReadRequest(threadId = threadId), ).toUnitCall() } @@ -1173,9 +1173,9 @@ constructor( threadId: String?, ): Call { 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() } diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt index 10798f5d8aa..d18e8c122f6 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ChannelApi.kt @@ -23,8 +23,6 @@ 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.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 @@ -44,6 +42,8 @@ import io.getstream.chat.android.client.api2.model.response.QueryChannelsRespons 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.HideChannelRequest +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.UpdateChannelPartialRequest import retrofit2.http.Body diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkReadRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkReadRequest.kt similarity index 61% rename from stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkReadRequest.kt rename to stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkReadRequest.kt index 5049713ab12..6d2b425c5d1 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkReadRequest.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkReadRequest.kt @@ -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, ) diff --git a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkUnreadRequest.kt b/stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkUnreadRequest.kt similarity index 56% rename from stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkUnreadRequest.kt rename to stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkUnreadRequest.kt index 7b5c11dbd14..55ec7ef84a1 100644 --- a/stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/requests/MarkUnreadRequest.kt +++ b/stream-chat-android-client/src/main/java/io/getstream/chat/android/network/models/MarkUnreadRequest.kt @@ -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, ) diff --git a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt index 2c51d922775..9200d35cc0d 100644 --- a/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt +++ b/stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/MoshiChatApiTest.kt @@ -56,8 +56,6 @@ import io.getstream.chat.android.client.api2.model.requests.FlagMessageRequest 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.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.MuteUserRequest import io.getstream.chat.android.client.api2.model.requests.PartialUpdateMessageRequest import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest @@ -164,6 +162,8 @@ import io.getstream.chat.android.network.models.BlockUsersResponse import io.getstream.chat.android.network.models.CreateDeviceRequest import io.getstream.chat.android.network.models.HideChannelRequest 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.MuteChannelRequest import io.getstream.chat.android.network.models.Response import io.getstream.chat.android.network.models.UnblockUsersRequest @@ -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) } @@ -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) } @@ -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) }