Merge remote-tracking branch 'origin/main'

Author: ramakanthk711

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();
+    }
 }

goonj/src/main/java/org/avni_integration_service/goonj/repository/ActivityRepository.java

@@ -151,6 +151,9 @@ private ActivityDTO createActivityRequest(Subject subject) {
         if (subject.getObservation(TYPE_OF_INITIATIVE).equals("NJPC")) {
             /* Participation fields */
             activityDTO.setNoofdaysofParticipationNJPC((subject.getObservation(NUMBER_OF_DAYS_OF_PARTICIPATION) == null) ? 0L : (Integer) subject.getObservation(NUMBER_OF_DAYS_OF_PARTICIPATION));
+            activityDTO.setNoofparticipantsMaleNJPC((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_MALE));
+            activityDTO.setNoofparticipantsFemaleNJPC((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_FEMALE));
+            activityDTO.setNoofparticipantsNJPCOther((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_OTHER));
             /* Photograph fields */
             activityDTO.setNjpcPhotograph(getPhotographStrings(PHOTOGRAPH, subject));
             /*Education fields*/
@@ -163,9 +166,6 @@ private ActivityDTO createActivityRequest(Subject subject) {
             }
             else{
                 activityDTO.setEducationAndHealth(false);
-                activityDTO.setNoofparticipantsMaleNJPC((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_MALE));
-                activityDTO.setNoofparticipantsFemaleNJPC((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_FEMALE));
-                activityDTO.setNoofparticipantsNJPCOther((Integer) subject.getObservation(NUMBER_OF_PARTICIPANTS_OTHER));
             }
         }
         activityDTO.setWasUndertakingFormFilled((String) subject.getObservation(WAS_DISCLAIMER_FORM_FILLED));

rwb/rwb-integration-readme.md

@@ -23,7 +23,7 @@ RWB integration service is built to service multiple Production organisations us
 Create a new "Organisation Administrator" User that will be used to invoke the APIs as well as act as sender of Glific messages for the organisation.
 
 Refer to [Avni Readme](https://avni.readme.io/docs) for more help regarding this.
-Ensure that the OrgAdmin user's password is not a temporary one, login into Avni webapp and confirm once.
+**Ensure that the OrgAdmin user's password is not a temporary one, login into Avni webapp and confirm once.**
 
 #### Setup Glific to work with the org