From d859f1ed8231961eaad405d04c62e44941558899 Mon Sep 17 00:00:00 2001 From: Taniya-eGov <103186387+Taniya-eGov@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:17:24 +0530 Subject: [PATCH 1/3] [ISTE-262] - Saving meter reading after taxperiod validation --- .../java/org/egov/wscalculation/service/MeterServicesImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java index 492a0138c..22916abf2 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java @@ -57,10 +57,10 @@ public List createMeterReading(MeterConnectionRequest meterConnect } enrichmentService.enrichMeterReadingRequest(meterConnectionRequest); meterReadingsList.add(meterConnectionRequest.getMeterReading()); - wSCalculationDao.saveMeterReading(meterConnectionRequest); if (meterConnectionRequest.getMeterReading().getGenerateDemand()) { generateDemandForMeterReading(meterReadingsList, meterConnectionRequest.getRequestInfo()); } + wSCalculationDao.saveMeterReading(meterConnectionRequest); return meterReadingsList; } From cc514b5987acc62f1fddd2ce0285df34bc7ebf61 Mon Sep 17 00:00:00 2001 From: Saloni <103189799+saloni041@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:23:10 +0530 Subject: [PATCH 2/3] Update build-config.yml added boundary service build --- build/build-config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/build-config.yml b/build/build-config.yml index a72f3dce8..707b37779 100644 --- a/build/build-config.yml +++ b/build/build-config.yml @@ -91,6 +91,13 @@ config: - work-dir: "frontend/micro-ui" image-name: "mgramseva-web" dockerfile: "frontend/micro-ui/web/docker/Dockerfile" + - name: "builds/mGramSeva/core-services/boundary-service" + build: + - work-dir: "core-services/boundary-service" + image-name: "boundary-service" + dockerfile: "build/maven/Dockerfile" + - work-dir: "core-services/boundary-service/src/main/resources/db" + image-name: "boundary-service-db" - name: "builds/mGramSeva/core-services/user-otp" build: - work-dir: "core-services/user-otp" From 7fc72bd47d0229e39d3a27427618f223360fee89 Mon Sep 17 00:00:00 2001 From: Taniya-eGov <103186387+Taniya-eGov@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:45:39 +0530 Subject: [PATCH 3/3] updated key for duplicate request for localisation --- .../egov/wscalculation/service/WSCalculationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 243158483..7a4ec939e 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 @@ -406,7 +406,7 @@ public void generateBulkDemandForTenant(BulkDemand bulkDemand) { // Check for duplicate calls in the last configurable duration boolean isDuplicate = demandService.isDuplicateBulkDemandCall(tenantId, billingPeriod, durationAgo); if (isDuplicate) { - throw new CustomException("DUPLICATE_REQUEST", "A bulk demand generation for this tenant and billing Period was already requested in the last "+ duplicateHours +" hours."); + throw new CustomException("DEMAND_DUPLICATE_REQUEST", "A bulk demand generation for this tenant and billing Period was already requested in the last "+ duplicateHours +" hours."); } if(tenantId != null && tenantId.split("\\.").length >1) { demandService.generateBulkDemandForTenantId(bulkDemand);