Merge pull request #805 from egovernments/enableforApsDiv

Enable penalty for aps division in punjab
egovernments · Jun 4, 2024 · cf4c392 · cf4c392
2 parents 43775bd + 2fcb92b
commit cf4c392
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/utilities/Penalty/src/main/java/org/egov/job/PenaltySchedularJob.java b/utilities/Penalty/src/main/java/org/egov/job/PenaltySchedularJob.java
@@ -69,21 +69,16 @@ public void addPenaltyEventToWaterCalculator(AddPenaltyCriteria penaltyCriteria)
         Role role= Role.builder().code(config.getRole()).tenantId(config.getTenantId()).name(config.getRole()).build();
         List<Role> roles = new ArrayList<>();
         roles.add(role);
-        log.info("role:"+role);
-        log.info("roles:"+roles);
         User user = User.builder().userName(config.getUserName()).
                 mobileNumber(config.getUserName()).
                 uuid(config.getUuid()).
                 roles(roles).
                 tenantId(config.getTenantId()).build();
-        log.info("userInfo:"+user);
-        log.info("penaltyCriteria:"+penaltyCriteria);
         RequestInfo requestInfo= RequestInfo.builder().userInfo(user).build();
         PenaltyRequest penaltyRequest = PenaltyRequest.builder().requestInfo(requestInfo).addPenaltyCriteria(penaltyCriteria).build();
         log.info("Posting request to add Penalty for tenantid:" +penaltyCriteria.getTenantId());
         log.info("Penalty Request"+ penaltyRequest);
         if (penaltyCriteria.getTenantId() != null) {
-            if (penaltyCriteria.getTenantId().equalsIgnoreCase("pb.poohlahjgfid")) {
                 try {
                     HttpHeaders headers = new HttpHeaders();
                     headers.setContentType(MediaType.APPLICATION_JSON);
@@ -96,7 +91,6 @@ public void addPenaltyEventToWaterCalculator(AddPenaltyCriteria penaltyCriteria)
                     log.info("Error while calling to water calculator service for tenant :" + penaltyCriteria.getTenantId() + " ERROR MESSAGE:" + e.getMessage(), e.getCause());
                 }
             }
-        }
     }
 
     /**

diff --git a/utilities/Penalty/src/main/resources/application.properties b/utilities/Penalty/src/main/resources/application.properties
@@ -10,7 +10,7 @@ mdms.event.tenantId=pb
 egov.wscalculator.host=http://localhost:8083
 egov.wscalculator.url=/ws-calculator/waterCalculator/_addPenalty
 egov.penalty.enabled= true
-egov.penalty.enabled.division.code.list=DIV1038,DIV1001
+egov.penalty.enabled.division.code.list=DIV1038
 
 #----------------aspect Configurations----------------#
 timestamp.logging.enabled=true