AMM-1148 | Close call API including reattempt logic based on calltype (#164)

srishtigrp78 · SR20290919 · web-flow · commit 84e0139c9e14 · 2025-02-27T14:46:04.000+05:30
* adding code for API to close call and make reattempts if needed

* adding code changes suggested by code rabbit

* adding code rabbit suggested changes

* adding code rabbit fixes

* adding code rabbit fixes

* Delete src/main/java/com/iemr/common/data/grievance/.gitignore

---------

Co-authored-by: SR20290919 &lt;SR20290919@APL-PG02PW8B&gt;
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
@@ -160,6 +160,6 @@ grievanceDataSyncDuration = @env.GRIEVANCE_DATA_SYNC_DURATION@
 springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
 
-grievanceAllocationRetryConfiguration=1
+grievanceAllocationRetryConfiguration=3
 
 
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
@@ -186,4 +186,4 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
-grievanceAllocationRetryConfiguration=1
+grievanceAllocationRetryConfiguration=3
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
@@ -186,7 +186,7 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
-grievanceAllocationRetryConfiguration=1
+grievanceAllocationRetryConfiguration=3
 
 
 
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
@@ -188,4 +188,4 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
-grievanceAllocationRetryConfiguration=1
+grievanceAllocationRetryConfiguration=3
diff --git a/src/main/environment/common_uat.properties b/src/main/environment/common_uat.properties
@@ -159,4 +159,4 @@ grievanceDataSyncDuration = <Enter Grievience Data Sync Duration>
 springdoc.api-docs.enabled=true
 springdoc.swagger-ui.enabled=true
 
-grievanceAllocationRetryConfiguration=1
+grievanceAllocationRetryConfiguration=3
diff --git a/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java b/src/main/java/com/iemr/common/controller/grievance/GrievanceController.java
@@ -178,5 +178,35 @@ public String saveComplaintResolution(       @Param(value = "{\"complaintID\":\"
 	        return response.toString();
 	    }
 	  
+	  
+		// Controller method to handle reattempt logic
+		  @Operation(summary = "Check reattempt logic for grievance")
+		  @PostMapping(value = "/completeGrievanceCall", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+		  public String completeGrievanceCall(
+		      @Param(value = "{\"complaintID\":\"String - ComplaintID\", "
+		      		  + "\"userID\":\"Integer - Assigned UserID\", "
+		    		  + "\"isCompleted\":\"Boolean - completion status of call\", "
+		              + "\"beneficiaryRegId\":\"Long - Beneficiary Registration ID\", "
+		              + "\"callTypeID\":\"Integer - Call Type ID\", "
+		              + "\"benCallID\":\"Long - Beneficiary Call ID\", "
+		              +"\"callID\":\"String - call ID by czentrix\", "
+		              + "\"providerServiceMapID\":\"Integer - providerServiceMapID\", "
+		              + "\"createdBy\":\"String - Creator\"}") 
+		      @RequestBody String request) {
+
+				OutputResponse response = new OutputResponse();
+
+				try {
+					String s = grievanceDataSync.completeGrievanceCall(request);
+						response.setResponse(s);
+			
+				} catch (Exception e) {
+					logger.error("complete grievance outbound call failed with error " + e.getMessage(), e);
+					response.setError(e);
+				}
+				return response.toString();
+		  }
+
+	  
 
 }
diff --git a/src/main/java/com/iemr/common/data/grievance/GrievanceCallRequest.java b/src/main/java/com/iemr/common/data/grievance/GrievanceCallRequest.java
@@ -0,0 +1,17 @@
+package com.iemr.common.data.grievance;
+
+import lombok.Data;
+
+@Data
+public class GrievanceCallRequest {
+
+	  String complaintID;
+	  Integer userID;
+      Boolean isCompleted;
+      Long beneficiaryRegID;
+      Integer callTypeID;
+      Long benCallID;
+      Integer providerServiceMapId;
+      String createdBy;
+	
+}
diff --git a/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java b/src/main/java/com/iemr/common/repository/callhandling/IEMRCalltypeRepositoryImplCustom.java
@@ -88,5 +88,7 @@ Set<Object[]> getOutboundCallTypes(@Param("providerServiceMapID") Integer provid
 	@Query("select callType from CallType callType where deleted = false and callTypeID = :callTypeID")
 	CallType getCallTypeDetails(@Param("callTypeID") Integer callTypeID);
 	
-	
+	@Query("select callType, callGroupType from CallType "
+			+ "where callTypeID = :callTypeID")
+	Set<Object[]> getCallDetails(@Param("callTypeID") Integer callTypeID);
 }
diff --git a/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java b/src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java
@@ -72,7 +72,7 @@ int updateGrievanceAllocationStatus(@Param("grievanceId") Long grievanceId,
 	public Set<Object[]> fetchUnallocatedGrievanceCount();
 	
 	@Modifying
-	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.remarks = :remarks, g.modifiedBy =  :modifiedBy, "
+	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.remarks = :remarks, g.modifiedBy =  :modifiedBy "
 	       + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
 		   + " AND g.userID = :userID")
 	@Transactional
@@ -85,7 +85,7 @@ int updateComplaintResolution(@Param("complaintResolution") String complaintReso
 	                              @Param("userID") Integer userID);
 
 	@Modifying
-	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy =  :modifiedBy, "
+	@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy =  :modifiedBy "
 	       + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
 			+ " AND g.userID = :userID")
 	@Transactional
@@ -95,5 +95,33 @@ int updateComplaintResolution(@Param("complaintResolution") String complaintReso
 	                              @Param("beneficiaryRegID") Long beneficiaryRegID,
 	                              @Param("providerServiceMapID") Integer providerServiceMapID,
 	                              @Param("userID") Integer userID);
+	
+	@Query(" Select grievance.callCounter, grievance.retryNeeded FROM GrievanceDetails grievance where complaintID = :complaintID")
+	public List<Object[]> getCallCounter(@Param("complaintID") String complaintID);
+	
+	@Modifying
+	@Query("UPDATE GrievanceDetails g SET g.isCompleted = :isCompleted, g. g.retryNeeded =  :retryNeeded "
+			+ "WHERE g.complaintID = :complaintID AND g.userID = :userID AND g.beneficiaryRegID = :beneficiaryRegID "
+			+ "AND g.providerServiceMapID = :providerServiceMapID")
+	@Transactional
+	public int updateCompletedStatusInCall(@Param("isCompleted") Boolean isCompleted,
+			                               @Param("retryNeeded") Boolean retryNeeded,
+										   @Param("complaintID") String complaintID,
+										   @Param("userID") Integer userID,
+										   @Param("beneficiaryRegID") Long beneficiaryRegID,
+				                           @Param("providerServiceMapID") Integer providerServiceMapID);
+										   
+
+	@Modifying
+	@Query("UPDATE GrievanceDetails g SET g.callCounter = :callCounter, g.retryNeeded =  :retryNeeded "
+	       + "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
+			+ " AND g.userID = :userID")
+	@Transactional
+	public int updateCallCounter(@Param("callCounter") Integer callCounter,
+			   					  @Param("retryNeeded") Boolean retryNeeded,
+	                              @Param("complaintID") String complaintID,
+	                              @Param("beneficiaryRegID") Long beneficiaryRegID,
+	                              @Param("providerServiceMapID") Integer providerServiceMapID,
+	                              @Param("userID") Integer userID);
 
 }
diff --git a/src/main/java/com/iemr/common/service/grievance/GrievanceDataSync.java b/src/main/java/com/iemr/common/service/grievance/GrievanceDataSync.java
@@ -12,4 +12,6 @@ public interface GrievanceDataSync {
 	
 	public String fetchUnallocatedGrievanceCount(String preferredLanguage) throws IEMRException, JSONException;
 
+	public String completeGrievanceCall(String request) throws Exception;
+
 }
diff --git a/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java b/src/main/java/com/iemr/common/service/grievance/GrievanceDataSyncImpl.java
@@ -6,6 +6,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -32,16 +33,21 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.iemr.common.data.callhandling.CallType;
+import com.iemr.common.data.everwell.EverwellDetails;
+import com.iemr.common.data.grievance.GrievanceCallRequest;
 import com.iemr.common.data.grievance.GrievanceDetails;
 import com.iemr.common.data.grievance.GrievanceTransaction;
-
+import com.iemr.common.repository.callhandling.IEMRCalltypeRepositoryImplCustom;
 import com.iemr.common.repository.grievance.GrievanceDataRepo;
 import com.iemr.common.repository.grievance.GrievanceFetchBenDetailsRepo;
 import com.iemr.common.repository.grievance.GrievanceTransactionRepo;
 import com.iemr.common.repository.location.LocationStateRepository;
 import com.iemr.common.utils.exception.IEMRException;
 import com.iemr.common.utils.mapper.InputMapper;
 
+import jakarta.transaction.Transactional;
+
 @Service
 @PropertySource("classpath:application.properties")
 public class GrievanceDataSyncImpl implements GrievanceDataSync {
@@ -62,16 +68,18 @@ public class GrievanceDataSyncImpl implements GrievanceDataSync {
 	private final GrievanceTransactionRepo grievanceTransactionRepo;
 	private final GrievanceFetchBenDetailsRepo grievanceFetchBenDetailsRepo;
 	private final LocationStateRepository locationStateRepository;
+	private final IEMRCalltypeRepositoryImplCustom iEMRCalltypeRepositoryImplCustom;
 
 	// Constructor-based injection
 	@Autowired
 	public GrievanceDataSyncImpl(GrievanceDataRepo grievanceDataRepo, GrievanceTransactionRepo grievanceTransactionRepo,
 			GrievanceFetchBenDetailsRepo grievanceFetchBenDetailsRepo,
-			LocationStateRepository locationStateRepository) {
+			LocationStateRepository locationStateRepository, IEMRCalltypeRepositoryImplCustom iEMRCalltypeRepositoryImplCustom) {
 		this.grievanceDataRepo = grievanceDataRepo;
 		this.grievanceTransactionRepo = grievanceTransactionRepo;
 		this.grievanceFetchBenDetailsRepo = grievanceFetchBenDetailsRepo;
 		this.locationStateRepository = locationStateRepository;
+		this.iEMRCalltypeRepositoryImplCustom = iEMRCalltypeRepositoryImplCustom;
 	}
 
 	@Value("${grievanceUserAuthenticate}")
@@ -92,6 +100,9 @@ public GrievanceDataSyncImpl(GrievanceDataRepo grievanceDataRepo, GrievanceTrans
 	@Value("${grievanceDataSyncDuration}")
 	private String grievanceDataSyncDuration;
 
+	@Value("${grievanceAllocationRetryConfiguration}")
+	private int grievanceAllocationRetryConfiguration;
+	
 	private String GRIEVANCE_AUTH_TOKEN;
 	private Long GRIEVANCE_TOKEN_EXP;
 
@@ -468,4 +479,105 @@ public String fetchUnallocatedGrievanceCount(String preferredLanguage) throws IE
 
 		return resultArray.toString();
 	}
+	
+	
+	
+	@Override
+	@Transactional
+	public String completeGrievanceCall(String request) throws Exception {
+		
+		GrievanceCallRequest grievanceCallRequest = InputMapper.gson().fromJson(request, GrievanceCallRequest.class);
+		   String complaintID = grievanceCallRequest.getComplaintID();
+		   Integer userID = grievanceCallRequest.getUserID();
+	        Boolean isCompleted = grievanceCallRequest.getIsCompleted();
+	        Long beneficiaryRegID = grievanceCallRequest.getBeneficiaryRegID();
+	        Integer callTypeID = grievanceCallRequest.getCallTypeID();
+	        Integer providerServiceMapId = grievanceCallRequest.getProviderServiceMapId();
+
+	        CallType callTypeObj = new CallType();
+	        String response = "failure"; 
+	        int updateCount = 0;
+	        int updateCallCounter = 0;
+	        int callCounter = 0;
+	        try {
+	        	
+		        	GrievanceDetails grievanceCallStatus = new GrievanceDetails();
+
+	    		List<Object[]> lists = grievanceDataRepo.getCallCounter(complaintID);
+	    		for (Object[] objects : lists) {
+					if (objects != null && objects.length >= 2) {
+						grievanceCallStatus.setCallCounter((Integer) objects[0]);
+						grievanceCallStatus.setRetryNeeded((Boolean)objects[1]);	
+					}
+				}
+	        	
+	        	  // Fetching CallDetails using BenCallID and CallTypeID
+	    		Set<Object[]> callTypesArray = new HashSet<Object[]>();
+	            callTypesArray = iEMRCalltypeRepositoryImplCustom.getCallDetails(callTypeID);
+	        	for (Object[] object : callTypesArray)
+	    		{
+	    			if (object != null && object.length >= 2)
+	    			{
+	    				callTypeObj.setCallGroupType((String) object[0]);
+	    				callTypeObj.setCallType((String) object[1]);
+	    				
+	    			}
+	    			
+	    		}
+	    
+	    		       String callGroupType = callTypeObj.getCallGroupType();
+	    		        String callType = callTypeObj.getCallType();
+
+	        	
+	            // Logic for reattempt based on call group type and call type
+	    		        
+	    		      boolean  isRetryNeeded = grievanceCallStatus.getRetryNeeded();
+	    		        if (callGroupType.equals("Valid")) {
+	                // Conditions when no reattempt is needed
+	                if (callType.equals("Valid") || callType.equals("Wrong Number") || callType.equals("Test Call")) {
+	                	isRetryNeeded = false;
+	                } else if (callType.equals("Disconnected Call") || callType.equals("Serviced Call") ||
+	                           callType.equals("Silent Call") || callType.equals("Call Back")) {
+	                    // Reattempt is needed for these call subtypes
+	                	isRetryNeeded = true;
+	                }
+	            }
+
+	            // Check if max attempts (3) are reached
+	            if (isRetryNeeded == true && callCounter < grievanceAllocationRetryConfiguration) {
+	                // Increment the call counter for reattempt
+	                grievanceCallStatus.setCallCounter(grievanceCallStatus.getCallCounter() + 1);
+	             // Update the retryNeeded flag
+	                grievanceCallStatus.setRetryNeeded(true);
+	                updateCallCounter = grievanceDataRepo.updateCallCounter(callCounter, grievanceCallStatus.getRetryNeeded(), grievanceCallRequest.getComplaintID(), 
+	                		grievanceCallRequest.getBeneficiaryRegID(), grievanceCallRequest.getProviderServiceMapId(),
+	                		grievanceCallRequest.getUserID());
+	            //    response = "Successfully closing call.";  // Return success when reattempt logic is applied successfully. The grievance call needs to be retried, and a reattempt is performed.
+	                if (updateCallCounter > 0)
+	                	response = "Successfully closing call";
+					else {
+						response = "failure";
+					}
+	            } else if (callCounter == grievanceAllocationRetryConfiguration) {
+	                // Max attempts reached, no further reattempt
+	                grievanceCallStatus.setRetryNeeded(false);
+	            	updateCount = grievanceDataRepo.updateCompletedStatusInCall(isCompleted, grievanceCallStatus.getRetryNeeded(), complaintID, userID, beneficiaryRegID, providerServiceMapId);
+	                response = "max_attempts_reached";  // Indicate that max attempts are reached
+	                
+	                
+	            } else {
+
+	                response = "no_reattempt_needed";  // No reattempt needed
+	            }
+
+
+
+	        }
+	        	catch (Exception e) {
+	            response = "error: " + e.getMessage();
+	        }
+
+	        return response;  // Return the response (either success or error message)
+	    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -88,5 +88,7 @@ Set<Object[]> getOutboundCallTypes(@Param("providerServiceMapID") Integer provid`
`88`	`88`	`@Query("select callType from CallType callType where deleted = false and callTypeID = :callTypeID")`
`89`	`89`	`CallType getCallTypeDetails(@Param("callTypeID") Integer callTypeID);`
`90`	`90`
`91`		`-`
	`91`	`+ @Query("select callType, callGroupType from CallType "`
	`92`	`+ + "where callTypeID = :callTypeID")`
	`93`	`+ Set<Object[]> getCallDetails(@Param("callTypeID") Integer callTypeID);`
`92`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ public interface GrievanceDataSync {`
`12`	`12`
`13`	`13`	`public String fetchUnallocatedGrievanceCount(String preferredLanguage) throws IEMRException, JSONException;`
`14`	`14`
	`15`	`+ public String completeGrievanceCall(String request) throws Exception;`
	`16`	`+`
`15`	`17`	`}`