getEligibleRecordsLanguageInfo API logic changed Extra parameter added

i.e role to filter count

Author: ravishanigarapu

src/main/java/com/iemr/ecd/controller/callallocation/CallAllocationController.java

@@ -153,9 +153,9 @@ public ResponseEntity<String> insertRecordsInOutboundCalls(@RequestBody Outbound
 			@ApiResponse(responseCode = CustomExceptionResponse.BAD_REQUEST_SC_V, description = CustomExceptionResponse.BAD_REQUEST_SC) })
 	public ResponseEntity<ResponseEligibleCallRecordsDTO> getEligibleRecordsLanguageInfo(@PathVariable int psmId,
 			@PathVariable String phoneNoType, @PathVariable String recordType, @PathVariable String fDate,
-			@PathVariable String tDate, @PathVariable String preferredLanguage) throws ECDException {
+			@PathVariable String tDate, @PathVariable String preferredLanguage,@PathVariable String role) throws ECDException {
 		return new ResponseEntity<>(
-				callAllocationImpl.getEligibleRecordsLanguageInfo(psmId, phoneNoType, recordType, fDate, tDate, preferredLanguage), HttpStatus.OK);
+				callAllocationImpl.getEligibleRecordsLanguageInfo(psmId, phoneNoType, recordType, fDate, tDate, preferredLanguage,role), HttpStatus.OK);
 
 	}
 

src/main/java/com/iemr/ecd/repo/call_conf_allocation/OutboundCallsRepo.java

@@ -349,18 +349,38 @@ List<OutboundCalls> getIntroductoryRecordsUser(@Param("psmId") Integer psmId,
 	@Query(value = " SELECT COUNT(1) FROM OutboundCalls AS t INNER JOIN MotherRecord AS mv ON t.motherId = mv.ecdIdNo WHERE t.allocationStatus =:allocationStatus AND "
 			+ " t.psmId=:psmId 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 (t.isHighRisk = false OR t.isHighRisk IS NULL ) "
-			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND mv.preferredLanguage = :preferredLanguage AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL ) ")
+			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND mv.preferredLanguage = :preferredLanguage AND"
+			+ " t.displayEcdCallType != 'introductory' AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL ) ")
 	int getMotherUnAllocatedCountLRByLanguage(@Param("allocationStatus") String allocationStatus, @Param("psmId") Integer psmId,
 			@Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate, @Param("phoneNoType") String phoneNoType, @Param("preferredLanguage") String preferredLanguage);
 
+	@Query(value = " SELECT COUNT(1) FROM OutboundCalls AS t INNER JOIN MotherRecord AS mv ON t.motherId = mv.ecdIdNo WHERE t.allocationStatus =:allocationStatus AND "
+			+ " t.psmId=:psmId 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 (t.isHighRisk = false OR t.isHighRisk IS NULL ) "
+			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND mv.preferredLanguage = :preferredLanguage AND"
+			+ " t.displayEcdCallType = 'introductory' AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL ) ")
+	int getMotherUnAllocatedCountIntroductoryByLanguage(@Param("allocationStatus") String allocationStatus, @Param("psmId") Integer psmId,
+			@Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate, @Param("phoneNoType") String phoneNoType, @Param("preferredLanguage") String preferredLanguage);
+
 	// un-allocated, child low risk,
 	@Query(value = " SELECT COUNT(1) FROM OutboundCalls AS t INNER JOIN ChildRecord AS cv ON t.childId = cv.ecdIdNoChildId WHERE t.allocationStatus =:allocationStatus AND "
 			+ " t.psmId=:psmId AND ((:fDate between t.callDateFrom AND t.callDateTo) OR (:tDate between t.callDateFrom AND t.callDateTo)) AND "
 			+ " t.childId IS NOT NULL AND (t.isHrni = false OR t.isHrni IS NULL )  "
-			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND cv.preferredLanguage = :preferredLanguage AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL )")
+			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND cv.preferredLanguage = :preferredLanguage AND"
+			+ " t.displayEcdCallType != 'introductory' AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL )")
 	int getChildUnAllocatedCountLRByLanguage(@Param("allocationStatus") String allocationStatus, @Param("psmId") Integer psmId,
 			@Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate, @Param("phoneNoType") String phoneNoType, @Param("preferredLanguage") String preferredLanguage);
 
+	
+	@Query(value = " SELECT COUNT(1) FROM OutboundCalls AS t INNER JOIN ChildRecord AS cv ON t.childId = cv.ecdIdNoChildId WHERE t.allocationStatus =:allocationStatus AND "
+			+ " t.psmId=:psmId AND ((:fDate between t.callDateFrom AND t.callDateTo) OR (:tDate between t.callDateFrom AND t.callDateTo)) AND "
+			+ " t.childId IS NOT NULL AND (t.isHrni = false OR t.isHrni IS NULL )  "
+			+ " AND t.phoneNumberType=:phoneNoType AND t.deleted = false AND cv.preferredLanguage = :preferredLanguage AND"
+			+ " t.displayEcdCallType = 'introductory' AND (t.isFurtherCallRequired = true OR t.isFurtherCallRequired IS NULL )")
+	int getChildUnAllocatedCountIntroductoryByLanguage(@Param("allocationStatus") String allocationStatus, @Param("psmId") Integer psmId,
+			@Param("fDate") Timestamp fDate, @Param("tDate") Timestamp tDate, @Param("phoneNoType") String phoneNoType, @Param("preferredLanguage") String preferredLanguage);
+
+	
 	@Modifying
 	@Transactional
 	@Query(" UPDATE OutboundCalls SET isFurtherCallRequired = :isFurtherCallRequired WHERE childId = :childId AND motherId IS NOT NULL AND callDateTo>current_date()")

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

@@ -1054,34 +1054,54 @@ public String insertRecordsInOutboundCalls(OutboundCallsDTO outboundCallsDTO) {
 		}
 	}
 
-	public ResponseEligibleCallRecordsDTO getEligibleRecordsLanguageInfo(int psmId, String phoneNoType, String recordType, String fDate,
-			String tDate, String preferredLanguage) {
+	public ResponseEligibleCallRecordsDTO getEligibleRecordsLanguageInfo(int psmId, String phoneNoType,
+			String recordType, String fDate, String tDate, String preferredLanguage, String role) {
 		try {
 			if (preferredLanguage == null || preferredLanguage.trim().isEmpty()) {
 				throw new InvalidRequestException("preferred language is required");
 			}
 			Timestamp tempFDateStamp = null;
 			Timestamp tempTDateStamp = null;
 			if (fDate != null && tDate != null) {
-				tempFDateStamp = getTimestampFromString(fDate.split(Constants.T)[0].concat(Constants.TIME_FORMAT_START_TIME));
-				tempTDateStamp = getTimestampFromString(tDate.split(Constants.T)[0].concat(Constants.TIME_FORMAT_END_TIME));
+				tempFDateStamp = getTimestampFromString(
+						fDate.split(Constants.T)[0].concat(Constants.TIME_FORMAT_START_TIME));
+				tempTDateStamp = getTimestampFromString(
+						tDate.split(Constants.T)[0].concat(Constants.TIME_FORMAT_END_TIME));
 			} else
 				throw new InvalidRequestException(Constants.FROM_DATE_TO_DATE_IS_NULL);
 
 			ResponseEligibleCallRecordsDTO responseEligibleCallRecordsDTO = new ResponseEligibleCallRecordsDTO();
 			int totalLowRisk = 0;
-			if (recordType != null && recordType.equalsIgnoreCase(Constants.MOTHER)) {
-				totalLowRisk = outboundCallsRepo.getMotherUnAllocatedCountLRByLanguage(Constants.UNALLOCATED, psmId, tempFDateStamp,
-						tempTDateStamp, phoneNoType, preferredLanguage);
-			} else if (recordType != null && recordType.equalsIgnoreCase(Constants.CHILD)) {
-				totalLowRisk = outboundCallsRepo.getChildUnAllocatedCountLRByLanguage(Constants.UNALLOCATED, psmId, tempFDateStamp,
-						tempTDateStamp, phoneNoType, preferredLanguage);
+			int totalIntroductoryCount = 0;
+			if (recordType != null && recordType.equalsIgnoreCase(Constants.MOTHER)
+					&& role.equalsIgnoreCase(Constants.ANM)) {
+				totalLowRisk = outboundCallsRepo.getMotherUnAllocatedCountLRByLanguage(Constants.UNALLOCATED, psmId,
+						tempFDateStamp, tempTDateStamp, phoneNoType, preferredLanguage);
+				responseEligibleCallRecordsDTO.setTotalLowRiskRecord(totalLowRisk);
+				return responseEligibleCallRecordsDTO;
+			} else if (recordType != null && recordType.equalsIgnoreCase(Constants.CHILD)
+					&& role.equalsIgnoreCase(Constants.ANM)) {
+				totalLowRisk = outboundCallsRepo.getChildUnAllocatedCountLRByLanguage(Constants.UNALLOCATED, psmId,
+						tempFDateStamp, tempTDateStamp, phoneNoType, preferredLanguage);
+				responseEligibleCallRecordsDTO.setTotalLowRiskRecord(totalLowRisk);
+				return responseEligibleCallRecordsDTO;
+			} else if (recordType != null && recordType.equalsIgnoreCase(Constants.MOTHER)
+					&& role.equalsIgnoreCase(Constants.ASSOCIATE)) {
+				totalIntroductoryCount = outboundCallsRepo.getMotherUnAllocatedCountIntroductoryByLanguage(
+						Constants.UNALLOCATED, psmId, tempFDateStamp, tempTDateStamp, phoneNoType, preferredLanguage);
+				responseEligibleCallRecordsDTO.setTotalIntroductoryRecord(totalIntroductoryCount);
+				return responseEligibleCallRecordsDTO;
+			} else if (recordType != null && recordType.equalsIgnoreCase(Constants.CHILD)
+					&& role.equalsIgnoreCase(Constants.ASSOCIATE)) {
+				totalIntroductoryCount = outboundCallsRepo.getChildUnAllocatedCountIntroductoryByLanguage(
+						Constants.UNALLOCATED, psmId, tempFDateStamp, tempTDateStamp, phoneNoType, preferredLanguage);
+				responseEligibleCallRecordsDTO.setTotalIntroductoryRecord(totalIntroductoryCount);
+				return responseEligibleCallRecordsDTO;
 			}
-			responseEligibleCallRecordsDTO.setTotalLowRiskRecord(totalLowRisk);
-			return responseEligibleCallRecordsDTO;
+
 		} catch (Exception e) {
 			throw new ECDException(e);
 		}
-
+		return null;
 	}
 }