update: 토큰 만료되면 키보드 버튼 보내는 방식으로 수정 (sharetreats-team#43)

Author: tlqkrus012345

src/main/java/com/sharetreats/chatbot/module/controller/WebhookController.java

@@ -52,8 +52,11 @@ public ResponseEntity<?> webhook(@RequestBody String callback) {
         if (event.equals(MESSAGE)) {
             String accountId = getSenderId(callback);
             boolean isValidToken = tokenConfig.validateToken(accountId);
-            if (isValidToken)
-            return sendResponseByTextInMessage(callback);
+            boolean isRetry = validateRetry(callback);
+            if (isValidToken || isRetry) {
+                if (!isValidToken) tokenConfig.generateToken(accountId);
+                return sendResponseByTextInMessage(callback);
+            }
             else return sendInvalidTokenMessage.execute(accountId);
         }
         if (event.equals(UNSUBSCRIBED))
@@ -79,7 +82,7 @@ private ResponseEntity<?> sendResponseByTextInMessage(String callback) {
             return sendProductsOfBrand.execute(callback);
         if (isContains(text, SEND_TREATS) || isContains(text, NO_DISCOUNT) || isTrackingDataValid(trackingData))
           return sendPurchaseInfo.execute(callback);
-        if (isContains(text, VIEW_BRANDS)) {
+        if (isContains(text, VIEW_BRANDS) || isContains(text, RETRY)) {
             manageSubscription.validateAccount(callback);
             return sendCategoryKeyboard.execute(callback);
         }
@@ -128,6 +131,14 @@ private static boolean isTrackingDataValid (String trackingData){
         return trackingData.equals("name") || trackingData.equals("email") || trackingData.equals("message") || trackingData.equals("discount_code");
     }
 
+    public boolean validateRetry(String callback) {
+        String string = new JSONObject(callback).getJSONObject("message").getString("text");
+        if (string.equals("retry")) {
+            return true;
+        }
+        return false;
+    }
+
     static class EventType {
         public static final String CONVERSATION_STARTED = "conversation_started";
         public static final String MESSAGE = "message";
@@ -143,6 +154,7 @@ static class InputKeyword {
         public static final String VIEW_MORE = "view more";
         public static final String NO_DISCOUNT = "no discount";
         public static final String VIEW_BRANDS_CATEGORY = "categoryId";
+        public static final String RETRY = "retry";
     }
 }
 

src/main/java/com/sharetreats/chatbot/module/controller/webhook/SendInvalidTokenMessage.java

@@ -2,6 +2,12 @@
 
 
 import com.sharetreats.chatbot.infra.config.RestTemplateConfig;
+import com.sharetreats.chatbot.module.controller.dto.retryDtos.RetryButton;
+import com.sharetreats.chatbot.module.controller.dto.retryDtos.RetryKeyboard;
+import com.sharetreats.chatbot.module.controller.dto.retryDtos.RetryMessage;
+import com.sharetreats.chatbot.module.controller.dto.welcomeDtos.WelcomeButton;
+import com.sharetreats.chatbot.module.controller.dto.welcomeDtos.WelcomeKeyboard;
+import com.sharetreats.chatbot.module.controller.dto.welcomeDtos.WelcomeMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -10,6 +16,9 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
 import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.Collections;
 
 @Slf4j
 @RequiredArgsConstructor
@@ -24,27 +33,21 @@ public class SendInvalidTokenMessage {
     static final String VIBER_SEND_MESSAGE_URL = "https://chatapi.viber.com/pa/send_message";
 
     public ResponseEntity<?> execute(String accountId) {
-        log.info("send invalid message");
-        InvalidMessage invalidMessage = new InvalidMessage(accountId, "text", "stchatbot3", "Validity time has expired");
+        RetryMessage message = new RetryMessage(accountId,
+                1,
+                "text",
+                "Your time has expired.\n" +
+                        "If you want to get back into service, press the \"Retry\".",
+                new RetryKeyboard("keyboard", false, "#FFFFFF",
+                        Collections.singletonList(new RetryButton(6, 1, "#29A7D9", "reply", "retry", "Retry", "center", "middle", "large"))));
+
 
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.setContentType(MediaType.APPLICATION_JSON);
         httpHeaders.set("X-Viber-Auth-Token", token);
+        HttpEntity<RetryMessage> httpEntity = new HttpEntity<>(message, httpHeaders);
 
-        HttpEntity<InvalidMessage> invalidMessageHttpEntity = new HttpEntity<>(invalidMessage, httpHeaders);
-        restTemplateConfig.restTemplate().exchange(VIBER_SEND_MESSAGE_URL, HttpMethod.POST, invalidMessageHttpEntity, String.class);
-        sendWelcomeMessage.execute();
-        return ResponseEntity.ok().build();
+        return restTemplateConfig.restTemplate().exchange(VIBER_SEND_MESSAGE_URL, HttpMethod.POST, httpEntity, String.class);
     }
 
-    @Getter
-    @NoArgsConstructor
-    @AllArgsConstructor
-    private class InvalidMessage {
-
-        private String receiver;
-        private String type;
-        private String name;
-        private String text;
-    }
 }