Merge branch '12.2'

Author: himeshr

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 getFlowId() {
+    public String getMsgTemplateId() {
         return getStringConfigValue("mgs_template_id", "542201");
     }
 

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

@@ -6,6 +6,7 @@
 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
@@ -22,18 +23,19 @@ public AvniRwbUserNudgeRepository(AvniMessageRepository avniMessageRepository, A
         this.rwbContextProvider = rwbContextProvider;
     }
 
-    public SendMessageResponse startFlowForContact(NudgeUserRequestDTO nudgeUserRequestDTO) {
-        return avniMessageRepository.startFlowForContact(createMessageRequestToNudgeUser(nudgeUserRequestDTO));
+    public SendMessageResponse sendMessage(NudgeUserRequestDTO nudgeUserRequestDTO) {
+        return avniMessageRepository.sendMessage(createMessageRequestToNudgeUser(nudgeUserRequestDTO));
     }
 
-    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[]{
+    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[]{
                 nudgeUserRequestDTO.getUserName(), nudgeUserRequestDTO.getSinceNoOfDays(), nudgeUserRequestDTO.getWithinNoOfDays()});
-        return startFlowForContactRequest;
+        manualMessageContract.setScheduledDateTime(new DateTime()); //set current date time
+        return manualMessageContract;
     }
 
     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.startFlowForContact(nudgeUserRequestDTO);
+        return avniRwbUserNudgeRepository.sendMessage(nudgeUserRequestDTO);
     }
 }