1) Added API to get count of Beneficiaries to be synced from server to App so that progress bar can be implemented.

src/main/java/com/iemr/common/identity/controller/IdentityController.java

@@ -341,6 +341,32 @@ public class IdentityController {
 		return response;
 	}
 
+	// search beneficiary by lastModDate and districtID
+	@CrossOrigin(origins = { "*commonapi*" })
+	@ApiOperation(value ="Get count of beneficiary by villageId and last modified date-time")
+	@PostMapping(path = "/countBenByVillageIdAndLastModifiedDate")
+	public @ResponseBody String countBeneficiaryByVillageIdAndLastModDate(
+			@ApiParam(value = "\"String\"") @RequestBody String object) {
+		logger.info("IdentityController.getBeneficiaryCount- start. search object = " + object);
+		String response;
+		try {
+
+			JsonElement json = new JsonParser().parse(object);
+
+			SearchSyncDTO search = InputMapper.getInstance().gson().fromJson(json, SearchSyncDTO.class);
+			Long beneficiaryCount = svc.countBeneficiaryByVillageIdAndLastModifyDate(search.getVillageID(), new Timestamp(search.getLastModifiedDate()));
+
+			response = getSuccessResponseString(String.valueOf(beneficiaryCount), 200, "success", "getIdentityCountByVillageAndLastSyncTime");
+
+			logger.info("IdentityController.getBeneficiaryCount - end");
+		} catch (Exception e) {
+			logger.error("error in getting beneficiary count by village Ids and last sync date : " + e.getLocalizedMessage());
+			response = getErrorResponseString("error in getting beneficiary count by village Ids and last sync date  : " + e.getLocalizedMessage(),
+					5000, "failure", "");
+		}
+		return response;
+	}
+
 	@CrossOrigin(origins = { "*commonapi*" })
 	@ApiOperation(value = "Search beneficiary based on government identity number")
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")

src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java

@@ -131,4 +131,9 @@ public List<Object[]> getBenMappingByVanSerialNo(@Param("benMapIds") BigInteger
 			+ "or m.mBeneficiarydetail.lastModDate > :lastModDate ) order by m.benMapId Desc")
 	List<MBeneficiarymapping> findByBeneficiaryDetailsByVillageIDAndLastModifyDate(@Param("villageIDs") List<Integer> villageID, @Param("lastModDate") Timestamp lastModifiedDate);
 
+	@Query(value = "select COUNT(m) from MBeneficiarymapping m where m.mBeneficiaryaddress.permVillageId IN :villageIDs and "
+			+ "(m.mBeneficiaryaddress.lastModDate > :lastModDate or m.mBeneficiarycontact.lastModDate > :lastModDate "
+			+ "or m.mBeneficiarydetail.lastModDate > :lastModDate ) order by m.benMapId Desc")
+	Long getBeneficiaryCountsByVillageIDAndLastModifyDate(@Param("villageIDs") List<Integer> villageID, @Param("lastModDate") Timestamp lastModifiedDate);
+
 }

src/main/java/com/iemr/common/identity/service/IdentityService.java

@@ -526,6 +526,20 @@ public List<BeneficiariesDTO> searchBeneficiaryByVillageIdAndLastModifyDate(List
 		return beneficiaryList;
 	}
 
+	public Long countBeneficiaryByVillageIdAndLastModifyDate(List<Integer> villageIDs, Timestamp lastModifiedDate) {
+
+		Long beneficiaryCount= 0L;
+		try {
+			// find benmap ids
+			beneficiaryCount = mappingRepo.getBeneficiaryCountsByVillageIDAndLastModifyDate(villageIDs, lastModifiedDate);
+
+		} catch (Exception e) {
+			logger.error(
+					"error in getting beneficiary count to sync to CHO App with villageIDs: " + villageIDs + " error : " + e.getLocalizedMessage());
+		}
+		return beneficiaryCount;
+	}
+
 	public List<BeneficiariesDTO> searhBeneficiaryByGovIdentity(String identity)
 			throws NoResultException, QueryTimeoutException, Exception {
 		List<BeneficiariesDTO> beneficiaryList = new ArrayList<BeneficiariesDTO>();