fix models

kocherovv · kocherovv · commit 268dea3d9628 · 2023-11-09T19:59:40.000-03:00
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.green-api</groupId>
     <artifactId>whatsapp-api-client-java</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <description>WhatsApp java client Green API</description>
     <licenses>
         <license>
diff --git a/src/main/java/com/greenapi/client/pkg/api/webhook/NotificationMapper.java b/src/main/java/com/greenapi/client/pkg/api/webhook/NotificationMapper.java
@@ -7,6 +7,7 @@
 import com.greenapi.client.pkg.api.exceptions.GreenApiClientException;
 import com.greenapi.client.pkg.models.notifications.*;
 import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.QuotedMessage;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.TemplateButtonReplyMessageData;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.stereotype.Component;
 
@@ -105,19 +106,22 @@ private Class<?> getNotificationClass(String typeMessage) {
                 return ContactsArrayMessageWebhook.class;
             }
             case "buttonsMessage" -> {
-                return ButtonMessageWebhook.class;
-            }
-            case "listMessage" -> {
-                return ListMessageWebhook.class;
-            }
-            case "templateButtonReplyMessage" -> {
-                return TemplateButtonSelectionMessageWebhook.class;
+                return ButtonsMessageWebhook.class;
             }
             case "buttonsResponseMessage" -> {
-                return SimpleButtonSelectionMessageWebhook.class;
+                return ButtonsResponseMessageWebhook.class;
+            }
+            case "templateButtonsReplyMessage" -> {
+                return TemplateButtonsReplyMessageWebhook.class;
             }
             case "listResponseMessage" -> {
-                return ListSelectionMessageWebhook.class;
+                return ListResponseMessageWebhook.class;
+            }
+            case "listMessage" -> {
+                return ListMessageWebhook.class;
+            }
+            case "templateMessage" -> {
+                return TemplateMessageWebhook.class;
             }
             case "stickerMessage" -> {
                 return StickerMessageWebhook.class;
diff --git a/src/main/java/com/greenapi/client/pkg/api/webhook/QuotedMessageDeserializer.java b/src/main/java/com/greenapi/client/pkg/api/webhook/QuotedMessageDeserializer.java
@@ -23,7 +23,6 @@ public QuotedMessage deserialize(JsonParser jp, DeserializationContext ctxt) thr
         JsonNode node = jp.getCodec().readTree(jp);
 
         if (node.has("typeMessage")) {
-            var typeMessage = node.get("typeMessage");
             switch (node.get("typeMessage").toString()) {
                 case "buttonMessage" -> {
                     return ctxt.readValue(jp, ButtonMessageData.class);
@@ -59,11 +58,14 @@ public QuotedMessage deserialize(JsonParser jp, DeserializationContext ctxt) thr
                     return ctxt.readValue(jp, StickerMessageData.class);
                 }
                 case "templateMessage" -> {
-                    return ctxt.readValue(jp, TemplateButtonReplyMessage.class);
+                    return ctxt.readValue(jp, TemplateMessageData.class);
                 }
                 case "textMessage" -> {
                     return ctxt.readValue(jp, TextMessageData.class);
                 }
+                case "templateButtonsReplyMessage" -> {
+                    return ctxt.readValue(jp, TemplateButtonReplyMessageData.class);
+                }
             }
         }
         return new EmptyQuotedMessage();
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/ButtonsMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/ButtonsMessageWebhook.java
@@ -9,6 +9,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ButtonMessageWebhook extends MessageWebhook {
+public class ButtonsMessageWebhook extends MessageWebhook {
     private ButtonMessage messageData;
 }
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/ButtonsResponseMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/ButtonsResponseMessageWebhook.java
@@ -0,0 +1,14 @@
+package com.greenapi.client.pkg.models.notifications;
+
+import com.greenapi.client.pkg.models.notifications.messages.ButtonsResponseMessage;
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Setter(value = AccessLevel.NONE)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ButtonsResponseMessageWebhook extends MessageWebhook {
+    private ButtonsResponseMessage messageData;
+}
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/IncomingCall.java b/src/main/java/com/greenapi/client/pkg/models/notifications/IncomingCall.java
@@ -14,4 +14,5 @@ public class IncomingCall extends NotificationBody {
     private Long timestamp;
     private String idMessage;
     private String from;
+    private String status;
 }
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/ListResponseMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/ListResponseMessageWebhook.java
@@ -1,6 +1,6 @@
 package com.greenapi.client.pkg.models.notifications;
 
-import com.greenapi.client.pkg.models.notifications.messages.ListSelectionMessage;
+import com.greenapi.client.pkg.models.notifications.messages.ListResponseMessage;
 import lombok.*;
 
 @EqualsAndHashCode(callSuper = true)
@@ -9,6 +9,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ListSelectionMessageWebhook extends MessageWebhook {
-    private ListSelectionMessage messageData;
+public class ListResponseMessageWebhook extends MessageWebhook {
+    private ListResponseMessage messageData;
 }
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/SimpleButtonSelectionMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/SimpleButtonSelectionMessageWebhook.java
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/TemplateButtonsReplyMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/TemplateButtonsReplyMessageWebhook.java
@@ -0,0 +1,15 @@
+package com.greenapi.client.pkg.models.notifications;
+
+import com.greenapi.client.pkg.models.notifications.messages.TemplateButtonMessage;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.TemplateButtonReplyMessageData;
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Setter(value = AccessLevel.NONE)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TemplateButtonsReplyMessageWebhook extends MessageWebhook {
+    private TemplateButtonReplyMessageData messageData;
+}
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/TemplateMessageWebhook.java b/src/main/java/com/greenapi/client/pkg/models/notifications/TemplateMessageWebhook.java
@@ -1,6 +1,6 @@
 package com.greenapi.client.pkg.models.notifications;
 
-import com.greenapi.client.pkg.models.notifications.messages.TemplateButtonSelection;
+import com.greenapi.client.pkg.models.notifications.messages.TemplateButtonMessage;
 import lombok.*;
 
 @EqualsAndHashCode(callSuper = true)
@@ -9,6 +9,6 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TemplateButtonSelectionMessageWebhook extends MessageWebhook {
-    private TemplateButtonSelection messageData;
+public class TemplateMessageWebhook extends MessageWebhook {
+    private TemplateButtonMessage messageData;
 }
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/ButtonsResponseMessage.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/ButtonsResponseMessage.java
@@ -9,15 +9,15 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class SimpleButtonSelectionMessage {
+public class ButtonsResponseMessage {
     private String typeMessage;
-    private ButtonsResponseMessage buttonsResponseMessage;
+    private ButtonsResponseMessageData buttonsResponseMessage;
 
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
     @Builder
-    private static class ButtonsResponseMessage {
+    private static class ButtonsResponseMessageData {
         private String selectedButtonId;
         private String selectedButtonText;
         private String stanzaId;
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/ListResponseMessage.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/ListResponseMessage.java
@@ -9,15 +9,15 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ListSelectionMessage {
+public class ListResponseMessage {
     private String typeMessage;
-    private ListResponseMessage listResponseMessage;
+    private ListResponseMessageData listResponseMessage;
 
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
     @Builder
-    private static class ListResponseMessage {
+    private static class ListResponseMessageData {
         private String title;
         private String listType;
         private String singleSelectReply;
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/TemplateButtonMessage.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/TemplateButtonMessage.java
@@ -1,6 +1,7 @@
 package com.greenapi.client.pkg.models.notifications.messages;
 
-import com.greenapi.client.pkg.models.notifications.messages.messageData.TemplateButtonReplyMessage;
+import com.greenapi.client.pkg.models.notifications.messages.messageData.TemplateMessageData;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.QuotedMessage;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -10,7 +11,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TemplateButtonSelection {
+public class TemplateButtonMessage {
     private String typeMessage;
-    private TemplateButtonReplyMessage templateButtonReplyMessage;
+    private TemplateMessageData templateMessage;
+    private QuotedMessage quotedMessage;
 }
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/TemplateButtonReplyMessage.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/TemplateButtonReplyMessage.java
@@ -0,0 +1,17 @@
+package com.greenapi.client.pkg.models.notifications.messages;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.greenapi.client.pkg.models.notifications.messages.messageData.TemplateMessageData;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.QuotedMessage;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.TemplateButtonReplyMessageData;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class TemplateButtonReplyMessage {
+    private String typeMessage;
+    private TemplateButtonReplyMessageData templateMessage;
+}
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/messageData/TemplateButtonReplyMessageData.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/messageData/TemplateButtonReplyMessageData.java
@@ -1,17 +1,16 @@
 package com.greenapi.client.pkg.models.notifications.messages.messageData;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import com.greenapi.client.pkg.models.notifications.messages.quotedMessageData.QuotedMessage;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class TemplateButtonReplyMessage {
+public class TemplateButtonReplyMessageData {
     private String selectedIndex;
     private String selectedId;
     private String selectedDisplayText;
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/messageData/TemplateMessageData.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/messageData/TemplateMessageData.java
@@ -0,0 +1,26 @@
+package com.greenapi.client.pkg.models.notifications.messages.messageData;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.greenapi.client.pkg.models.Button;
+import com.greenapi.client.pkg.models.TemplateButtons;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TemplateMessageData {
+    private String namespace;
+    private String elementName;
+    private String contentText;
+    private String footer;
+    private List<TemplateButtons> buttons;
+    private boolean isForwarded;
+    private Long forwardingScore;
+}
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/quotedMessageData/TemplateButtonReplyMessageData.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/quotedMessageData/TemplateButtonReplyMessageData.java
@@ -13,7 +13,7 @@
 @AllArgsConstructor
 @SuperBuilder
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class TemplateButtonReplyMessage extends QuotedMessage {
+public class TemplateButtonReplyMessageData extends QuotedMessage {
     private String selectedIndex;
     private String selectedId;
     private String selectedDisplayText;
diff --git a/src/main/java/com/greenapi/client/pkg/models/notifications/messages/quotedMessageData/TemplateMessageData.java b/src/main/java/com/greenapi/client/pkg/models/notifications/messages/quotedMessageData/TemplateMessageData.java
@@ -0,0 +1,24 @@
+package com.greenapi.client.pkg.models.notifications.messages.quotedMessageData;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.greenapi.client.pkg.models.TemplateButtons;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TemplateMessageData extends QuotedMessage{
+    private String namespace;
+    private String elementName;
+    private String contentText;
+    private String footer;
+    private List<TemplateButtons> buttons;
+    private boolean isForwarded;
+    private Long forwardingScore;
+}

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ public QuotedMessage deserialize(JsonParser jp, DeserializationContext ctxt) thr`
`23`	`23`	`JsonNode node = jp.getCodec().readTree(jp);`
`24`	`24`
`25`	`25`	`if (node.has("typeMessage")) {`
`26`		`- var typeMessage = node.get("typeMessage");`
`27`	`26`	`switch (node.get("typeMessage").toString()) {`
`28`	`27`	`case "buttonMessage" -> {`
`29`	`28`	`return ctxt.readValue(jp, ButtonMessageData.class);`
`@@ -59,11 +58,14 @@ public QuotedMessage deserialize(JsonParser jp, DeserializationContext ctxt) thr`
`59`	`58`	`return ctxt.readValue(jp, StickerMessageData.class);`
`60`	`59`	`}`
`61`	`60`	`case "templateMessage" -> {`
`62`		`- return ctxt.readValue(jp, TemplateButtonReplyMessage.class);`
	`61`	`+ return ctxt.readValue(jp, TemplateMessageData.class);`
`63`	`62`	`}`
`64`	`63`	`case "textMessage" -> {`
`65`	`64`	`return ctxt.readValue(jp, TextMessageData.class);`
`66`	`65`	`}`
	`66`	`+ case "templateButtonsReplyMessage" -> {`
	`67`	`+ return ctxt.readValue(jp, TemplateButtonReplyMessageData.class);`
	`68`	`+ }`
`67`	`69`	`}`
`68`	`70`	`}`
`69`	`71`	`return new EmptyQuotedMessage();`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`@NoArgsConstructor`
`10`	`10`	`@AllArgsConstructor`
`11`	`11`	`@Builder`
`12`		`-public class ButtonMessageWebhook extends MessageWebhook {`
	`12`	`+public class ButtonsMessageWebhook extends MessageWebhook {`
`13`	`13`	`private ButtonMessage messageData;`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,5 @@ public class IncomingCall extends NotificationBody {`
`14`	`14`	`private Long timestamp;`
`15`	`15`	`private String idMessage;`
`16`	`16`	`private String from;`
	`17`	`+ private String status;`
`17`	`18`	`}`