refactor

Author: Rafael Marinho

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

@@ -17,6 +17,7 @@
 import io.getstream.chat.java.models.Channel.ChannelTruncateRequestData.ChannelTruncateRequest;
 import io.getstream.chat.java.models.Channel.ChannelUnMuteRequestData.ChannelUnMuteRequest;
 import io.getstream.chat.java.models.Channel.ChannelUpdateRequestData.ChannelUpdateRequest;
+import io.getstream.chat.java.models.Channel.MarkDeliveredRequestData.MarkDeliveredRequest;
 import io.getstream.chat.java.models.ChannelType.BlocklistBehavior;
 import io.getstream.chat.java.models.ChannelType.ChannelTypeWithCommands;
 import io.getstream.chat.java.models.Message.MessageRequestObject;
@@ -1202,6 +1203,27 @@ protected Call<ChannelMemberResponse> generateCall(Client client) {
     }
   }
 
+  @Builder(
+      builderClassName = "MarkDeliveredRequest",
+      builderMethodName = "",
+      buildMethodName = "internalBuild")
+  public static class MarkDeliveredRequestData {
+    @Nullable
+    @JsonProperty("user_id")
+    private String userId;
+
+    @Nullable
+    @JsonProperty("user")
+    private UserRequestObject user;
+
+    public static class MarkDeliveredRequest extends StreamRequest<StreamResponseObject> {
+      @Override
+      protected Call<StreamResponseObject> generateCall(Client client) {
+        return client.create(ChannelService.class).markDelivered(this.internalBuild());
+      }
+    }
+  }
+
   @Data
   @NoArgsConstructor
   @EqualsAndHashCode(callSuper = true)
@@ -1757,4 +1779,14 @@ public static ChannelMemberPartialUpdateRequest unarchive(
       @NotNull String type, @NotNull String id, @NotNull String userId) {
     return new ChannelMemberPartialUpdateRequest(type, id, userId).setValue("archived", false);
   }
+
+  /**
+   * Creates a mark delivered request
+   *
+   * @return the created request
+   */
+  @NotNull
+  public static MarkDeliveredRequest markDelivered() {
+    return new MarkDeliveredRequest();
+  }
 }

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

@@ -2,7 +2,6 @@
 
 import io.getstream.chat.java.models.Channel;
 import io.getstream.chat.java.models.Channel.*;
-import io.getstream.chat.java.models.MarkDeliveredOptions;
 import io.getstream.chat.java.models.framework.StreamResponseObject;
 import io.getstream.chat.java.services.framework.ToJson;
 import org.jetbrains.annotations.NotNull;
@@ -106,7 +105,6 @@ Call<ChannelMemberResponse> updateMemberPartial(
       @NotNull @Body ChannelMemberPartialUpdateRequestData updateMemberPartialRequestData);
 
   @POST("channels/delivered")
-  Call<MarkDeliveredOptions.MarkDeliveredResponse> markChannelsDelivered(
-      @NotNull @Body MarkDeliveredOptions markDeliveredOptions,
-      @NotNull @Query("user_id") String userId);
+  Call<StreamResponseObject> markDelivered(
+      @NotNull @Body MarkDeliveredRequestData markDeliveredOptions);
 }

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

@@ -624,4 +624,11 @@ void whenPartialUpdateMember_thenNoException() {
     Assertions.assertEquals("updated_value1", updatedMember.getAdditionalFields().get("field1"));
     Assertions.assertEquals("value2", updatedMember.getAdditionalFields().get("field2"));
   }
+
+  @DisplayName("Can mark messages delivered")
+  @Test
+  void whenMarkingDelivered_thenNoException() {
+    Assertions.assertDoesNotThrow(
+        () -> Channel.markDelivered().user(testUserRequestObject).request());
+  }
 }