From 0d997a6f61e671eee65d54784ec3da1f1bfda0f1 Mon Sep 17 00:00:00 2001
From: debasishchakraborty-egovt <debasish@egovernmets.org>
Date: Tue, 11 Jun 2024 18:13:34 +0530
Subject: [PATCH] ISTE-44-pending issue: added chnages asked by anniket for
 bill genration fix

---
 .../wscalculation/consumer/DemandGenerationConsumer.java  | 5 ++---
 .../org/egov/wscalculation/service/DemandService.java     | 8 ++++----
 .../wscalculation/service/WSCalculationServiceImpl.java   | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
index 94995c078..78a7d4f26 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java
@@ -187,11 +187,11 @@ public void listenDeadLetterTopic(final List<Message<?>> records) {
 	 */
 	private void generateDemandInBatch(CalculationReq request, Map<String, Object> masterMap, String errorTopic,
 			boolean isSendMessage) throws Exception {
-		for (CalculationCriteria criteria : request.getCalculationCriteria()) {
+		/*for (CalculationCriteria criteria : request.getCalculationCriteria()) {
 			Boolean genratedemand = true;
 			wsCalulationWorkflowValidator.applicationValidation(request.getRequestInfo(), criteria.getTenantId(),
 					criteria.getConnectionNo(), genratedemand);
-		}
+		}*/
 		System.out.println("Calling Bulk Demand generation connection Number" + request.getCalculationCriteria().get(0).getConnectionNo());
 		wSCalculationServiceImpl.bulkDemandGeneration(request, masterMap);
 		/*String connectionNoStrings = request.getCalculationCriteria().stream()
@@ -517,7 +517,6 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t
 
 	public void generateDemandInBulk(CalculationReq calculationReq, String billingCycle, Map<String, Object> masterMap,
 									 boolean isSendMessage,String tenantId) {
-		log.info("masterMap:"+masterMap);
 		try {
 			if(!tenantId.equals(config.getSmsExcludeTenant())) {
 				generateDemandInBatch(calculationReq, masterMap, billingCycle, isSendMessage);
diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java
index 11104a17f..c768cc8c2 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandService.java
@@ -937,12 +937,12 @@ private List<Demand> updateDemandForCalculation(RequestInfo requestInfo, List<Ca
 			String businessService = configs.getBusinessService();
 			WaterConnectionRequest waterConnectionRequest = WaterConnectionRequest.builder()
 					.waterConnection(calculation.getWaterConnection()).requestInfo(requestInfo).build();
-			Property property = wsCalculationUtil.getProperty(waterConnectionRequest);
+			/*Property property = wsCalculationUtil.getProperty(waterConnectionRequest);
 			String tenantId = calculation.getTenantId();
 			User owner = property.getOwners().get(0).toCommonUser();
 			if (!CollectionUtils.isEmpty(waterConnectionRequest.getWaterConnection().getConnectionHolders())) {
 				owner = waterConnectionRequest.getWaterConnection().getConnectionHolders().get(0).toCommonUser();
-			}
+			}*/
 
 			List<DemandDetail> demandDetails = new LinkedList<>();
 			calculation.getTaxHeadEstimates().forEach(taxHeadEstimate -> {
@@ -1028,7 +1028,7 @@ private List<Demand> updateDemandForCalculation(RequestInfo requestInfo, List<Ca
 			}*/
 			 
 
-			if (isForConnectionNo) {
+			/*if (isForConnectionNo) {
 				WaterConnection connection = calculation.getWaterConnection();
 				if (connection == null) {
 					List<WaterConnection> waterConnectionList = calculatorUtils.getWaterConnection(requestInfo,
@@ -1050,7 +1050,7 @@ private List<Demand> updateDemandForCalculation(RequestInfo requestInfo, List<Ca
 //						demand.setPayer(owner);
 //				}
 
-			}
+			}*/
 
 		}
 
diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/WSCalculationServiceImpl.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/WSCalculationServiceImpl.java
index e31c6dd2d..e6d7c5b91 100644
--- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/WSCalculationServiceImpl.java
+++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/WSCalculationServiceImpl.java
@@ -196,10 +196,10 @@ public Calculation getCalculation(RequestInfo requestInfo, CalculationCriteria c
 		@SuppressWarnings("unchecked")
 		List<String> billingSlabIds = estimatesAndBillingSlabs.get("billingSlabIds");
 		WaterConnection waterConnection = criteria.getWaterConnection();
-		Property property = wSCalculationUtil.getProperty(
-				WaterConnectionRequest.builder().waterConnection(waterConnection).requestInfo(requestInfo).build());
+		/*Property property = wSCalculationUtil.getProperty(
+				WaterConnectionRequest.builder().waterConnection(waterConnection).requestInfo(requestInfo).build());*/
 		
-		String tenantId = null != property.getTenantId() ? property.getTenantId() : criteria.getTenantId();
+		String tenantId = criteria.getTenantId();
 
 
 		/*Map<String, TaxHeadCategory> taxHeadCategoryMap = ((List<TaxHeadMaster>) masterMap