Updated test

Author: javierdfm

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

@@ -15,6 +15,7 @@
 import io.getstream.chat.java.models.Message.MessageUpdateRequestData.MessageUpdateRequest;
 import io.getstream.chat.java.models.User.UserRequestObject;
 import io.getstream.chat.java.models.framework.*;
+import io.getstream.chat.java.models.Channel.ChannelMember;
 import io.getstream.chat.java.services.MessageService;
 import io.getstream.chat.java.services.framework.Client;
 import java.io.File;

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

@@ -24,29 +24,32 @@ void whenSendingMessages_thenMemberRoleIsIncluded() {
     pause();
 
     // Select two different users from the pre-created user list
-    UserRequestObject userWithRole = testUsersRequestObjects.get(0);
-    UserRequestObject userWithoutRole = testUsersRequestObjects.get(1);
+    UserRequestObject userWithCustomRole = testUsersRequestObjects.get(0);
+    UserRequestObject userWithDefaultRole = testUsersRequestObjects.get(1);
 
-    // Build channel members – assign the custom role to the first user only
-    var memberWithRole =
-        ChannelMemberRequestObject.builder().user(userWithRole).role(customRole).build();
-    var memberWithoutRole =
-        ChannelMemberRequestObject.builder().user(userWithoutRole).build();
-
-    // Create a new channel with these members
+    // Create a new channel with these members (roles will be assigned later)
     var channelResp =
         Assertions.assertDoesNotThrow(
             () ->
                 Channel.getOrCreate("team", RandomStringUtils.randomAlphabetic(12))
                     .data(
                         ChannelRequestObject.builder()
                             .createdBy(testUserRequestObject)
-                            .member(memberWithRole)
-                            .member(memberWithoutRole)
+                            .member(ChannelMemberRequestObject.builder().user(userWithCustomRole).build())
+                            .member(ChannelMemberRequestObject.builder().user(userWithDefaultRole).build())
                             .build())
                     .request());
     var channel = channelResp.getChannel();
 
+    // Assign the custom role to the first user *after* channel creation
+    var assignment = new RoleAssignment();
+    assignment.setChannelRole(customRole);
+    assignment.setUserId(userWithCustomRole.getId());
+    Assertions.assertDoesNotThrow(
+        () -> Channel.assignRoles(channel.getType(), channel.getId()).assignRole(assignment).request());
+
+    pause(); // give backend time to apply the role
+
     // User with role sends a message
     Message messageWithRole =
         Assertions.assertDoesNotThrow(
@@ -55,7 +58,7 @@ void whenSendingMessages_thenMemberRoleIsIncluded() {
                         .message(
                             MessageRequestObject.builder()
                                 .text("Message from user with role")
-                                .userId(userWithRole.getId())
+                                .userId(userWithCustomRole.getId())
                                 .build())
                         .request())
             .getMessage();
@@ -68,17 +71,17 @@ void whenSendingMessages_thenMemberRoleIsIncluded() {
                         .message(
                             MessageRequestObject.builder()
                                 .text("Message from user without role")
-                                .userId(userWithoutRole.getId())
+                                .userId(userWithDefaultRole.getId())
                                 .build())
                         .request())
             .getMessage();
 
     // Assert the role information in the immediate responses
     Assertions.assertNotNull(messageWithRole.getMember());
-    Assertions.assertEquals(customRole, messageWithRole.getMember().getRole());
+    Assertions.assertEquals(customRole, messageWithRole.getMember().getChannelRole());
 
     Assertions.assertNotNull(messageWithoutRole.getMember());
-    Assertions.assertNull(messageWithoutRole.getMember().getRole());
+    Assertions.assertEquals("channel_member", messageWithoutRole.getMember().getChannelRole());
 
     // Retrieve the channel again and ensure both messages still carry the correct member role
     var channelState =
@@ -101,11 +104,12 @@ void whenSendingMessages_thenMemberRoleIsIncluded() {
 
     Assertions.assertNotNull(storedWithRole);
     Assertions.assertNotNull(storedWithRole.getMember());
-    Assertions.assertEquals(customRole, storedWithRole.getMember().getRole());
+    Assertions.assertEquals(customRole, storedWithRole.getMember().getChannelRole());
 
     Assertions.assertNotNull(storedWithoutRole);
     Assertions.assertNotNull(storedWithoutRole.getMember());
-    Assertions.assertNull(storedWithoutRole.getMember().getRole());
+    Assertions.assertEquals("channel_member", storedWithoutRole.getMember().getChannelRole());
   }
 }
 
+