removed commented code

Author: SR20290919

src/main/java/com/iemr/ecd/service/call_conf_allocation/CallAllocationImpl.java

@@ -582,103 +582,6 @@ 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);
-//
-//					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);
-//		}
-//
-//	}
 
 	@Transactional(rollbackOn = Exception.class)
 	public String moveAllocatedCallsToBin(RequestCallAllocationDTO callAllocationDto) {
@@ -711,7 +614,8 @@ public String moveAllocatedCallsToBin(RequestCallAllocationDTO callAllocationDto
 	                                pageable, callAllocationDto.getUserId(), "open", callAllocationDto.getPhoneNoType(),
 	                                tempFDateStamp, tempTDateStamp, callAllocationDto.getPreferredLanguage());
 	                    } else if (callAllocationDto.getRoleName().equalsIgnoreCase("associate")) {
-	                        outboundCallsPage = getOutboundCallsForMotherAssociate(pageable, callAllocationDto, tempFDateStamp, tempTDateStamp);
+	                        outboundCallsPage = getOutboundCallsForMotherAssociate(pageable, callAllocationDto, 
+	                        		tempFDateStamp, tempTDateStamp);
 	                    } else if (callAllocationDto.getRoleName().equalsIgnoreCase("MO")) {
 	                        // MO Role logic for Mother
 	                        outboundCallsPage = outboundCallsRepo.getAllocatedRecordsUserByRecordTypeAndPhoneTypeMotherMO(