Merge pull request #1 from green-api/SW-4489

Support for Release 29.39

Author: prostraction

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.green-api</groupId>
     <artifactId>whatsapp-api-client-java</artifactId>
-    <version>0.1.8</version>
+    <version>0.1.9</version>
     <description>WhatsApp java client Green API</description>
     <licenses>
         <license>

src/main/java/com/greenapi/client/pkg/api/methods/GreenApiService.java

@@ -1,6 +1,8 @@
 package com.greenapi.client.pkg.api.methods;
 
 import com.greenapi.client.pkg.models.request.MessageReq;
+import com.greenapi.client.pkg.models.request.EditMessageReq;
+import com.greenapi.client.pkg.models.request.DeleteMessageReq;
 import com.greenapi.client.pkg.models.response.*;
 import lombok.AllArgsConstructor;
 import org.springframework.core.ParameterizedTypeReference;
@@ -102,12 +104,32 @@ public ResponseEntity<GetContactInfoResp> getContactInfo(String chatId) {
      * The method deletes a message from a chat.
      * https://greenapi.com/en/docs/api/service/deleteMessage/
      */
-    public ResponseEntity<String> deleteMessage(MessageReq messageReq) {
-
+    public ResponseEntity<String> deleteMessage(DeleteMessageReq deleteMessageReq) {
         String url = host +
             "/waInstance" + instanceId +
             "/deleteMessage/" +
             instanceToken;
+        var headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        var requestEntity = new HttpEntity<>(deleteMessageReq, headers);
+
+        return restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+    }
+    // Overloaded method for backward compatibility
+    public ResponseEntity<String> deleteMessage(MessageReq messageReq) {
+        return deleteMessage(DeleteMessageReq.from(messageReq));
+    }
+
+    /**
+     * The method edits a message in a chat.
+     * https://greenapi.com/en/docs/api/service/editMessage/
+     */
+    public ResponseEntity<String> editMessage(EditMessageReq messageReq) {
+        String url = host +
+                "/waInstance" + instanceId +
+                "/editMessage/" +
+                instanceToken;
 
         var headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);

src/main/java/com/greenapi/client/pkg/models/request/DeleteMessageReq.java

@@ -0,0 +1,23 @@
+package com.greenapi.client.pkg.models.request;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class DeleteMessageReq {
+    private final String chatId;
+    private final String idMessage;
+    private Boolean onlySenderDelete;
+
+    // MessageReq -> DeleteMessageReq
+    public static DeleteMessageReq from(MessageReq messageReq) {
+        return DeleteMessageReq.builder()
+            .chatId(messageReq.getChatId())
+            .idMessage(messageReq.getIdMessage())
+            .build();
+    }
+}

src/main/java/com/greenapi/client/pkg/models/request/EditMessageReq.java

@@ -0,0 +1,16 @@
+package com.greenapi.client.pkg.models.request;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@AllArgsConstructor
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class EditMessageReq {
+    private final String chatId;
+    private final String idMessage;
+    private String message;
+}

src/main/java/com/greenapi/client/pkg/models/request/InstanceSettingsReq.java

@@ -28,4 +28,7 @@ public class InstanceSettingsReq {
     private final String keepOnlineStatus;
     private final String pollMessageWebhook;
     private final String incomingBlockWebhook;
+    private final String incomingCallWebhook;
+    private final String editedMessageWebhook;
+    private final String deletedMessageWebhook;
 }

src/main/java/com/greenapi/client/pkg/models/request/MessageReq.java

@@ -12,4 +12,4 @@
 public class MessageReq {
     private final String chatId;
     private final String idMessage;
-}
+}

src/main/java/com/greenapi/client/pkg/models/response/Settings.java

@@ -28,4 +28,7 @@ public class Settings {
     private String keepOnlineStatus;
     private String pollMessageWebhook;
     private String incomingBlockWebhook;
+    private String incomingCallWebhook;
+    private String editedMessageWebhook;
+    private String deletedMessageWebhook;
 }