Merge branch '12.2'

Author: himeshr

avni/src/main/java/org/avni_integration_service/avni/domain/StartFlowForContactRequest.java

@@ -0,0 +1,40 @@
+package org.avni_integration_service.avni.domain;
+
+public class StartFlowForContactRequest {
+    private String receiverId;
+    private ReceiverType receiverType;
+    private String flowId;
+    private String[] parameters;
+
+    public String getReceiverId() {
+        return receiverId;
+    }
+
+    public void setReceiverId(String receiverId) {
+        this.receiverId = receiverId;
+    }
+
+    public String getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(String flowId) {
+        this.flowId = flowId;
+    }
+
+    public String[] getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(String[] parameters) {
+        this.parameters = parameters;
+    }
+
+    public ReceiverType getReceiverType() {
+        return receiverType;
+    }
+
+    public void setReceiverType(ReceiverType receiverType) {
+        this.receiverType = receiverType;
+    }
+}

avni/src/main/java/org/avni_integration_service/avni/repository/AvniMessageRepository.java

@@ -3,12 +3,10 @@
 import org.apache.log4j.Logger;
 import org.avni_integration_service.avni.client.AvniHttpClient;
 import org.avni_integration_service.avni.domain.ManualMessageContract;
+import org.avni_integration_service.avni.domain.StartFlowForContactRequest;
 import org.avni_integration_service.avni.domain.SendMessageResponse;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.HttpServerErrorException;
-
-import java.nio.charset.StandardCharsets;
 
 @Component
 public class AvniMessageRepository {
@@ -29,4 +27,13 @@ public SendMessageResponse sendMessage(ManualMessageContract manualMessageContra
         }
         return responseEntity.getBody();
     }
+
+    public SendMessageResponse startFlowForContact(StartFlowForContactRequest startFlowForContactRequest) {
+        ResponseEntity<SendMessageResponse> responseEntity = avniHttpClient.post("/web/message/startFlowForContact", startFlowForContactRequest, SendMessageResponse.class);
+        if (!responseEntity.getStatusCode().is2xxSuccessful()) {
+            logger.error(String.format("StartFlow for contact %s, deliveryStatus %s, response status code is %s", startFlowForContactRequest.getReceiverId(),
+                    responseEntity.getBody().getMessageDeliveryStatus(), responseEntity.getStatusCode()));
+        }
+        return responseEntity.getBody();
+    }
 }

rwb/src/main/java/org/avni_integration_service/rwb/config/RwbConfig.java

@@ -47,7 +47,7 @@ public String getWithinNoOfDays() {
         return getStringConfigValue("within_no_of_days", "03");
     }
 
-    public String getMsgTemplateId() {
+    public String getFlowId() {
         return getStringConfigValue("mgs_template_id", "542201");
     }
 

rwb/src/main/java/org/avni_integration_service/rwb/repository/AvniRwbUserNudgeRepository.java

@@ -6,7 +6,6 @@
 import org.avni_integration_service.avni.repository.AvniQueryRepository;
 import org.avni_integration_service.rwb.config.RwbContextProvider;
 import org.avni_integration_service.rwb.dto.NudgeUserRequestDTO;
-import org.joda.time.DateTime;
 import org.springframework.stereotype.Component;
 
 @Component
@@ -23,19 +22,18 @@ public AvniRwbUserNudgeRepository(AvniMessageRepository avniMessageRepository, A
         this.rwbContextProvider = rwbContextProvider;
     }
 
-    public SendMessageResponse sendMessage(NudgeUserRequestDTO nudgeUserRequestDTO) {
-        return avniMessageRepository.sendMessage(createMessageRequestToNudgeUser(nudgeUserRequestDTO));
+    public SendMessageResponse startFlowForContact(NudgeUserRequestDTO nudgeUserRequestDTO) {
+        return avniMessageRepository.startFlowForContact(createMessageRequestToNudgeUser(nudgeUserRequestDTO));
     }
 
-    private ManualMessageContract createMessageRequestToNudgeUser(NudgeUserRequestDTO nudgeUserRequestDTO) {
-        ManualMessageContract manualMessageContract = new ManualMessageContract();
-        manualMessageContract.setReceiverId(nudgeUserRequestDTO.getUserId());
-        manualMessageContract.setReceiverType(ReceiverType.User);
-        manualMessageContract.setMessageTemplateId(rwbContextProvider.get().getMsgTemplateId());
-        manualMessageContract.setParameters(new String[]{
+    private StartFlowForContactRequest createMessageRequestToNudgeUser(NudgeUserRequestDTO nudgeUserRequestDTO) {
+        StartFlowForContactRequest startFlowForContactRequest = new StartFlowForContactRequest();
+        startFlowForContactRequest.setReceiverId(nudgeUserRequestDTO.getUserId());
+        startFlowForContactRequest.setReceiverType(ReceiverType.User);
+        startFlowForContactRequest.setFlowId(rwbContextProvider.get().getFlowId());
+        startFlowForContactRequest.setParameters(new String[]{
                 nudgeUserRequestDTO.getUserName(), nudgeUserRequestDTO.getSinceNoOfDays(), nudgeUserRequestDTO.getWithinNoOfDays()});
-        manualMessageContract.setScheduledDateTime(new DateTime()); //set current date time
-        return manualMessageContract;
+        return startFlowForContactRequest;
     }
 
     public CustomQueryResponse executeCustomQuery(CustomQueryRequest customQueryRequest) {

rwb/src/main/java/org/avni_integration_service/rwb/service/RwbUserNudgeService.java

@@ -42,6 +42,6 @@ public List<NudgeUserRequestDTO> getUsersThatHaveToReceiveNudge() {
     }
 
     public SendMessageResponse nudgeUser(NudgeUserRequestDTO nudgeUserRequestDTO) {
-        return avniRwbUserNudgeRepository.sendMessage(nudgeUserRequestDTO);
+        return avniRwbUserNudgeRepository.startFlowForContact(nudgeUserRequestDTO);
     }
 }