-
Notifications
You must be signed in to change notification settings - Fork 320
Migrate the queryBlockedUsers response to the generated GetBlockedUsersResponse model #6647
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...roid-client/src/main/java/io/getstream/chat/android/network/models/BlockedUserResponse.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| @file:Suppress( | ||
| "ArrayInDataClass", | ||
| "EnumEntryName", | ||
| "RemoveRedundantQualifierName", | ||
| "UnusedImport", | ||
| ) | ||
|
|
||
| package io.getstream.chat.android.network.models | ||
|
|
||
| import com.squareup.moshi.Json | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| @com.squareup.moshi.JsonClass(generateAdapter = true) | ||
| internal data class BlockedUserResponse( | ||
| @Json(name = "blocked_user_id") | ||
| internal val blockedUserId: String, | ||
|
|
||
| @Json(name = "created_at") | ||
| internal val createdAt: java.util.Date, | ||
|
|
||
| @Json(name = "user_id") | ||
| internal val userId: String, | ||
|
|
||
| @Json(name = "blocked_user") | ||
| internal val blockedUser: io.getstream.chat.android.network.models.UserResponse, | ||
|
|
||
| @Json(name = "user") | ||
| internal val user: io.getstream.chat.android.network.models.UserResponse, | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
...-client/src/test/java/io/getstream/chat/android/client/parser2/BlockedUsersParsingTest.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2014-2026 Stream.io Inc. All rights reserved. | ||
| * | ||
| * Licensed under the Stream License; | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://github.com/GetStream/stream-chat-android/blob/main/LICENSE | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package io.getstream.chat.android.client.parser2 | ||
|
|
||
| import io.getstream.chat.android.client.api2.mapping.DomainMapping | ||
| import io.getstream.chat.android.models.NoOpChannelTransformer | ||
| import io.getstream.chat.android.models.NoOpMessageTransformer | ||
| import io.getstream.chat.android.models.NoOpUserTransformer | ||
| import io.getstream.chat.android.models.UserBlock | ||
| import io.getstream.chat.android.network.models.GetBlockedUsersResponse | ||
| import org.intellij.lang.annotations.Language | ||
| import org.junit.jupiter.api.Assertions.assertEquals | ||
| import org.junit.jupiter.api.Test | ||
| import java.util.Date | ||
|
|
||
| internal class BlockedUsersParsingTest { | ||
|
|
||
| private val parser = ParserFactory.createMoshiChatParser() | ||
|
|
||
| private val domainMapping = DomainMapping( | ||
| currentUserIdProvider = { "" }, | ||
| channelTransformer = NoOpChannelTransformer, | ||
| messageTransformer = NoOpMessageTransformer, | ||
| userTransformer = NoOpUserTransformer, | ||
| ) | ||
|
|
||
| // Each block carries two full UserResponse objects; this locks that the generated UserResponse | ||
| // (with its required non-null `language`) parses from the real wire shape. | ||
| @Language("JSON") | ||
| private val json = | ||
| """{ | ||
| "duration": "1ms", | ||
| "blocks": [ | ||
| { | ||
| "user_id": "blocker-1", | ||
| "blocked_user_id": "blocked-1", | ||
| "created_at": "1970-01-01T00:00:01.000Z", | ||
| "user": { | ||
| "id": "blocker-1", "role": "user", "language": "en", "banned": false, | ||
| "online": true, "created_at": "2020-01-01T00:00:00.000Z", | ||
| "updated_at": "2020-01-01T00:00:00.000Z", "birthland": "Polis Massa" | ||
| }, | ||
| "blocked_user": { | ||
| "id": "blocked-1", "role": "user", "language": "", "banned": true, | ||
| "online": false, "created_at": "2020-01-01T00:00:00.000Z", | ||
| "updated_at": "2020-01-01T00:00:00.000Z" | ||
| } | ||
| } | ||
| ] | ||
| }""" | ||
|
|
||
| @Test | ||
| fun `deserializes the blocked-users wire shape and maps it to UserBlock`() { | ||
| val dto = parser.fromJson(json, GetBlockedUsersResponse::class.java) | ||
|
|
||
| assertEquals("1ms", dto.duration) | ||
| val block = dto.blocks.single() | ||
| assertEquals("blocker-1", block.user.id) | ||
| assertEquals("blocked-1", block.blockedUser.id) | ||
| // The adapter collects root-level custom data, and `language` is required non-null but arrives empty. | ||
| assertEquals(mapOf("birthland" to "Polis Massa"), block.user.custom) | ||
| assertEquals("en", block.user.language) | ||
| assertEquals("", block.blockedUser.language) | ||
|
|
||
| val blocks = with(domainMapping) { dto.blocks.toDomain() } | ||
|
|
||
| assertEquals( | ||
|
andremion marked this conversation as resolved.
|
||
| listOf(UserBlock(blockedBy = "blocker-1", userId = "blocked-1", blockedAt = Date(1000))), | ||
| blocks, | ||
| ) | ||
|
gpunto marked this conversation as resolved.
|
||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.