Merge branch 'master' into develop

egovernments · Sep 11, 2024 · 2a6dae2 · 2a6dae2
2 parents 25c91ea + abab04e
commit 2a6dae2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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"

diff --git a/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java b/...ervices/ws-calculator/src/main/java/org/egov/wscalculation/service/MeterServicesImpl.java
@@ -57,7 +57,6 @@ public List<MeterReading> createMeterReading(MeterConnectionRequest meterConnect
 		}
 		enrichmentService.enrichMeterReadingRequest(meterConnectionRequest);
 		meterReadingsList.add(meterConnectionRequest.getMeterReading());
-
 		if (meterConnectionRequest.getMeterReading().getGenerateDemand()) {
 			generateDemandForMeterReading(meterReadingsList, meterConnectionRequest.getRequestInfo());
 		}

diff --git a/.../ws-calculator/src/main/java/org/egov/wscalculation/service/WSCalculationServiceImpl.java b/.../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);

diff --git a/utilities/rollout-dashboard-cronjob/app.py b/utilities/rollout-dashboard-cronjob/app.py
@@ -812,8 +812,7 @@ def is_saturdaydayOrSunday():
     print("DateTime today :",datetime.today().weekday())
     return datetime.today().weekday() in [5, 6]
 def get_daterange():
-    if is_saturdaydayOrSunday():
-        return [
+    return [
             'Last seven days', 'Last 15 days', 'currentMonth-Till date', 'Previous Month',
             'Quarter-1', 'Quarter-2', 'Quarter-3', 'Quarter-4', 
             'Consolidated (As on date)', 'FY to date',