107258:Added logs and corrected actor userId in wfNotification object

sunbird-cb · Nov 4, 2023 · 17dc511 · 17dc511
1 parent 6f5c7ca
commit 17dc511
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/org/sunbird/workflow/service/impl/BPWorkFlowServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/BPWorkFlowServiceImpl.java
@@ -109,6 +109,7 @@ public Response enrolBPWorkFlow(String rootOrg, String org, WfRequest wfRequest)
 
     @Override
     public Response updateBPWorkFlow(String rootOrg, String org, WfRequest wfRequest,String userId,String role) {
+        logger.info("Workflow request Body received: " + wfRequest);
         Response response = new Response();
         Map<String, Object> batchDetailsMap = new HashMap<>();
         WfNotification wfNotification = getWorkFlowNotificationRequest(wfRequest);
@@ -1027,7 +1028,7 @@ private WfNotification getWorkFlowNotificationRequest(WfRequest wfRequest) {
         wfNotification.setComment(wfRequest.getComment());
         wfNotification.setWfId(wfRequest.getWfId());
         wfNotification.setServiceName(wfRequest.getServiceName());
-        wfNotification.setActorUserId(wfNotification.getActorUserId());
+        wfNotification.setActorUserId(wfRequest.getActorUserId());
         wfNotification.setCourseId(wfRequest.getCourseId());
         wfNotification.setUpdateFieldValues(wfRequest.getUpdateFieldValues());
         wfNotification.setRootOrgId(wfRequest.getRootOrgId());

diff --git a/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java b/src/main/java/org/sunbird/workflow/service/impl/NotificationServiceImpl.java
@@ -439,13 +439,15 @@ public void sendNotification(Map<String, Object> request) {
 		StringBuilder builder = new StringBuilder();
 		builder.append(configuration.getNotifyServiceHost()).append(configuration.getNotifyServicePath());
 		try {
-			requestService.fetchResultUsingPost(builder, request, Map.class, null);
+			Object response = requestService.fetchResultUsingPost(builder, request, Map.class, null);
+			logger.info("Notification sent successfully, response is: " + response);
 		} catch (Exception e) {
 			logger.error("Exception while posting the data in notification service: ", e);
 		}
 	}
 
 	private void sendNotificationEmail(Map<String, Object> mailNotificationDetails){
+		logger.info("Mail Notification Details: " + mailNotificationDetails);
 		Map<String, Object> params = new HashMap<>();
 		NotificationRequest request = new NotificationRequest();
 		List<String> emailList = (List<String>) mailNotificationDetails.get("emailList");