Skip to content

AMM-1450 |Records still visible in MO worklist after unallocating all records #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srishtigrp78 merged 3 commits into from
May 21, 2025
Merged

AMM-1450 |Records still visible in MO worklist after unallocating all records #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ea7d89
added functionality for MO worklist in call unallocation
May 21, 2025
9f079f1
Merge pull request #7 from PSMRI/develop
srishtigrp78 May 21, 2025
7568777
removed commented code
May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/main/java/com/iemr/ecd/repo/call_conf_allocation/OutboundCallsRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,5 +364,20 @@ int getChildUnAllocatedCountLRByLanguage(@Param("allocationStatus") String alloc
@Query(" UPDATE OutboundCalls SET isFurtherCallRequired = :isFurtherCallRequired WHERE motherId = :motherId AND childId IS NULL AND callDateTo>current_date()")
public int updateIsFurtherCallRequiredForUpcomingCallForMother(@Param("motherId") Long motherId, @Param("isFurtherCallRequired") Boolean isFurtherCallRequired);

@Query(value = " SELECT t FROM OutboundCalls AS t INNER JOIN MotherRecord AS mv ON t.motherId = mv.ecdIdNo WHERE t.allocatedUserId=:allocatedUserId AND "
+ " t.callStatus=:callStatus AND t.phoneNumberType=:phoneNoType "
+ " AND ((:fDate between t.callDateFrom AND t.callDateTo) OR (:tDate between t.callDateFrom AND t.callDateTo)) AND "
+ " t.childId IS NULL AND t.motherId IS NOT NULL AND mv.preferredLanguage = :preferredLanguage")
Page<OutboundCalls> getAllocatedRecordsUserByRecordTypeAndPhoneTypeMotherMO(Pageable pageable,
@Param("allocatedUserId") Integer allocatedUserId, @Param("callStatus") String callStatus,
@Param("phoneNoType") String phoneNoType, @Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate, @Param("preferredLanguage") String preferredLanguage);

@Query(value = " SELECT t FROM OutboundCalls AS t INNER JOIN ChildRecord AS cv ON t.childId = cv.ecdIdNoChildId WHERE t.allocatedUserId=:allocatedUserId AND "
+ " t.callStatus=:callStatus AND t.phoneNumberType=:phoneNoType "
+ " AND ((:fDate between t.callDateFrom AND t.callDateTo) OR (:tDate between t.callDateFrom AND t.callDateTo)) AND t.childId IS NOT NULL AND cv.preferredLanguage = :preferredLanguage ")
Page<OutboundCalls> getAllocatedRecordsUserByRecordTypeAndPhoneTypeChildMO(Pageable pageable,
@Param("allocatedUserId") Integer allocatedUserId, @Param("callStatus") String callStatus,
@Param("phoneNoType") String phoneNoType, @Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate,@Param("preferredLanguage") String preferredLanguage);


}
199 changes: 108 additions & 91 deletions src/main/java/com/iemr/ecd/service/call_conf_allocation/CallAllocationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,104 +582,121 @@ public ResponseEligibleCallRecordsDTO getEligibleRecordsInfo(int psmId, String p

}


@Transactional(rollbackOn = Exception.class)
public String moveAllocatedCallsToBin(RequestCallAllocationDTO callAllocationDto) {
try {
if (callAllocationDto.getUserId() != null && callAllocationDto.getNoOfCalls() != null
&& callAllocationDto.getRecordType() != null && callAllocationDto.getPhoneNoType() != null
&& callAllocationDto.getFDate() != null && callAllocationDto.getTDate() != null) {

Timestamp tempFDateStamp = null;
Timestamp tempTDateStamp = null;
if (callAllocationDto.getFDate() != null && callAllocationDto.getTDate() != null) {
tempFDateStamp = getTimestampFromString(
callAllocationDto.getFDate().split(Constants.T)[0].concat(Constants.TIME_FORMAT_START_TIME));
tempTDateStamp = getTimestampFromString(
callAllocationDto.getTDate().split(Constants.T)[0].concat(Constants.TIME_FORMAT_END_TIME));
} else
throw new InvalidRequestException(Constants.FROM_DATE_TO_DATE_IS_NULL);

Pageable pageable = PageRequest.of(0, callAllocationDto.getNoOfCalls());

Page<OutboundCalls> outboundCallsPage = null;

if (callAllocationDto.getRecordType().equalsIgnoreCase("Mother")) {
if (null != callAllocationDto.getRoleName()
&& callAllocationDto.getRoleName().equalsIgnoreCase("ANM")) {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMotherANM(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
} else if(null != callAllocationDto.getRoleName()
&& callAllocationDto.getRoleName().equalsIgnoreCase("associate")){
outboundCallsPage = getOutboundCallsForMotherAssociate(pageable,callAllocationDto,tempFDateStamp,tempTDateStamp);

}
else {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMother(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp);
}
} else if (callAllocationDto.getRecordType().equalsIgnoreCase("Child")) {
if (null != callAllocationDto.getRoleName()
&& callAllocationDto.getRoleName().equalsIgnoreCase("ANM")) {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeChildANM(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
}else if(null != callAllocationDto.getRoleName()
&& callAllocationDto.getRoleName().equalsIgnoreCase("associate")) {
outboundCallsPage = getOutboundcallsForChildAssociate(pageable,callAllocationDto,tempFDateStamp,tempTDateStamp);
}
else {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeChild(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp);
}
}

List<Long> motherIds = new ArrayList<>();
List<Long> childIds = new ArrayList<>();

if (outboundCallsPage != null && outboundCallsPage.getSize() > 0) {
List<OutboundCalls> resultList = outboundCallsPage.getContent();
for (OutboundCalls outboundCalls : resultList) {

outboundCalls.setAllocatedUserId(null);
outboundCalls.setAllocationStatus("unallocated");

if (outboundCalls.getEcdCallType() != null
&& outboundCalls.getEcdCallType().equalsIgnoreCase("introductory")) {
outboundCalls.setDeleted(true);
// write logic to update in mother or child table also - isAllocated = false
if (outboundCalls.getChildId() != null)
childIds.add(outboundCalls.getChildId());
else if (outboundCalls.getMotherId() != null)
motherIds.add(outboundCalls.getMotherId());

}

}

outboundCallsRepo.saveAll(resultList);
try {
// Check if all required parameters are present
if (callAllocationDto.getUserId() != null && callAllocationDto.getNoOfCalls() != null
&& callAllocationDto.getRecordType() != null && callAllocationDto.getPhoneNoType() != null
&& callAllocationDto.getFDate() != null && callAllocationDto.getTDate() != null) {

// Convert from date and to date to timestamps
Timestamp tempFDateStamp = null;
Timestamp tempTDateStamp = null;
if (callAllocationDto.getFDate() != null && callAllocationDto.getTDate() != null) {
tempFDateStamp = getTimestampFromString(
callAllocationDto.getFDate().split("T")[0].concat("T00:00:00+05:30"));
tempTDateStamp = getTimestampFromString(
callAllocationDto.getTDate().split("T")[0].concat("T23:59:59+05:30"));
} else
throw new InvalidRequestException("from date / to date is null");

Pageable pageable = PageRequest.of(0, callAllocationDto.getNoOfCalls());

Page<OutboundCalls> outboundCallsPage = null;

// Handle the "Mother" record type
if (callAllocationDto.getRecordType().equalsIgnoreCase("Mother")) {
if (callAllocationDto.getRoleName() != null) {
if (callAllocationDto.getRoleName().equalsIgnoreCase("ANM")) {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMotherANM(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
} else if (callAllocationDto.getRoleName().equalsIgnoreCase("associate")) {
outboundCallsPage = getOutboundCallsForMotherAssociate(pageable, callAllocationDto,
tempFDateStamp, tempTDateStamp);
} else if (callAllocationDto.getRoleName().equalsIgnoreCase("MO")) {
// MO Role logic for Mother
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMotherMO(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
} else {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMother(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp);
}
}
}
// Handle the "Child" record type
else if (callAllocationDto.getRecordType().equalsIgnoreCase("Child")) {
if (callAllocationDto.getRoleName() != null) {
if (callAllocationDto.getRoleName().equalsIgnoreCase("ANM")) {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeChildANM(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
} else if (callAllocationDto.getRoleName().equalsIgnoreCase("associate")) {
outboundCallsPage = getOutboundcallsForChildAssociate(pageable, callAllocationDto, tempFDateStamp, tempTDateStamp);
} else if (callAllocationDto.getRoleName().equalsIgnoreCase("MO")) {
// MO Role logic for Child
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeChildMO(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
} else {
outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeChild(
pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
tempFDateStamp, tempTDateStamp);
}
}
}

if (motherIds.size() > 0)
motherRecordRepo.updateIsAllocatedFalse(motherIds);
if (childIds.size() > 0)
childRecordRepo.updateIsAllocatedFalse(childIds);
} else
throw new ECDException("no record available for move to bin. please contact administrator");
} else
throw new InvalidRequestException(callAllocationDto.toString(),
"NULL or part of required request is NULL");
List<Long> motherIds = new ArrayList<>();
List<Long> childIds = new ArrayList<>();

if (outboundCallsPage != null && outboundCallsPage.getSize() > 0) {
List<OutboundCalls> resultList = outboundCallsPage.getContent();
for (OutboundCalls outboundCalls : resultList) {
outboundCalls.setAllocatedUserId(null);
outboundCalls.setAllocationStatus("unallocated");

if (outboundCalls.getEcdCallType() != null
&& outboundCalls.getEcdCallType().equalsIgnoreCase("introductory")) {
outboundCalls.setDeleted(true);

// Update in mother or child table as well - isAllocated = false
if (outboundCalls.getChildId() != null)
childIds.add(outboundCalls.getChildId());
else if (outboundCalls.getMotherId() != null)
motherIds.add(outboundCalls.getMotherId());
}
}

// Save the changes to the outbound calls
outboundCallsRepo.saveAll(resultList);

// Update the mother and child records to mark them as unallocated
if (motherIds.size() > 0)
motherRecordRepo.updateIsAllocatedFalse(motherIds);
if (childIds.size() > 0)
childRecordRepo.updateIsAllocatedFalse(childIds);
} else {
throw new ECDException("No record available for move to bin. Please contact administrator.");
}
} else {
throw new InvalidRequestException(callAllocationDto.toString(), "NULL or part of required request is NULL");
}

Map<String, Object> responseMap = new HashMap<>();
responseMap.put("response", "records successfully moved to bin");
return new Gson().toJson(responseMap);
} catch (Exception e) {
throw new ECDException(e);
}
// Return success response
Map<String, Object> responseMap = new HashMap<>();
responseMap.put("response", "Records successfully moved to bin");
return new Gson().toJson(responseMap);

} catch (Exception e) {
throw new ECDException(e);
}
}


private Page<OutboundCalls> getOutboundCallsForMotherAssociate(Pageable pageable,
RequestCallAllocationDTO callAllocationDto, Timestamp tempFDateStamp, Timestamp tempTDateStamp) {
Page<OutboundCalls> outboundCallsPage = null;
Expand Down