Fix tests

Author: adityaalifn

src/main/java/io/getstream/chat/java/models/User.java

@@ -222,6 +222,10 @@ public static class FutureChannelBan {
     @JsonProperty("user")
     private User user;
 
+    @Nullable
+    @JsonProperty("banned_by")
+    private User bannedBy;
+
     @Nullable
     @JsonProperty("expires")
     private Date expires;
@@ -828,6 +832,10 @@ public static class UserBanRequestData {
     @JsonProperty("ban_from_future_channels")
     private Boolean banFromFutureChannels;
 
+    @Nullable
+    @JsonProperty("channel_cid")
+    private String channelCid;
+
     public static class UserBanRequest extends StreamRequest<StreamResponseObject> {
       @Override
       protected Call<StreamResponseObject> generateCall(Client client) {
@@ -1109,6 +1117,8 @@ public static class UserUnbanRequest extends StreamRequest<StreamResponseObject>
 
     @Nullable private Boolean removeFutureChannelsBan;
 
+    @Nullable private String createdBy;
+
     @NotNull
     public UserUnbanRequest type(@NotNull String type) {
       this.type = type;
@@ -1133,11 +1143,17 @@ public UserUnbanRequest removeFutureChannelsBan(@NotNull Boolean removeFutureCha
       return this;
     }
 
+    @NotNull
+    public UserUnbanRequest createdBy(@NotNull String createdBy) {
+      this.createdBy = createdBy;
+      return this;
+    }
+
     @Override
     protected Call<StreamResponseObject> generateCall(Client client) {
       return client
           .create(UserService.class)
-          .unban(targetUserId, type, id, shadow, removeFutureChannelsBan);
+          .unban(targetUserId, type, id, shadow, removeFutureChannelsBan, createdBy);
     }
   }
 

src/main/java/io/getstream/chat/java/services/UserService.java

@@ -66,7 +66,8 @@ Call<StreamResponseObject> unban(
       @Nullable @Query("type") String channelType,
       @Nullable @Query("id") String channelId,
       @Nullable @Query("shadow") Boolean shadow,
-      @Nullable @Query("remove_future_channels_ban") Boolean removeFutureChannelsBan);
+      @Nullable @Query("remove_future_channels_ban") Boolean removeFutureChannelsBan,
+      @Nullable @Query("created_by") String createdBy);
 
   @GET("query_future_channel_bans")
   Call<UserQueryFutureChannelBansResponse> queryFutureChannelBans(

src/test/java/io/getstream/chat/java/UserTest.java

@@ -521,12 +521,16 @@ void whenQueryingFutureChannelBansWithTargetUserId_thenFiltersCorrectly() {
     usersUpsertRequest.user(UserRequestObject.builder().id(targetId2).name("Target 2").build());
     Assertions.assertDoesNotThrow(() -> usersUpsertRequest.request());
 
+    // Use the test channel's CID for banning from future channels
+    String channelCid = testChannel.getType() + ":" + testChannel.getId();
+
     // Ban both targets from future channels created by creator
     Assertions.assertDoesNotThrow(
         () ->
             User.ban()
                 .userId(creatorId)
                 .targetUserId(targetId1)
+                .channelCid(channelCid)
                 .banFromFutureChannels(true)
                 .reason("test ban 1")
                 .request());
@@ -536,6 +540,7 @@ void whenQueryingFutureChannelBansWithTargetUserId_thenFiltersCorrectly() {
             User.ban()
                 .userId(creatorId)
                 .targetUserId(targetId2)
+                .channelCid(channelCid)
                 .banFromFutureChannels(true)
                 .reason("test ban 2")
                 .request());
@@ -546,26 +551,27 @@ void whenQueryingFutureChannelBansWithTargetUserId_thenFiltersCorrectly() {
             () ->
                 User.queryFutureChannelBans().userId(creatorId).targetUserId(targetId1).request());
     Assertions.assertEquals(1, response.getBans().size());
-    Assertions.assertEquals(targetId1, response.getBans().get(0).getUser().getId());
+    // For future channel bans, banned_by contains the creator (userId)
+    Assertions.assertEquals(creatorId, response.getBans().get(0).getBannedBy().getId());
 
     // Query for the other target
     response =
         Assertions.assertDoesNotThrow(
             () ->
                 User.queryFutureChannelBans().userId(creatorId).targetUserId(targetId2).request());
     Assertions.assertEquals(1, response.getBans().size());
-    Assertions.assertEquals(targetId2, response.getBans().get(0).getUser().getId());
+    Assertions.assertEquals(creatorId, response.getBans().get(0).getBannedBy().getId());
 
     // Query all future channel bans by creator (without target filter)
     response =
         Assertions.assertDoesNotThrow(
             () -> User.queryFutureChannelBans().userId(creatorId).request());
     Assertions.assertTrue(response.getBans().size() >= 2);
 
-    // Cleanup - unban both users
+    // Cleanup - unban both users (createdBy is required when removing future channel bans)
     Assertions.assertDoesNotThrow(
-        () -> User.unban(targetId1).removeFutureChannelsBan(true).request());
+        () -> User.unban(targetId1).removeFutureChannelsBan(true).createdBy(creatorId).request());
     Assertions.assertDoesNotThrow(
-        () -> User.unban(targetId2).removeFutureChannelsBan(true).request());
+        () -> User.unban(targetId2).removeFutureChannelsBan(true).createdBy(creatorId).request());
   }
 }