Skip to content

Commit 42f00ce

Browse files
SR20290919SR20290919
SR20290919
authored and
SR20290919
committed
changing variable name of assignedUserID to userID
1 parent 713867e commit 42f00ce

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public String allocateGrievances(
8787
@Operation(summary = "Allocated Grievance Records Count")
8888
@PostMapping(value = "/allocatedGrievanceRecordsCount", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization")
8989
public String allocatedGrievanceRecordsCount(@Param(value = "{\"providerServiceMapID\":\"Service ID integer\", "
90-
+ "\"assignedUserID\":\"Optional - Integer user ID to whom grievances are assigned\"}") @RequestBody String request) {
90+
+ "\"userID\":\"Optional - Integer user ID to whom grievances are assigned\"}") @RequestBody String request) {
9191
OutputResponse response = new OutputResponse();
9292
try {
9393
response.setResponse(grievanceHandlingService.allocatedGrievanceRecordsCount(request));
@@ -164,7 +164,7 @@ public String saveComplaintResolution( @Param(value = "{\"complaintID\":\"
164164
"\"remarks\":\"Optional remarks\", " +
165165
"\"beneficiaryRegID\":\"Beneficiary registration ID\", " +
166166
"\"providerServiceMapID\":\"Provider service map ID\", " +
167-
"\"assignedUserID\":\"Assigned user ID\", " +
167+
"\"userID\":\"Assigned user ID\", " +
168168
"\"createdBy\":\"Creator of the complaint\", " +
169169
"\"benCallID\":\"Beneficiary call ID\"}")
170170
@RequestBody String request) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public class GrievanceDetails {
8282

8383
@Expose
8484
@Column(name = "userid")
85-
private Integer assignedUserID;
85+
private Integer userID;
8686

8787
@Expose
8888
@Column(name = "isAllocated")
@@ -187,7 +187,7 @@ public GrievanceDetails(Long gwid, Long grievanceId, Long beneficiaryRegID, Long
187187
this.severety = severety;
188188
this.state = state;
189189
this.agentid = agentID;
190-
this.assignedUserID = userid;
190+
this.userID = userid;
191191
this.isAllocated = isAllocated;
192192
this.retryNeeded = retryNeeded;
193193
this.isRegistered = isRegistered;

‎src/main/java/com/iemr/common/data/grievance/MoveToBinRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class MoveToBinRequest {
77

88
private Integer providerServiceMapID;
9-
private Integer assignedUserID;
9+
private Integer userID;
1010
private String preferredLanguageName;
1111
private Boolean is1097;
1212
private Integer noOfCalls;

‎src/main/java/com/iemr/common/repository/grievance/GrievanceDataRepo.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,40 +27,40 @@ List<GrievanceDetails> findGrievancesInDateRangeAndLanguage(@Param("startDate")
2727

2828

2929
@Modifying
30-
@Query("UPDATE GrievanceDetails g SET g.isAllocated = true, g.assignedUserID = :assignedUserId WHERE g.grievanceId = :grievanceId")
30+
@Query("UPDATE GrievanceDetails g SET g.isAllocated = true, g.userID = :userId WHERE g.grievanceId = :grievanceId")
3131
@Transactional
3232
public int allocateGrievance(@Param("grievanceId") Long grievanceId,
33-
@Param("assignedUserId") Integer assignedUserId);
33+
@Param("userId") Integer userId);
3434

3535
@Query(nativeQuery = true, value = "SELECT PreferredLanguageId, PreferredLanguage, VanSerialNo, VanID, ParkingPlaceId, VehicalNo FROM db_identity.i_beneficiarydetails WHERE BeneficiaryRegID = :benRegId")
3636
public ArrayList<Object[]> getBeneficiaryGrievanceDetails(@Param("benRegId") Long benRegId);
3737

3838
@Query("select grievance.preferredLanguage, count(distinct grievance.grievanceId) "
3939
+ "from GrievanceDetails grievance " + "where grievance.providerServiceMapID = :providerServiceMapID "
40-
+ "and grievance.assignedUserID = :assignedUserID " + "and grievance.deleted = false "
40+
+ "and grievance.userID = :userID " + "and grievance.deleted = false "
4141
+ "group by grievance.preferredLanguage")
4242
public Set<Object[]> fetchGrievanceRecordsCount(@Param("providerServiceMapID") Integer providerServiceMapID,
43-
@Param("assignedUserID") Integer assignedUserID);
43+
@Param("userID") Integer userID);
4444

45-
@Query("SELECT g FROM GrievanceDetails g WHERE g.assignedUserID = :assignedUserID AND g.preferredLanguage = :language AND g.isAllocated = true")
46-
List<GrievanceDetails> findAllocatedGrievancesByUserAndLanguage(@Param("assignedUserID") Integer assignedUserID,
45+
@Query("SELECT g FROM GrievanceDetails g WHERE g.userID = :userID AND g.preferredLanguage = :language AND g.isAllocated = true")
46+
List<GrievanceDetails> findAllocatedGrievancesByUserAndLanguage(@Param("userID") Integer userID,
4747
@Param("language") String language);
4848

4949
@Modifying
50-
@Query("UPDATE GrievanceDetails g SET g.assignedUserID = :assignedUserID WHERE g.grievanceId = :grievanceId")
50+
@Query("UPDATE GrievanceDetails g SET g.userID = :userID WHERE g.grievanceId = :grievanceId")
5151
@Transactional
5252
public int reallocateGrievance(@Param("grievanceId") Long grievanceId,
53-
@Param("assignedUserID") Integer assignedUserID);
53+
@Param("userID") Integer userID);
5454

55-
@Query("SELECT g FROM GrievanceDetails g WHERE g.assignedUserID = :assignedUserID "
55+
@Query("SELECT g FROM GrievanceDetails g WHERE g.userID = :userID "
5656
+ "AND g.preferredLanguage = :preferredLanguageName")
57-
List<GrievanceDetails> findGrievancesByUserAndLanguage(@Param("assignedUserID") Integer assignedUserID,
57+
List<GrievanceDetails> findGrievancesByUserAndLanguage(@Param("userID") Integer userID,
5858
@Param("preferredLanguageName") String language);
5959

6060
@Modifying
6161
@Transactional
62-
@Query("UPDATE GrievanceDetails g SET g.assignedUserID = NULL WHERE g.grievanceId = :grievanceId AND g.assignedUserID = :assignedUserID")
63-
int unassignGrievance(@Param("grievanceId") Long grievanceId, @Param("assignedUserID") Integer assignedUserID);
62+
@Query("UPDATE GrievanceDetails g SET g.userID = NULL WHERE g.grievanceId = :grievanceId AND g.userID = :userID")
63+
int unassignGrievance(@Param("grievanceId") Long grievanceId, @Param("userID") Integer userID);
6464

6565
@Modifying
6666
@Transactional
@@ -74,26 +74,26 @@ int updateGrievanceAllocationStatus(@Param("grievanceId") Long grievanceId,
7474
@Modifying
7575
@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.remarks = :remarks, g.modifiedBy = :modifiedBy, "
7676
+ "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
77-
+ " AND g.assignedUserID = :assignedUserID")
77+
+ " AND g.userID = :userID")
7878
@Transactional
7979
int updateComplaintResolution(@Param("complaintResolution") String complaintResolution,
8080
@Param("remarks") String remark,
8181
@Param("modifiedBy") String modifiedBy,
8282
@Param("complaintID") String complaintID,
8383
@Param("beneficiaryRegID") Long beneficiaryRegID,
8484
@Param("providerServiceMapID") Integer providerServiceMapID,
85-
@Param("assignedUserID") Integer assignedUserID);
85+
@Param("userID") Integer userID);
8686

8787
@Modifying
8888
@Query("UPDATE GrievanceDetails g SET g.complaintResolution = :complaintResolution, g.modifiedBy = :modifiedBy, "
8989
+ "WHERE g.complaintID = :complaintID AND g.beneficiaryRegID = :beneficiaryRegID AND g.providerServiceMapID = :providerServiceMapID"
90-
+ " AND g.assignedUserID = :assignedUserID")
90+
+ " AND g.userID = :userID")
9191
@Transactional
9292
int updateComplaintResolution(@Param("complaintResolution") String complaintResolution,
9393
@Param("modifiedBy") String modifiedBy,
9494
@Param("complaintID") String complaintID,
9595
@Param("beneficiaryRegID") Long beneficiaryRegID,
9696
@Param("providerServiceMapID") Integer providerServiceMapID,
97-
@Param("assignedUserID") Integer assignedUserID);
97+
@Param("userID") Integer userID);
9898

9999
}

‎src/main/java/com/iemr/common/service/grievance/GrievanceHandlingServiceImpl.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ public String allocatedGrievanceRecordsCount(String request) throws IEMRExceptio
104104
GrievanceDetails grievanceRequest = InputMapper.gson().fromJson(request, GrievanceDetails.class);
105105

106106
Integer providerServiceMapID = grievanceRequest.getProviderServiceMapID();
107-
Integer assignedUserID = grievanceRequest.getAssignedUserID();
107+
Integer userID = grievanceRequest.getUserID();
108108

109-
Set<Object[]> resultSet = grievanceDataRepo.fetchGrievanceRecordsCount(providerServiceMapID, assignedUserID);
109+
Set<Object[]> resultSet = grievanceDataRepo.fetchGrievanceRecordsCount(providerServiceMapID, userID);
110110

111111
JSONObject result = new JSONObject();
112112
result.put("All", 0);
@@ -194,7 +194,7 @@ public String moveToBin(String request) throws Exception {
194194
// Step 2: Fetch grievances based on assigned user, language
195195
// condition
196196
List<GrievanceDetails> grievances = grievanceDataRepo.findGrievancesByUserAndLanguage(
197-
moveToBinRequest.getAssignedUserID(), moveToBinRequest.getPreferredLanguageName());
197+
moveToBinRequest.getUserID(), moveToBinRequest.getPreferredLanguageName());
198198

199199
if (grievances.isEmpty()) {
200200
throw new Exception("No grievances found for the given user, language, and condition.");
@@ -220,22 +220,22 @@ public String moveToBin(String request) throws Exception {
220220
int totalUnassigned = 0;
221221
for (GrievanceDetails grievance : grievancesToMove) {
222222
int rowsAffected = grievanceDataRepo.unassignGrievance(grievance.getGrievanceId(),
223-
moveToBinRequest.getAssignedUserID());
223+
moveToBinRequest.getUserID());
224224
if (rowsAffected > 0) {
225225
grievance.setIsAllocated(false); // Assuming there's a setter for this flag
226226
int updateFlagResult = grievanceDataRepo.updateGrievanceAllocationStatus(grievance.getGrievanceId(),
227227
false);
228228
if (updateFlagResult > 0) {
229229
totalUnassigned++;
230230
logger.debug("Unassigned grievance ID {} from user ID {}", grievance.getGrievanceId(),
231-
moveToBinRequest.getAssignedUserID());
231+
moveToBinRequest.getUserID());
232232
} else {
233233
logger.error("Failed to unassign grievance ID {} from user ID {}", grievance.getGrievanceId(),
234-
moveToBinRequest.getAssignedUserID());
234+
moveToBinRequest.getUserID());
235235
}
236236
} else {
237237
logger.error("Failed to unassign grievance ID {} from user ID {}", grievance.getGrievanceId(),
238-
moveToBinRequest.getAssignedUserID());
238+
moveToBinRequest.getUserID());
239239
}
240240
}
241241

@@ -351,7 +351,7 @@ public String saveComplaintResolution(String request) throws Exception {
351351
if (grievanceRequest.getProviderServiceMapID() == null) {
352352
throw new IllegalArgumentException("ProviderServiceMapID is required");
353353
}
354-
if (grievanceRequest.getAssignedUserID() == null) {
354+
if (grievanceRequest.getUserID() == null) {
355355
throw new IllegalArgumentException("AssignedUserID is required");
356356
}
357357
if (grievanceRequest.getCreatedBy() == null) {
@@ -363,20 +363,20 @@ public String saveComplaintResolution(String request) throws Exception {
363363
String remarks = grievanceRequest.getRemarks();
364364
Long beneficiaryRegID = grievanceRequest.getBeneficiaryRegID();
365365
Integer providerServiceMapID = grievanceRequest.getProviderServiceMapID();
366-
Integer assignedUserID = grievanceRequest.getAssignedUserID();
366+
Integer userID = grievanceRequest.getUserID();
367367
String createdBy = grievanceRequest.getCreatedBy();
368368

369369

370370
String modifiedBy = createdBy;
371371
int updateCount = 0;
372372
if (remarks == null) {
373373
updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, modifiedBy, complaintID,
374-
beneficiaryRegID, providerServiceMapID, assignedUserID);
374+
beneficiaryRegID, providerServiceMapID, userID);
375375
logger.debug("updated complaint resolution without remarks for complaint id: {}", complaintID);
376376
}
377377
else {
378378
updateCount = grievanceDataRepo.updateComplaintResolution(complaintResolution, remarks, modifiedBy, complaintID,
379-
beneficiaryRegID, providerServiceMapID, assignedUserID);
379+
beneficiaryRegID, providerServiceMapID, userID);
380380
logger.debug("updated complaint resolution with remarks for complaint id: {}", complaintID);
381381

382382
}

0 commit comments

Comments
 (0)