From f87fb1371e9314670e511363d2a703abe0985b55 Mon Sep 17 00:00:00 2001
From: debasishchakraborty-egovt <debasish@egovernmets.org>
Date: Fri, 24 May 2024 12:03:22 +0530
Subject: [PATCH] ISTE-44: Added demand change audit db script from
 ws-calculator service

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

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 efa25b9fc..75de96d6a 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
@@ -284,7 +284,6 @@ private List<Demand> createDemand(RequestInfo requestInfo, List<Calculation> cal
 							createdby(requestInfo.getUserInfo().getUuid()).
 							createdtime(System.currentTimeMillis()).build();
 					WsDemandChangeAuditRequestWrapper wsDemandChangeAuditRequestWrapper = WsDemandChangeAuditRequestWrapper.builder().wsDemandChangeAuditRequest(wsDemandChangeAuditRequest).build();
-					log.info("WsDemandChangeAuditRequestWrapper:"+wsDemandChangeAuditRequestWrapper);
 					producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequestWrapper);
 				});
 			}
@@ -901,7 +900,8 @@ public List<Demand> updateDemands(GetBillCriteria getBillCriteria, RequestInfoWr
 									data(demand).
 									createdby(demand.getAuditDetails().getCreatedBy()).
 									createdtime(demand.getAuditDetails().getLastModifiedTime()).build();
-							producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequest);
+							WsDemandChangeAuditRequestWrapper wsDemandChangeAuditRequestWrapper = WsDemandChangeAuditRequestWrapper.builder().wsDemandChangeAuditRequest(wsDemandChangeAuditRequest).build();
+							producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequestWrapper);
 						});
 					}
 					DemandRequest request = DemandRequest.builder().demands(demandsToBeUpdated).requestInfo(requestInfo).build();
@@ -975,7 +975,8 @@ private List<Demand> updateDemandForCalculation(RequestInfo requestInfo, List<Ca
 							data(dem).
 							createdby(dem.getAuditDetails().getCreatedBy()).
 							createdtime(dem.getAuditDetails().getLastModifiedTime()).build();
-					producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequest);
+					WsDemandChangeAuditRequestWrapper wsDemandChangeAuditRequestWrapper = WsDemandChangeAuditRequestWrapper.builder().wsDemandChangeAuditRequest(wsDemandChangeAuditRequest).build();
+					producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequestWrapper);
 				});
 			}
 			demandRes = demandRepository.updateDemand(requestInfo, demands);
@@ -1418,7 +1419,8 @@ public int compare(Demand d1, Demand d2) {
 						data(demand).
 						createdby(demand.getAuditDetails().getCreatedBy()).
 						createdtime(demand.getAuditDetails().getLastModifiedTime()).build();
-				producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequest);
+				WsDemandChangeAuditRequestWrapper wsDemandChangeAuditRequestWrapper = WsDemandChangeAuditRequestWrapper.builder().wsDemandChangeAuditRequest(wsDemandChangeAuditRequest).build();
+				producer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequestWrapper);
 			});
 		}
 		demandRepository.updateDemand(requestInfo, demands);
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 8aa75f741..17572ec9c 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
@@ -129,7 +129,8 @@ public List<Calculation> getCalculation(CalculationReq request) {
 							data(demand).
 							createdby(demand.getAuditDetails().getCreatedBy()).
 							createdtime(demand.getAuditDetails().getLastModifiedTime()).build();
-					wsCalculationProducer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequest);
+					WsDemandChangeAuditRequestWrapper wsDemandChangeAuditRequestWrapper = WsDemandChangeAuditRequestWrapper.builder().wsDemandChangeAuditRequest(wsDemandChangeAuditRequest).build();
+					wsCalculationProducer.push(config.getSaveDemandAudit(), wsDemandChangeAuditRequestWrapper);
 				});
 			}
 			demandRepository.updateDemand(request.getRequestInfo(), searchResult);