[AND-188] Fix user blocking operations. (#5532)

* [AND-188] Fix user blocking operations.

* [AND-188] Update CHANGELOG.md.

---------

Co-authored-by: PetarVelikov <[email protected]>

Author: VelikovPetar

CHANGELOG.md

@@ -12,12 +12,15 @@
 
 ## stream-chat-android-client
 ### 🐞 Fixed
+- Fix `ChatClient::queryBlockedMembers` not working. [#5532](https://github.com/GetStream/stream-chat-android/pull/5532)
+- Fix `ChatClient::blockUser` and `ChatClient::unblockUser` response parsing. [#5532](https://github.com/GetStream/stream-chat-android/pull/5532)
 
 ### ⬆️ Improved
 
 ### ✅ Added
 
 ### ⚠️ Changed
+- 🚨 Breaking change: Change `ChatClient::unblockUser` return type from `Call<BlockUser>` to `Call<Unit>` as we no longer get information about the unblocked user. [#5532](https://github.com/GetStream/stream-chat-android/pull/5532)
 
 ### ❌ Removed
 

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt

@@ -2670,7 +2670,7 @@ internal constructor(
      * @param userId the user ID of the user that will be unblocked.
      */
     @CheckResult
-    public fun unblockUser(userId: String): Call<UserBlock> {
+    public fun unblockUser(userId: String): Call<Unit> {
         return api.unblockUser(userId)
     }
 

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api/ChatApi.kt

@@ -223,7 +223,7 @@ internal interface ChatApi {
     fun blockUser(userId: String): Call<UserBlock>
 
     @CheckResult
-    fun unblockUser(userId: String): Call<UserBlock>
+    fun unblockUser(userId: String): Call<Unit>
 
     @CheckResult
     fun queryBlockedUsers(): Call<List<UserBlock>>

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/MoshiChatApi.kt

@@ -881,7 +881,7 @@ constructor(
         return userApi.blockUser(
             body = BlockUserRequest(userId),
         ).map { response ->
-            response.block.toDomain()
+            response.toDomain()
         }
     }
 
@@ -891,12 +891,8 @@ constructor(
         }
     }
 
-    override fun unblockUser(userId: String): Call<UserBlock> {
-        return userApi.unblockUser(
-            body = UnblockUserRequest(userId),
-        ).map {
-            it.block.toDomain()
-        }
+    override fun unblockUser(userId: String): Call<Unit> {
+        return userApi.unblockUser(body = UnblockUserRequest(userId)).toUnitCall()
     }
 
     override fun partialUpdateUser(id: String, set: Map<String, Any>, unset: List<String>): Call<User> {

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/endpoint/UserApi.kt

@@ -51,7 +51,7 @@ internal interface UserApi {
     @POST("/users/unblock")
     fun unblockUser(@Body body: UnblockUserRequest): RetrofitCall<UnblockUserResponse>
 
-    @GET
+    @GET("/users/block")
     fun queryBlockedUsers(): RetrofitCall<QueryBlockedUsersResponse>
 
     @PATCH("/users")

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/UserMapping.kt

@@ -20,6 +20,7 @@ import io.getstream.chat.android.client.api2.model.dto.DeviceDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamUserBlockDto
 import io.getstream.chat.android.client.api2.model.dto.DownstreamUserDto
 import io.getstream.chat.android.client.api2.model.dto.UpstreamUserDto
+import io.getstream.chat.android.client.api2.model.response.BlockUserResponse
 import io.getstream.chat.android.models.Device
 import io.getstream.chat.android.models.User
 import io.getstream.chat.android.models.UserBlock
@@ -65,9 +66,15 @@ internal fun DownstreamUserDto.toDomain(currentUserId: UserId?): User =
     )
 
 internal fun DownstreamUserBlockDto.toDomain(): UserBlock = UserBlock(
-    blockedBy = blocked_by_user_id,
+    blockedBy = user_id,
     userId = blocked_user_id,
     blockedAt = created_at,
 )
 
 internal fun List<DownstreamUserBlockDto>.toDomain(): List<UserBlock> = map { it.toDomain() }
+
+internal fun BlockUserResponse.toDomain(): UserBlock = UserBlock(
+    blockedBy = blocked_by_user_id,
+    userId = blocked_user_id,
+    blockedAt = created_at,
+)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/UserDtos.kt

@@ -88,7 +88,7 @@ internal data class PartialUpdateUserDto(
 
 @JsonClass(generateAdapter = true)
 internal data class DownstreamUserBlockDto(
-    val blocked_by_user_id: String,
+    val user_id: String,
     val blocked_user_id: String,
     val created_at: Date,
 )

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/BlockUserResponse.kt

@@ -17,9 +17,18 @@
 package io.getstream.chat.android.client.api2.model.response
 
 import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DownstreamUserBlockDto
+import java.util.Date
 
+/**
+ * Model representing the response from blocking a user.
+ *
+ * @param blocked_by_user_id The ID of the user who blocked the other user.
+ * @param blocked_user_id The ID of the user who was blocked.
+ * @param created_at The date when the block was created.
+ */
 @JsonClass(generateAdapter = true)
 internal data class BlockUserResponse(
-    val block: DownstreamUserBlockDto,
+    val blocked_by_user_id: String,
+    val blocked_user_id: String,
+    val created_at: Date,
 )

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/response/UnblockUserResponse.kt

@@ -17,9 +17,8 @@
 package io.getstream.chat.android.client.api2.model.response
 
 import com.squareup.moshi.JsonClass
-import io.getstream.chat.android.client.api2.model.dto.DownstreamUserBlockDto
 
 @JsonClass(generateAdapter = true)
 internal data class UnblockUserResponse(
-    val block: DownstreamUserBlockDto,
+    val duration: String,
 )