Merge pull request #737 from egovernments/PFM-5655-fix

PFM-5655: Chnaged the logic to check buildingType with propertyType r…
egovernments · Feb 22, 2024 · 18bdefc · 18bdefc
2 parents 0fde276 + 6365201
commit 18bdefc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java
@@ -274,8 +274,9 @@ private List<BillingSlab> getSlabsFiltered(WaterConnection waterConnection, List
 				WaterConnectionRequest.builder().waterConnection(waterConnection).requestInfo(requestInfo).build());
 		// get billing Slab
 		log.debug(" the slabs count : " + billingSlabs.size());
-		final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0]
-				: "";
+		//final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0]: "";
+		//TODO:FIX ME : here before we passing buildingtype as UsageCategory from proerty response . but while creating property usagecategoty is residentialeven when we are creating commercial connection. Hennce we have change this to proertytype
+		final String buildingType = (property.getPropertyType() != null) ? property.getPropertyType().split("\\.")[0]: "";
 		// final String buildingType = "Domestic";
 		final String connectionType = waterConnection.getConnectionType();