Fixes for grievance scheduler

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
 
 

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

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
 
 
 

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

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

src/main/java/com/iemr/common/controller/grievance/GrievanceController.java

@@ -48,7 +48,7 @@ public GrievanceController(GrievanceHandlingService grievanceHandlingService, Gr
 	public String fetchUnallocatedGrievanceCount(@RequestBody UnallocationRequest request) {
 		OutputResponse responseData = new OutputResponse();
 		try {
-			responseData.setResponse(grievanceDataSync.fetchUnallocatedGrievanceCount(request.getPreferredLanguageName()));
+			responseData.setResponse(grievanceDataSync.fetchUnallocatedGrievanceCount(request.getPreferredLanguageName(), request.getFilterStartDate(), request.getFilterEndDate(), request.getProviderServiceMapID()));
 		} catch (IEMRException e) {
 			logger.error("Business logic error in UnallocatedGrievanceCount" + e.getMessage(), e);
 			responseData.setError(e);
@@ -87,7 +87,7 @@ public String allocateGrievances(
 	@Operation(summary = "Allocated Grievance Records Count")
 	@PostMapping(value = "/allocatedGrievanceRecordsCount", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
 	public String allocatedGrievanceRecordsCount(@Param(value = "{\"providerServiceMapID\":\"Service ID integer\", "
-			+ "\"assignedUserID\":\"Optional - Integer user ID to whom grievances are assigned\"}") @RequestBody String request) {
+			+ "\"userID\":\"Optional - Integer user ID to whom grievances are assigned\"}") @RequestBody String request) {
 		OutputResponse response = new OutputResponse();
 		try {
 			response.setResponse(grievanceHandlingService.allocatedGrievanceRecordsCount(request));
@@ -130,13 +130,19 @@ public String moveToBin(@RequestBody String request) {
 
 	  @Operation(summary = "get grievance outbound worklist)")
 			@PostMapping(value = "/getGrievanceOutboundWorklist", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
-		    public ResponseEntity<List<GrievanceWorklistDTO>> getGrievanceOutboundWorklist(@Param(value = "{\"providerServiceMapId\":\" called service ID integer\", "
+		    public ResponseEntity<Map<String, Object>> getGrievanceOutboundWorklist(@Param(value = "{\"providerServiceMapId\":\" called service ID integer\", "
 					+ "\"userId\":\"Optional - Integer ID of user that is assigned to\"}") @RequestBody String request) {
 		        logger.info("Request received for grievance worklist");
 		        List<GrievanceWorklistDTO> response = new ArrayList<>();
+		        Map<String, Object> responseMap = new HashMap<>();
+
 				try {
 					response = grievanceHandlingService.getFormattedGrievanceData(request);
-
+					  // Prepare the success response structure
+			        responseMap.put("data", response);
+			        responseMap.put("statusCode", HttpStatus.OK.value());
+			        responseMap.put("errorMessage", "Success");
+			        responseMap.put("status", "Success");
 				}
 
 				catch (Exception e) {
@@ -148,12 +154,81 @@ public ResponseEntity<List<GrievanceWorklistDTO>> getGrievanceOutboundWorklist(@
 
 			        // Return error response with empty list and error message
 			        errorResponse.add(errorDTO);
-			        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(errorResponse);
+
+			        responseMap.put("data", errorResponse);
+			        responseMap.put("statusCode", HttpStatus.INTERNAL_SERVER_ERROR.value());
+			        responseMap.put("errorMessage", e.getMessage());
+			        responseMap.put("status", "Error");
 				}
 
 
-		        return ResponseEntity.ok(response);
+		        return ResponseEntity.ok(responseMap);
 		        }
 
 
+
+	  @Operation(summary = "Save complaint resolution and remarks")
+	  @PostMapping(value = "/saveComplaintResolution", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+	    public String saveComplaintResolution(       @Param(value = "{\"complaintID\":\"Complaint ID string\", " +
+                "\"complaintResolution\":\"Resolution text\", " +
+                "\"remarks\":\"Optional remarks\", " +
+                "\"beneficiaryRegID\":\"Beneficiary registration ID\", " +
+                "\"providerServiceMapID\":\"Provider service map ID\", " +
+                "\"userID\":\"Assigned user ID\", " +
+                "\"createdBy\":\"Creator of the complaint\", " +
+                "\"benCallID\":\"Beneficiary call ID\"}")
+ @RequestBody String request) {
+	        OutputResponse response = new OutputResponse();
+	        try {
+	            response.setResponse(grievanceHandlingService.saveComplaintResolution(request));
+	        } catch (Exception e) {
+	            logger.error("saveComplaintResolution failed with error " + e.getMessage(), e);
+	            response.setError(e);
+	        }
+	        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();
+		  }
+
+
+		  @Operation(summary = "Get Grievance Details with Remarks")
+		  @PostMapping(value = "/getCompleteGrievanceDetails", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
+		  public String getGrievanceDetailsWithRemarks(@RequestBody String request) {
+		      OutputResponse response = new OutputResponse();
+		      try {
+		          response.setResponse(grievanceHandlingService.getGrievanceDetailsWithRemarks(request));
+		      } catch (Exception e) {
+		          logger.error("getGrievanceDetailsWithRemarks failed with error " + e.getMessage(), e);
+		          response.setError(e);
+		      }
+		      return response.toString();
+		  }
+
 }

src/main/java/com/iemr/common/data/grievance/GrievanceAllocationRequest.java

@@ -10,14 +10,14 @@ public class GrievanceAllocationRequest {
 
 	private Timestamp startDate; // Start date for filtering grievances
 	private Timestamp endDate; // End date for filtering grievances
-	private List<Integer> userID; // List of user IDs (agents) to whom grievances will be allocated
+	private List<Integer> touserID; // List of user IDs (agents) to whom grievances will be allocated
 	private Integer allocateNo; // Number of grievances to be allocated to each user
-	private String preferredLanguage;
+	private String language;
 
 	@Override
 	public String toString() {
-		return "GrievanceAllocationRequest{" + "startDate=" + startDate + ", endDate=" + endDate + ", userID=" + userID
-				+ ", allocateNo=" + allocateNo + ", language=" + preferredLanguage + '}';
+		return "GrievanceAllocationRequest{" + "startDate=" + startDate + ", endDate=" + endDate + ", touserID=" + touserID
+				+ ", allocateNo=" + allocateNo + ", language=" + language + '}';
 	}
 
 }

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

src/main/java/com/iemr/common/data/grievance/GrievanceDetails.java

@@ -16,6 +16,7 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -70,18 +71,14 @@ public class GrievanceDetails {
 
 	@Expose
 	@Column(name = "Level")
-	private String level;
+	private Integer level;
 	@Expose
 	@Column(name = "State")
 	private String state;
 
-	@Expose
-	@Column(name = "Agentid")
-	private String agentid;
-
 	@Expose
 	@Column(name = "userid")
-	private Integer assignedUserID;
+	private Integer userID;
 
 	@Expose
 	@Column(name = "isAllocated")
@@ -106,6 +103,15 @@ public class GrievanceDetails {
 	@Expose
 	@Column(name = "PreferredLanguage")
 	private String preferredLanguage;
+
+	@Expose
+	@Column(name = "ComplaintResolution")
+	private String complaintResolution;
+
+	@Expose
+	@Column(name = "Remarks")
+	@Size(max = 5000, message = "Remarks cannot exceed 5000 characters")
+	private String remarks;
 
 	@Column(name = "Deleted", insertable = false, updatable = true)
 	private Boolean deleted = false;
@@ -130,7 +136,7 @@ public class GrievanceDetails {
 
 	@Expose
 	@Column(name = "VanSerialNo")
-	private Integer vanSerialNo;
+	private Long vanSerialNo;
 	@Expose
 	@Column(name = "VanID")
 	private Integer vanID;
@@ -159,10 +165,10 @@ public class GrievanceDetails {
 
 	public GrievanceDetails(Long gwid, Long grievanceId, Long beneficiaryRegID, Long benCallID,
 			Integer providerServiceMapID, String complaintID, String subjectOfComplaint, String complaint,
-			String primaryNumber, String severety, String state, String agentID, Integer userid, Boolean isAllocated,
+			String primaryNumber, String severety, Integer level, String state, Integer userid, Boolean isAllocated,
 			Boolean retryNeeded, Boolean isRegistered, Integer callCounter, Integer preferredLanguageId,
-			String preferredLanguage, Boolean deleted, Character processed, String createdBy, Timestamp createdDate,
-			String modifiedBy, Timestamp lastModDate, Integer vanSerialNo, Integer vanID, String vehicalNo,
+			String preferredLanguage, String complaintResolution, String remarks, Boolean deleted, Character processed, String createdBy, Timestamp createdDate,
+			String modifiedBy, Timestamp lastModDate, Long vanSerialNo, Integer vanID, String vehicalNo,
 			Integer parkingPlaceID, String syncedBy, Timestamp syncedDate, Boolean isCompleted) {
 		super();
 		this.gwid = gwid;
@@ -175,15 +181,17 @@ public GrievanceDetails(Long gwid, Long grievanceId, Long beneficiaryRegID, Long
 		this.complaint = complaint;
 		this.primaryNumber = primaryNumber;
 		this.severety = severety;
+		this.level = level;
 		this.state = state;
-		this.agentid = agentID;
-		this.assignedUserID = userid;
+		this.userID = userid;
 		this.isAllocated = isAllocated;
 		this.retryNeeded = retryNeeded;
 		this.isRegistered = isRegistered;
 		this.callCounter = callCounter;
 		this.preferredLanguageId = preferredLanguageId;
 		this.preferredLanguage = preferredLanguage;
+		this.complaintResolution = complaintResolution;
+		this.remarks = remarks;
 		this.deleted = deleted;
 		this.processed = processed;
 		this.createdBy = createdBy;

src/main/java/com/iemr/common/data/grievance/GrievanceResponse.java

@@ -0,0 +1,70 @@
+package com.iemr.common.data.grievance;
+
+import java.sql.Timestamp;
+
+public class GrievanceResponse {
+    private Long grievanceId;
+    private String complaintID;
+    private String primaryNumber;
+    private String complaintResolution;
+    private String remarks;
+    private Timestamp createdDate;
+    private Timestamp lastModDate;
+
+    // Getters and Setters
+    public Long getGrievanceId() {
+        return grievanceId;
+    }
+
+    public void setGrievanceId(Long grievanceId) {
+        this.grievanceId = grievanceId;
+    }
+
+    public String getComplaintID() {
+        return complaintID;
+    }
+
+    public void setComplaintID(String complaintID) {
+        this.complaintID = complaintID;
+    }
+
+    public String getPrimaryNumber() {
+        return primaryNumber;
+    }
+
+    public void setPrimaryNumber(String primaryNumber) {
+        this.primaryNumber = primaryNumber;
+    }
+
+    public String getComplaintResolution() {
+        return complaintResolution;
+    }
+
+    public void setComplaintResolution(String complaintResolution) {
+        this.complaintResolution = complaintResolution;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Timestamp getCreatedDate() {
+        return createdDate;
+    }
+
+    public void setCreatedDate(Timestamp createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public Timestamp getLastModDate() {
+        return lastModDate;
+    }
+
+    public void setLastModDate(Timestamp lastModDate) {
+        this.lastModDate = lastModDate;
+    }
+}