AMM-1146 | API to save complaint resolution and remarks for a grievance #163
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -104,9 +104,9 @@ public String allocatedGrievanceRecordsCount(String request) throws IEMRExceptio | |
| GrievanceDetails grievanceRequest = InputMapper.gson().fromJson(request, GrievanceDetails.class); | ||
|
|
||
| Integer providerServiceMapID = grievanceRequest.getProviderServiceMapID(); | ||
| Integer userID = grievanceRequest.getUserID(); | ||
|
|
||
| Set<Object[]> resultSet = grievanceDataRepo.fetchGrievanceRecordsCount(providerServiceMapID, userID); | ||
|
|
||
| JSONObject result = new JSONObject(); | ||
| result.put("All", 0); | ||
|
|
@@ -194,7 +194,7 @@ public String moveToBin(String request) throws Exception { | |
| // Step 2: Fetch grievances based on assigned user, language | ||
| // condition | ||
| List<GrievanceDetails> grievances = grievanceDataRepo.findGrievancesByUserAndLanguage( | ||
| moveToBinRequest.getUserID(), moveToBinRequest.getPreferredLanguageName()); | ||
|
|
||
| if (grievances.isEmpty()) { | ||
| throw new Exception("No grievances found for the given user, language, and condition."); | ||
|
|
@@ -220,22 +220,22 @@ public String moveToBin(String request) throws Exception { | |
| int totalUnassigned = 0; | ||
| for (GrievanceDetails grievance : grievancesToMove) { | ||
| int rowsAffected = grievanceDataRepo.unassignGrievance(grievance.getGrievanceId(), | ||
| moveToBinRequest.getUserID()); | ||
| if (rowsAffected > 0) { | ||
| grievance.setIsAllocated(false); // Assuming there's a setter for this flag | ||
| int updateFlagResult = grievanceDataRepo.updateGrievanceAllocationStatus(grievance.getGrievanceId(), | ||
| false); | ||
| if (updateFlagResult > 0) { | ||
| totalUnassigned++; | ||
| logger.debug("Unassigned grievance ID {} from user ID {}", grievance.getGrievanceId(), | ||
| moveToBinRequest.getUserID()); | ||
| } else { | ||
| logger.error("Failed to unassign grievance ID {} from user ID {}", grievance.getGrievanceId(), | ||
| moveToBinRequest.getUserID()); | ||
| } | ||
| } else { | ||
| logger.error("Failed to unassign grievance ID {} from user ID {}", grievance.getGrievanceId(), | ||
| moveToBinRequest.getUserID()); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -326,4 +326,65 @@ public List<GrievanceWorklistDTO> getFormattedGrievanceData(String request) thro | |
| return formattedGrievances; | ||
|
|
||
| } | ||
|
|
||
| /** | ||
| * Saves the complaint resolution and remarks for a grievance. | ||
| * | ||
| * @param request JSON string containing complaint resolution details | ||
| * @return Success message if the update is successful | ||
| */ | ||
|
|
||
| @Transactional | ||
| public String saveComplaintResolution(String request) throws Exception { | ||
|
Comment on lines
+337
to
+338
Contributor
There was a problem hiding this comment. 💡 Verification agent 🧩 Analysis chainAdd @OverRide annotation if implementing interface method. If this method is part of the 🏁 Script executed: #!/bin/bash
# Check if saveComplaintResolution is defined in GrievanceHandlingService interface
rg -A 3 "interface GrievanceHandlingService" --include="*.java"
rg "saveComplaintResolution" --include="*GrievanceHandlingService.java"Length of output: 1021 Verification Concern: Verify whether saveComplaintResolution is an interface method The initial script couldn’t complete due to invalid command options, so please re-run the search with corrected syntax or perform a manual check. For example, try: If you confirm that 🏁 Script executed: [run_scripts]
#!/bin/bash
# Search for the interface declaration and its context
rg -A 3 "interface GrievanceHandlingService" -g "*.java"
# Search for the method usage in files related to GrievanceHandlingService
rg "saveComplaintResolution" -g "*GrievanceHandlingService.java"Length of output: 924 Action Required: Add @OverRide Annotation We verified that @Override
@Transactional
public String saveComplaintResolution(String request) throws Exception {
// method implementation
}This change will help catch interface changes during compilation. |
||
| // Parse the request JSON into a GrievanceDetails object | ||
| GrievanceDetails grievanceRequest = InputMapper.gson().fromJson(request, GrievanceDetails.class); | ||
|
|
||
| if (grievanceRequest.getComplaintID() == null || grievanceRequest.getComplaintID().trim().isEmpty()) { | ||
| throw new IllegalArgumentException("ComplaintID is required"); | ||
| } | ||
| if (grievanceRequest.getComplaintResolution() == null || grievanceRequest.getComplaintResolution().trim().isEmpty()) { | ||
| throw new IllegalArgumentException("ComplaintResolution is required"); | ||
| } | ||
| if (grievanceRequest.getBeneficiaryRegID() == null) { | ||
| throw new IllegalArgumentException("BeneficiaryRegID is required"); | ||
| } | ||
| if (grievanceRequest.getProviderServiceMapID() == null) { | ||
| throw new IllegalArgumentException("ProviderServiceMapID is required"); | ||
| } | ||
| if (grievanceRequest.getUserID() == null) { | ||
| throw new IllegalArgumentException("AssignedUserID is required"); | ||
| } | ||
| if (grievanceRequest.getCreatedBy() == null) { | ||
| throw new IllegalArgumentException("CreatedBy is required"); | ||
| } | ||
| // Extract values from the request | ||
| String complaintID = grievanceRequest.getComplaintID(); | ||
| String complaintResolution = grievanceRequest.getComplaintResolution(); | ||
| String remarks = grievanceRequest.getRemarks(); | ||
| Long beneficiaryRegID = grievanceRequest.getBeneficiaryRegID(); | ||
| Integer providerServiceMapID = grievanceRequest.getProviderServiceMapID(); | ||
| Integer userID = grievanceRequest.getUserID(); | ||
| String createdBy = grievanceRequest.getCreatedBy(); | ||
|
|
||
|
|
||
| String modifiedBy = createdBy; | ||
| int updateCount = 0; | ||
| if (remarks == null) { | ||
| updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, modifiedBy, complaintID, | ||
| beneficiaryRegID, providerServiceMapID, userID); | ||
| logger.debug("updated complaint resolution without remarks for complaint id: {}", complaintID); | ||
| } | ||
| else { | ||
| updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, remarks, modifiedBy, complaintID, | ||
| beneficiaryRegID, providerServiceMapID, userID); | ||
| logger.debug("updated complaint resolution with remarks for complaint id: {}", complaintID); | ||
|
|
||
| } | ||
| if (updateCount > 0) { | ||
| return "Complaint resolution updated successfully"; | ||
| } else { | ||
| throw new Exception("Failed to update complaint resolution"); | ||
| } | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Add transaction management.
The method performs database updates but lacks transaction management. Add
@Transactionalto ensure atomic operations.+ @Transactional public String saveComplaintResolution(String request) throws Exception {📝 Committable suggestion
🛠️ Refactor suggestion
Add documentation and input validation.
The method would benefit from:
@NotNulland@NotBlankvalidation for the request parameter📝 Committable suggestion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
already fixed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@srishtigrp78 You're absolutely right. I can confirm that you've already implemented both suggestions:
@Transactionalannotation is present on thesaveComplaintResolutionmethodThank you for proactively addressing these code quality improvements!