From ea712843c0122b73ddd688067816f94338c91f7c Mon Sep 17 00:00:00 2001 From: Taniya-eGov Date: Thu, 10 Oct 2024 16:14:40 +0530 Subject: [PATCH 1/3] updated auditdetails logic --- .../org/egov/waterconnection/service/EnrichmentService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java index 24a3d3c2c..785e47ede 100644 --- a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java +++ b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java @@ -199,8 +199,13 @@ private List getIdList(RequestInfo requestInfo, String tenantId, String * @param waterConnectionRequest WaterConnectionRequest Object */ public void enrichUpdateWaterConnection(WaterConnectionRequest waterConnectionRequest) { + AuditDetails currentAuditDetails = waterConnectionRequest.getWaterConnection().getAuditDetails(); AuditDetails auditDetails = waterServicesUtil .getAuditDetails(waterConnectionRequest.getRequestInfo().getUserInfo().getUuid(), false); + + auditDetails.setCreatedBy(currentAuditDetails.getCreatedBy()); + auditDetails.setCreatedTime(currentAuditDetails.getCreatedTime()); + waterConnectionRequest.getWaterConnection().setAuditDetails(auditDetails); WaterConnection connection = waterConnectionRequest.getWaterConnection(); if (!CollectionUtils.isEmpty(connection.getDocuments())) { From 6a495cb64f6035bc77eb60feddea95ace47b293d Mon Sep 17 00:00:00 2001 From: Taniya-eGov Date: Fri, 11 Oct 2024 12:00:01 +0530 Subject: [PATCH 2/3] fetch auditdetails from db --- .../egov/waterconnection/service/EnrichmentService.java | 9 +++++---- .../egov/waterconnection/service/WaterServiceImpl.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java index 785e47ede..97b8e119a 100644 --- a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java +++ b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/EnrichmentService.java @@ -198,13 +198,14 @@ private List getIdList(RequestInfo requestInfo, String tenantId, String * * @param waterConnectionRequest WaterConnectionRequest Object */ - public void enrichUpdateWaterConnection(WaterConnectionRequest waterConnectionRequest) { - AuditDetails currentAuditDetails = waterConnectionRequest.getWaterConnection().getAuditDetails(); + public void enrichUpdateWaterConnection(AuditDetails currentAuditDetails,WaterConnectionRequest waterConnectionRequest) { AuditDetails auditDetails = waterServicesUtil .getAuditDetails(waterConnectionRequest.getRequestInfo().getUserInfo().getUuid(), false); - auditDetails.setCreatedBy(currentAuditDetails.getCreatedBy()); - auditDetails.setCreatedTime(currentAuditDetails.getCreatedTime()); + if (currentAuditDetails != null) { + auditDetails.setCreatedBy(currentAuditDetails.getCreatedBy()); + auditDetails.setCreatedTime(currentAuditDetails.getCreatedTime()); + } waterConnectionRequest.getWaterConnection().setAuditDetails(auditDetails); WaterConnection connection = waterConnectionRequest.getWaterConnection(); diff --git a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java index b0d3c72b8..26f6b7617 100644 --- a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java +++ b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java @@ -326,6 +326,7 @@ private List getWaterConnectionForOldConnectionNo(WaterConnecti private List updateWaterConnectionForModifyFlow(WaterConnectionRequest waterConnectionRequest) { waterConnectionValidator.validateWaterConnection(waterConnectionRequest, WCConstants.MODIFY_CONNECTION); List waterConnection = getWaterConnectionForOldConnectionNo(waterConnectionRequest); + AuditDetails auditDetails=waterConnection.get(0).getAuditDetails(); if(waterConnection != null && waterConnection.size() > 0 && !waterConnectionRequest.getWaterConnection().getConnectionNo() .equalsIgnoreCase(waterConnection.get(0).getConnectionNo())) { throw new CustomException("DUPLICATE_OLD_CONNECTION_NUMBER", @@ -342,7 +343,7 @@ private List updateWaterConnectionForModifyFlow(WaterConnection String previousApplicationStatus = workflowService.getApplicationStatus(waterConnectionRequest.getRequestInfo(), waterConnectionRequest.getWaterConnection().getApplicationNo(), waterConnectionRequest.getWaterConnection().getTenantId(), config.getModifyWSBusinessServiceName()); - enrichmentService.enrichUpdateWaterConnection(waterConnectionRequest); + enrichmentService.enrichUpdateWaterConnection(auditDetails, waterConnectionRequest); actionValidator.validateUpdateRequest(waterConnectionRequest, businessService, previousApplicationStatus); userService.updateUser(waterConnectionRequest, searchResult); waterConnectionValidator.validateUpdate(waterConnectionRequest, searchResult, WCConstants.MODIFY_CONNECTION); From 18ddb967fc22e371fc19f07d0f110e05b82563bd Mon Sep 17 00:00:00 2001 From: Taniya-eGov Date: Fri, 11 Oct 2024 12:03:56 +0530 Subject: [PATCH 3/3] updated code --- .../org/egov/waterconnection/service/WaterServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java index 26f6b7617..92e72a754 100644 --- a/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java +++ b/municipal-services/ws-services/src/main/java/org/egov/waterconnection/service/WaterServiceImpl.java @@ -236,6 +236,7 @@ public List updateWaterConnection(WaterConnectionRequest waterC mDMSValidator.validateMISFields(waterConnectionRequest); waterConnectionValidator.validateWaterConnection(waterConnectionRequest, WCConstants.UPDATE_APPLICATION); List waterConnection = getWaterConnectionForOldConnectionNo(waterConnectionRequest); + AuditDetails auditDetails=waterConnection.get(0).getAuditDetails(); if(waterConnection != null && waterConnection.size() > 0) { throw new CustomException("DUPLICATE_OLD_CONNECTION_NUMBER", "Duplicate Old connection number"); @@ -252,7 +253,7 @@ public List updateWaterConnection(WaterConnectionRequest waterC String previousApplicationStatus = workflowService.getApplicationStatus(waterConnectionRequest.getRequestInfo(), waterConnectionRequest.getWaterConnection().getApplicationNo(), waterConnectionRequest.getWaterConnection().getTenantId(), config.getBusinessServiceValue()); - enrichmentService.enrichUpdateWaterConnection(waterConnectionRequest); + enrichmentService.enrichUpdateWaterConnection(auditDetails, waterConnectionRequest); actionValidator.validateUpdateRequest(waterConnectionRequest, businessService, previousApplicationStatus); waterConnectionValidator.validateUpdate(waterConnectionRequest, searchResult, WCConstants.UPDATE_APPLICATION); userService.updateUser(waterConnectionRequest, searchResult);