Skip to content

Migrate channel config request bodies to generated models #6554

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 1 commit into
base: develop
Choose a base branch
from
+68 −28
Draft

Migrate channel config request bodies to generated models #6554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 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 @@ -60,12 +60,10 @@ 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
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
import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest
Expand All @@ -92,7 +90,6 @@ import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
import io.getstream.chat.android.client.api2.model.requests.SendMessageRequest
import io.getstream.chat.android.client.api2.model.requests.SyncHistoryRequest
import io.getstream.chat.android.client.api2.model.requests.TruncateChannelRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateChannelPartialRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateChannelRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateCooldownRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateLiveLocationRequest
Expand Down Expand Up @@ -168,7 +165,10 @@ import io.getstream.chat.android.models.Vote
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.HideChannelRequest
import io.getstream.chat.android.network.models.MuteChannelRequest
import io.getstream.chat.android.network.models.UnblockUsersRequest
import io.getstream.chat.android.network.models.UpdateChannelPartialRequest
import io.getstream.log.taggedLogger
import io.getstream.result.Error
import io.getstream.result.Result
Expand Down Expand Up @@ -732,7 +732,7 @@ constructor(
): Call<Unit> {
return moderationApi.muteChannel(
body = MuteChannelRequest(
channel_cid = "$channelType:$channelId",
channelCids = listOf("$channelType:$channelId"),
expiration = expiration,
),
).toUnitCall()
Expand All @@ -744,7 +744,7 @@ constructor(
): Call<Unit> {
return moderationApi.unmuteChannel(
body = MuteChannelRequest(
channel_cid = "$channelType:$channelId",
channelCids = listOf("$channelType:$channelId"),
expiration = null,
),
).toUnitCall()
Expand Down Expand Up @@ -1075,7 +1075,7 @@ constructor(
return channelApi.updateChannelPartial(
channelType = channelType,
channelId = channelId,
body = UpdateChannelPartialRequest(set, unset),
body = UpdateChannelPartialRequest(set = set, unset = unset),
).map(this::flattenChannel)
}

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 @@ -21,7 +21,6 @@ import io.getstream.chat.android.client.api.QueryParams
import io.getstream.chat.android.client.api2.UrlQueryPayload
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.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
Expand All @@ -34,7 +33,6 @@ import io.getstream.chat.android.client.api2.model.requests.RejectInviteRequest
import io.getstream.chat.android.client.api2.model.requests.RemoveMembersRequest
import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
import io.getstream.chat.android.client.api2.model.requests.TruncateChannelRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateChannelPartialRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateChannelRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateCooldownRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateMemberPartialRequest
Expand All @@ -45,7 +43,9 @@ 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.HideChannelRequest
import io.getstream.chat.android.network.models.Response
import io.getstream.chat.android.network.models.UpdateChannelPartialRequest
import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
Expand Down
2 changes: 1 addition & 1 deletion ...roid-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/ModerationApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import io.getstream.chat.android.client.api.AuthenticatedApi
import io.getstream.chat.android.client.api2.UrlQueryPayload
import io.getstream.chat.android.client.api2.model.requests.BanUserRequest
import io.getstream.chat.android.client.api2.model.requests.FlagRequest
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.QueryBannedUsersRequest
import io.getstream.chat.android.client.api2.model.response.FlagResponse
import io.getstream.chat.android.client.api2.model.response.MuteUserResponse
import io.getstream.chat.android.client.api2.model.response.QueryBannedUsersResponse
import io.getstream.chat.android.client.call.RetrofitCall
import io.getstream.chat.android.network.models.MuteChannelRequest
import io.getstream.chat.android.network.models.Response
import retrofit2.http.Body
import retrofit2.http.DELETE
Expand Down
20 changes: 16 additions & 4 deletions ...api2/model/requests/HideChannelRequest.kt → ...roid/network/models/HideChannelRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,23 @@
* 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 HideChannelRequest(
val clear_history: Boolean,
@Json(name = "clear_history")
internal val clearHistory: Boolean? = null,
)
24 changes: 19 additions & 5 deletions ...api2/model/requests/MuteChannelRequest.kt → ...roid/network/models/MuteChannelRequest.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 MuteChannelRequest(
val channel_cid: String,
val expiration: Int?,
@Json(name = "expiration")
internal val expiration: Int? = null,

@Json(name = "channel_cids")
internal val channelCids: List<String>? = emptyList(),
)
24 changes: 19 additions & 5 deletions ...l/requests/UpdateChannelPartialRequest.kt → ...ork/models/UpdateChannelPartialRequest.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 UpdateChannelPartialRequest(
val set: Map<String, Any>,
val unset: List<String>,
@Json(name = "unset")
internal val unset: List<String>? = emptyList(),

@Json(name = "set")
internal val set: Map<String, Any?>? = emptyMap(),
)
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 @@ -56,11 +56,9 @@ import io.getstream.chat.android.client.api2.model.requests.DeliveredMessageDto
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.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
import io.getstream.chat.android.client.api2.model.requests.PartialUpdatePollRequest
Expand All @@ -80,7 +78,6 @@ import io.getstream.chat.android.client.api2.model.requests.ReminderRequest
import io.getstream.chat.android.client.api2.model.requests.RemoveUserGroupMembersRequest
import io.getstream.chat.android.client.api2.model.requests.SendActionRequest
import io.getstream.chat.android.client.api2.model.requests.SendEventRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateChannelPartialRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateCooldownRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateLiveLocationRequest
import io.getstream.chat.android.client.api2.model.requests.UpdateMemberPartialRequest
Expand Down Expand Up @@ -166,9 +163,12 @@ import io.getstream.chat.android.models.querysort.QuerySortByField.Companion.asc
import io.getstream.chat.android.models.querysort.QuerySortByField.Companion.descByName
import io.getstream.chat.android.network.models.BlockUsersRequest
import io.getstream.chat.android.network.models.BlockUsersResponse
import io.getstream.chat.android.network.models.HideChannelRequest
import io.getstream.chat.android.network.models.MuteChannelRequest
import io.getstream.chat.android.network.models.Response
import io.getstream.chat.android.network.models.UnblockUsersRequest
import io.getstream.chat.android.network.models.UnblockUsersResponse
import io.getstream.chat.android.network.models.UpdateChannelPartialRequest
import io.getstream.chat.android.positiveRandomInt
import io.getstream.chat.android.randomBoolean
import io.getstream.chat.android.randomCID
Expand Down Expand Up @@ -674,7 +674,7 @@ internal class MoshiChatApiTest {
val result = sut.muteChannel(channelType, channelId, expiration).await()
// then
val expectedRequest = MuteChannelRequest(
channel_cid = "$channelType:$channelId",
channelCids = listOf("$channelType:$channelId"),
expiration = expiration,
)
result `should be instance of` expected
Expand All @@ -696,7 +696,7 @@ internal class MoshiChatApiTest {
val result = sut.unmuteChannel(channelType, channelId).await()
// then
val expectedRequest = MuteChannelRequest(
channel_cid = "$channelType:$channelId",
channelCids = listOf("$channelType:$channelId"),
expiration = null,
)
result `should be instance of` expected
Expand Down
Loading