From 9fccab3a9ee9ae115c7ddcc4d1be97e0f7fb0707 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 29 Jan 2024 18:31:59 +0530 Subject: [PATCH 01/49] PFM-4855 --- .../egov/wscalculation/service/DemandNotificationService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java index 8c5b3dd5d..f4842125c 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java @@ -5,6 +5,7 @@ import java.util.LinkedList; import java.util.List; +import lombok.extern.slf4j.Slf4j; import org.egov.tracer.model.CustomException; import org.egov.wscalculation.config.WSCalculationConfiguration; import org.egov.wscalculation.util.NotificationUtil; @@ -22,6 +23,7 @@ import net.minidev.json.JSONArray; @Service +@Slf4j public class DemandNotificationService { @Autowired @@ -42,6 +44,7 @@ public void process(DemandNotificationObj notificationObj, String topic) { enrichSMSRequest(notificationObj, smsRequests, topic); if (!CollectionUtils.isEmpty(smsRequests)) { if(config.isSmsForDemandEnable()) { + log.info("Bulk demand generate call"); util.sendSMS(smsRequests); } } From fe8e3eb7d6cf508fa3444bb7259118076dfc3106 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 30 Jan 2024 13:41:13 +0530 Subject: [PATCH 02/49] PFM-4855 --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 0aba61a11..6ab0f419e 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -486,7 +486,7 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { - producer.push(config.getSmsNotifTopic(), smsRequest); +// producer.push(config.getSmsNotifTopic(), smsRequest); } } From 661bdd1e146566069accff1f9ac6a33ba97c49d0 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 31 Jan 2024 16:32:36 +0530 Subject: [PATCH 03/49] PFM-4855 --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 6ab0f419e..0aba61a11 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -486,7 +486,7 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { -// producer.push(config.getSmsNotifTopic(), smsRequest); + producer.push(config.getSmsNotifTopic(), smsRequest); } } From 0abfa5fc3573eff0766e08016d988513abd6e7dc Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Thu, 1 Feb 2024 12:38:34 +0530 Subject: [PATCH 04/49] PFM-4855 --- .../egov/wscalculation/service/DemandNotificationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java index f4842125c..f947b89b4 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java @@ -45,7 +45,7 @@ public void process(DemandNotificationObj notificationObj, String topic) { if (!CollectionUtils.isEmpty(smsRequests)) { if(config.isSmsForDemandEnable()) { log.info("Bulk demand generate call"); - util.sendSMS(smsRequests); +// util.sendSMS(smsRequests); } } } From bf2a595cd9952918d349c79ffef640a1e71ffc87 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 5 Feb 2024 12:44:32 +0530 Subject: [PATCH 05/49] PFM-4855 added loggers --- .../web/notification/sms/consumer/SmsNotificationListener.java | 2 ++ .../org/egov/web/notification/sms/service/BaseSMSService.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java index 2a1bbba68..53744c66e 100644 --- a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java +++ b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java @@ -76,9 +76,11 @@ public void process(HashMap consumerRecord) { if (!StringUtils.isEmpty(expiredSmsTopic)) kafkaTemplate.send(expiredSmsTopic, request); } else { + log.info("Call from inside if condition"); smsService.sendSMS(request.toDomain()); } } else { + log.info("Call outside"); smsService.sendSMS(request.toDomain()); } } diff --git a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java index 6a5d68310..6fe1769b5 100644 --- a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java +++ b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java @@ -79,7 +79,7 @@ public void sendSMS(Sms sms) { } if (!smsProperties.isNumberWhitelisted(sms.getMobileNumber())) { - log.error(String.format("Sms to %s is not in whitelist", sms.getMobileNumber())); + log.error(String.format("Sms to %s ismobileNumber=7009141334, message=ਪਿਆਰੇ Tarjinder Singh, Dabour Lower ਲਈ ਬਿਲਿੰਗ ਸਾਈਕਲ 01/06/2022-30/06/2022 ਅਨੁਸਾਰ ਭੁਗਤਾਨ ਯੋਗ ਰਕਮ ਐਮ ਗ੍ਰਾਮ ਸੇਵਾ ਵਿੱਚ ਦਰਜ਼ ਹੋ ਚੁੱਕੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਅਦਾਇਗੀ ਯੋਗ ਰਕਮ ਨੂੰ ਇੱਕਤਰ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਸ਼ੁਰੂ ਕਰੋ। https://mgramseva-uat.psegs.in/mgramseva/home -DWSS#1007268996965726804, category=TRANSACTION, expiryTime=null, templateId=null, tenantId=pb.dabourlower not in whitelist", sms.getMobileNumber())); return; } log.info("calling submitToExternalSmsService() method"); @@ -89,6 +89,7 @@ public void sendSMS(Sms sms) { mobileNumber = mobileNumber.substring(0, 2) + mobileNumber.substring(6); SmsSaveRequest smsSaveRequest = SmsSaveRequest.builder().id(id).mobileNumber(mobileNumber).message(sms.getMessage()) .category(sms.getCategory()).templateId(sms.getTemplateId()).tenantId(sms.getTenantId()).createdtime(System.currentTimeMillis()).build(); + log.info(mobileNumber); producer.push(smsProperties.getSaveSmsTopic(), smsSaveRequest); } submitToExternalSmsService(sms); From 0c0c245134f906130f75fcee4593eb532dc27d7c Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 5 Feb 2024 12:46:11 +0530 Subject: [PATCH 06/49] PFM-4855 added loggers --- .../org/egov/web/notification/sms/service/BaseSMSService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java index 6fe1769b5..af4e33904 100644 --- a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java +++ b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java @@ -79,7 +79,7 @@ public void sendSMS(Sms sms) { } if (!smsProperties.isNumberWhitelisted(sms.getMobileNumber())) { - log.error(String.format("Sms to %s ismobileNumber=7009141334, message=ਪਿਆਰੇ Tarjinder Singh, Dabour Lower ਲਈ ਬਿਲਿੰਗ ਸਾਈਕਲ 01/06/2022-30/06/2022 ਅਨੁਸਾਰ ਭੁਗਤਾਨ ਯੋਗ ਰਕਮ ਐਮ ਗ੍ਰਾਮ ਸੇਵਾ ਵਿੱਚ ਦਰਜ਼ ਹੋ ਚੁੱਕੀ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਅਦਾਇਗੀ ਯੋਗ ਰਕਮ ਨੂੰ ਇੱਕਤਰ ਕਰਨ ਦੀ ਪ੍ਰਕਿਰਿਆ ਸ਼ੁਰੂ ਕਰੋ। https://mgramseva-uat.psegs.in/mgramseva/home -DWSS#1007268996965726804, category=TRANSACTION, expiryTime=null, templateId=null, tenantId=pb.dabourlower not in whitelist", sms.getMobileNumber())); + log.error(String.format("Sms to %s is not in whitelist", sms.getMobileNumber())); return; } log.info("calling submitToExternalSmsService() method"); From 19b633882d41eae0da96e215168dc78cfd410ea1 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 5 Feb 2024 17:35:24 +0530 Subject: [PATCH 07/49] PFM-4855 --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 0aba61a11..6ab0f419e 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -486,7 +486,7 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { - producer.push(config.getSmsNotifTopic(), smsRequest); +// producer.push(config.getSmsNotifTopic(), smsRequest); } } From a62d3822b97aac325cf6a01eeec9ce70b7c6e05f Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 00:03:49 +0530 Subject: [PATCH 08/49] PFM-4855 --- .../wscalculation/consumer/DemandGenerationConsumer.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 6ab0f419e..2e7003f55 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -62,6 +62,7 @@ @Component public class DemandGenerationConsumer { + private int sms=0; @Autowired private ObjectMapper mapper; @@ -486,12 +487,14 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { -// producer.push(config.getSmsNotifTopic(), smsRequest); + sms++; + producer.push(config.getSmsNotifTopic(), smsRequest); } } }); } + log.info("Total count of sms->"+sms); } /** From b035dfc6cbeb1d587212b8e1d6fb60ca924b4f6b Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 11:49:06 +0530 Subject: [PATCH 09/49] PFM-4855 --- .../wscalculation/consumer/DemandGenerationConsumer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 2e7003f55..3ad1b8773 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -487,14 +487,14 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { - sms++; - producer.push(config.getSmsNotifTopic(), smsRequest); +// sms++; +// producer.push(config.getSmsNotifTopic(), smsRequest); } } }); } - log.info("Total count of sms->"+sms); +// log.info("Total count of sms->"+sms); } /** From f7481ab781b2d3c1087fc3aa83222298c6b7ad7a Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 13:38:00 +0530 Subject: [PATCH 10/49] PFM-4855 uncommented producer.push --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 3ad1b8773..644c8cae5 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -488,7 +488,7 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { // sms++; -// producer.push(config.getSmsNotifTopic(), smsRequest); + producer.push(config.getSmsNotifTopic(), smsRequest); } } From 96d10b0de348ed5224f70f99a3828ff9b3f3b35c Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 14:15:32 +0530 Subject: [PATCH 11/49] PFM-4855 added max-poll in application.properties --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 +- .../ws-calculator/src/main/resources/application.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 644c8cae5..1fe9a0bbb 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -62,7 +62,7 @@ @Component public class DemandGenerationConsumer { - private int sms=0; +// private int sms=0; @Autowired private ObjectMapper mapper; diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index c1860ade8..516f4e7f0 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,6 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer +spring.kafka.consumer.max-poll-interval-ms=60000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From d26e47fe1043023ab81cb45fc9873ee126e6c022 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 16:25:56 +0530 Subject: [PATCH 12/49] PFM-4855 --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index 516f4e7f0..6ad42ad6b 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,7 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer -spring.kafka.consumer.max-poll-interval-ms=60000 +spring.kafka.consumer.max-poll-interval-ms=200000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From 47365d2a5c28d51bcb05437f8bd8d4e516ccd512 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 17:35:21 +0530 Subject: [PATCH 13/49] PFM-4855 --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index 6ad42ad6b..49ccf8edc 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,7 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer -spring.kafka.consumer.max-poll-interval-ms=200000 +spring.kafka.consumer.max-poll-interval-ms=500000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From b505ad3e563b33ec5efe010aa4515e1876115041 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 6 Feb 2024 17:58:59 +0530 Subject: [PATCH 14/49] PFM-4855 --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index 49ccf8edc..f3ad39540 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,7 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer -spring.kafka.consumer.max-poll-interval-ms=500000 +spring.kafka.consumer.max-poll-interval-ms=1200000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From c3f4eb4cc4e31ebf523e08f70872481ab8c949ef Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 7 Feb 2024 11:36:20 +0530 Subject: [PATCH 15/49] PFM-4855 --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index f3ad39540..289e6ec13 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,7 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer -spring.kafka.consumer.max-poll-interval-ms=1200000 +spring.kafka.consumer.properties.max.poll.interval.ms=1200000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From 5f827102db74d31552e389ec7ec6a93bb8eb3270 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 7 Feb 2024 12:48:56 +0530 Subject: [PATCH 16/49] PFM-4855 --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 2 -- .../egov/wscalculation/service/DemandNotificationService.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index 1fe9a0bbb..c7229171d 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -487,14 +487,12 @@ private void generateDemandAndSendnotification(RequestInfo requestInfo, String t .tenantid(tenantId) .category(Category.TRANSACTION).build(); if(config.isSmsForDemandEnable()) { -// sms++; producer.push(config.getSmsNotifTopic(), smsRequest); } } }); } -// log.info("Total count of sms->"+sms); } /** diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java index f947b89b4..ba87cecdc 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java @@ -23,7 +23,6 @@ import net.minidev.json.JSONArray; @Service -@Slf4j public class DemandNotificationService { @Autowired @@ -44,7 +43,6 @@ public void process(DemandNotificationObj notificationObj, String topic) { enrichSMSRequest(notificationObj, smsRequests, topic); if (!CollectionUtils.isEmpty(smsRequests)) { if(config.isSmsForDemandEnable()) { - log.info("Bulk demand generate call"); // util.sendSMS(smsRequests); } } From 2fdd4cc30ea39fec504d523e93cce94e9de0f5da Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 7 Feb 2024 12:49:43 +0530 Subject: [PATCH 17/49] PFM-4855 --- .../egov/wscalculation/consumer/DemandGenerationConsumer.java | 1 - .../egov/wscalculation/service/DemandNotificationService.java | 1 - 2 files changed, 2 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java index c7229171d..0aba61a11 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/consumer/DemandGenerationConsumer.java @@ -62,7 +62,6 @@ @Component public class DemandGenerationConsumer { -// private int sms=0; @Autowired private ObjectMapper mapper; diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java index ba87cecdc..055f81da9 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java @@ -5,7 +5,6 @@ import java.util.LinkedList; import java.util.List; -import lombok.extern.slf4j.Slf4j; import org.egov.tracer.model.CustomException; import org.egov.wscalculation.config.WSCalculationConfiguration; import org.egov.wscalculation.util.NotificationUtil; From 34895a1c9e834e8f56eba6c28f6b9bf5cd48d04e Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 7 Feb 2024 12:50:13 +0530 Subject: [PATCH 18/49] PFM-4855 --- .../egov/wscalculation/service/DemandNotificationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java index 055f81da9..8c5b3dd5d 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/DemandNotificationService.java @@ -42,7 +42,7 @@ public void process(DemandNotificationObj notificationObj, String topic) { enrichSMSRequest(notificationObj, smsRequests, topic); if (!CollectionUtils.isEmpty(smsRequests)) { if(config.isSmsForDemandEnable()) { -// util.sendSMS(smsRequests); + util.sendSMS(smsRequests); } } } From e559f5c1d428e28c415b99a8b5073e4b9bff7f0d Mon Sep 17 00:00:00 2001 From: Saloni <103189799+saloni041@users.noreply.github.com> Date: Wed, 7 Feb 2024 12:58:50 +0530 Subject: [PATCH 19/49] PFM-4855 --- .../web/notification/sms/consumer/SmsNotificationListener.java | 2 -- .../org/egov/web/notification/sms/service/BaseSMSService.java | 1 - 2 files changed, 3 deletions(-) diff --git a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java index 53744c66e..2a1bbba68 100644 --- a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java +++ b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/consumer/SmsNotificationListener.java @@ -76,11 +76,9 @@ public void process(HashMap consumerRecord) { if (!StringUtils.isEmpty(expiredSmsTopic)) kafkaTemplate.send(expiredSmsTopic, request); } else { - log.info("Call from inside if condition"); smsService.sendSMS(request.toDomain()); } } else { - log.info("Call outside"); smsService.sendSMS(request.toDomain()); } } diff --git a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java index af4e33904..6a5d68310 100644 --- a/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java +++ b/core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java @@ -89,7 +89,6 @@ public void sendSMS(Sms sms) { mobileNumber = mobileNumber.substring(0, 2) + mobileNumber.substring(6); SmsSaveRequest smsSaveRequest = SmsSaveRequest.builder().id(id).mobileNumber(mobileNumber).message(sms.getMessage()) .category(sms.getCategory()).templateId(sms.getTemplateId()).tenantId(sms.getTenantId()).createdtime(System.currentTimeMillis()).build(); - log.info(mobileNumber); producer.push(smsProperties.getSaveSmsTopic(), smsSaveRequest); } submitToExternalSmsService(sms); From c7251909e7be21a3571caa266eb17f4d37b8a2d1 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Thu, 8 Feb 2024 11:55:51 +0530 Subject: [PATCH 20/49] PFM-4855 --- .../ws-calculator/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/municipal-services/ws-calculator/src/main/resources/application.properties b/municipal-services/ws-calculator/src/main/resources/application.properties index 289e6ec13..9b8bb7a36 100644 --- a/municipal-services/ws-calculator/src/main/resources/application.properties +++ b/municipal-services/ws-calculator/src/main/resources/application.properties @@ -22,7 +22,7 @@ spring.kafka.consumer.group-id=egov-ws-calc-services spring.kafka.consumer.properties.spring.json.use.type.headers=false spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer spring.kafka.producer.value-serializer=org.springframework.kafka.support.serializer.JsonSerializer -spring.kafka.consumer.properties.max.poll.interval.ms=1200000 +spring.kafka.consumer.properties.max.poll.interval.ms=600000 $KAFKA TOPIC DETAILS egov.watercalculatorservice.createdemand.topic=ws-generate-demand From 925aca8a41caee095a0b04fe77828646f0b08e9c Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 12 Feb 2024 11:38:27 +0530 Subject: [PATCH 21/49] PFM-5564 --- .../java/org/egov/wscalculation/service/DemandService.java | 3 +++ 1 file changed, 3 insertions(+) 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 da2a0a6e0..c474b1f88 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 @@ -178,6 +178,7 @@ public List generateDemand(RequestInfo requestInfo, List ca .collect(Collectors.toSet()); List demands = searchDemand(tenantId, consumerCodes, fromDateSearch, toDateSearch, requestInfo, "ACTIVE"); + log.info(demands.toString()); Set connectionNumbersFromDemands = new HashSet<>(); if (!CollectionUtils.isEmpty(demands)) { connectionNumbersFromDemands = demands.stream() @@ -302,6 +303,8 @@ private List createDemand(RequestInfo requestInfo, List cal //sendPaymentAndBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate); } } + BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); + log.info(String.valueOf(totalAmount)); sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate); } } From b05c681d212b8995eb2902ac6fe04bf71b34af01 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 12 Feb 2024 15:10:38 +0530 Subject: [PATCH 22/49] PFM-5564 --- .../org/egov/wscalculation/service/DemandService.java | 9 ++++----- 1 file changed, 4 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 c474b1f88..bedecdf30 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 @@ -304,8 +304,8 @@ private List createDemand(RequestInfo requestInfo, List cal } } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); - log.info(String.valueOf(totalAmount)); - sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate); + log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); + sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } log.info("Demand Object" + demands.toString()); @@ -351,7 +351,7 @@ private void sendPaymentSMSNotification(RequestInfo requestInfo, String tenantId } } } - private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String tenantId, User owner, WaterConnectionRequest waterConnectionRequest, Property property, List demandDetails, String consumerCode, List demands, Boolean isForConnectionNO, String businessService, String billCycle,List billNumbers, String paymentDueDate) { + private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String tenantId, User owner, WaterConnectionRequest waterConnectionRequest, Property property, List demandDetails, String consumerCode, List demands, Boolean isForConnectionNO, String businessService, String billCycle,List billNumbers, String paymentDueDate,BigDecimal totalamount) { HashMap localizationMessage = util.getLocalizationMessage(requestInfo, WSCalculationConstant.mGram_Consumer_NewBill, tenantId); String actionLink = config.getNotificationUrl() @@ -378,8 +378,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); messageString = messageString.replace("{consumerno}", consumerCode); - messageString = messageString.replace("{billamount}", demandDetails.stream() - .map(DemandDetail::getTaxAmount).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + messageString = messageString.replace("{billamount}", totalamount.toString()); messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink)); System.out.println("Demand genaration Message get bill::" + messageString); From 6deccde3c941b90975e1c63d75924bee70f316e7 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 13 Feb 2024 16:57:00 +0530 Subject: [PATCH 23/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 1 - 1 file changed, 1 deletion(-) 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 bedecdf30..9f1f22a33 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 @@ -178,7 +178,6 @@ public List generateDemand(RequestInfo requestInfo, List ca .collect(Collectors.toSet()); List demands = searchDemand(tenantId, consumerCodes, fromDateSearch, toDateSearch, requestInfo, "ACTIVE"); - log.info(demands.toString()); Set connectionNumbersFromDemands = new HashSet<>(); if (!CollectionUtils.isEmpty(demands)) { connectionNumbersFromDemands = demands.stream() From e18dfbfad6490ab867c70a419736b2d167b3bbcd Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Tue, 13 Feb 2024 19:20:05 +0530 Subject: [PATCH 24/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9f1f22a33..c77c6bf9a 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 @@ -372,7 +372,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten log.info("Demand Object get bill" + demands.toString()); log.info("requestInfo get Bill" + requestInfo); log.info("bill number get bill size :" + billNumbers.size()); - if (billNumbers.size() > 0) { + if (billNumbers.size() > 0 && totalamount.signum()>0) { actionLink = actionLink.replace("$billNumber", billNumbers.get(0)); messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); From 4c70d677557c636f34ace5d4be3ee8dbdc47a959 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 14:29:54 +0530 Subject: [PATCH 25/49] PFM-5564 --- .../org/egov/wscalculation/service/DemandService.java | 11 ++++++----- 1 file changed, 6 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 c77c6bf9a..b7426500b 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 @@ -303,8 +303,9 @@ private List createDemand(RequestInfo requestInfo, List cal } } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); - log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); + //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); + if(totalAmount.signum()> 0) + sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } log.info("Demand Object" + demands.toString()); @@ -366,8 +367,8 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten } String messageString = localizationMessage.get(WSCalculationConstant.MSG_KEY); - System.out.println("Localization message get bill::" + messageString); - System.out.println("isForConnectionNO:" + isForConnectionNO); + //System.out.println("Localization message get bill::" + messageString); + //System.out.println("isForConnectionNO:" + isForConnectionNO); if (!StringUtils.isEmpty(messageString) && isForConnectionNO) { log.info("Demand Object get bill" + demands.toString()); log.info("requestInfo get Bill" + requestInfo); @@ -380,7 +381,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten messageString = messageString.replace("{billamount}", totalamount.toString()); messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink)); - System.out.println("Demand genaration Message get bill::" + messageString); + // System.out.println("Demand genaration Message get bill::" + messageString); SMSRequest sms = SMSRequest.builder().mobileNumber(owner.getMobileNumber()).message(messageString).tenantid(tenantId) .category(Category.TRANSACTION).build(); From 1d8912906d50b1b051eb03b141504aecf7edfcbf Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 14:37:09 +0530 Subject: [PATCH 26/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b7426500b..8226078ef 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 @@ -304,7 +304,7 @@ private List createDemand(RequestInfo requestInfo, List cal } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - if(totalAmount.signum()> 0) + if(fetchTotalBillAmount(demands,requestInfo).signum()> 0) sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } From c28c489be0281627503d9339cda683ecfa348279 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 14:38:26 +0530 Subject: [PATCH 27/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8226078ef..b7426500b 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 @@ -304,7 +304,7 @@ private List createDemand(RequestInfo requestInfo, List cal } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - if(fetchTotalBillAmount(demands,requestInfo).signum()> 0) + if(totalAmount.signum()> 0) sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } From 61f18a4cd3977322e0672442263e32be67a19834 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 14:41:10 +0530 Subject: [PATCH 28/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b7426500b..375ae6ae6 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 @@ -304,7 +304,7 @@ private List createDemand(RequestInfo requestInfo, List cal } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - if(totalAmount.signum()> 0) + if(totalAmount.signum()> 0 && totalAmount!=null) sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } From 5cd2bf769b6c6e1a28ff5e6ae804012474e35dd5 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 14:42:54 +0530 Subject: [PATCH 29/49] PFM-5564 --- .../main/java/org/egov/wscalculation/service/DemandService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 375ae6ae6..852d2b6c7 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 @@ -373,7 +373,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten log.info("Demand Object get bill" + demands.toString()); log.info("requestInfo get Bill" + requestInfo); log.info("bill number get bill size :" + billNumbers.size()); - if (billNumbers.size() > 0 && totalamount.signum()>0) { + if (billNumbers.size() > 0 && totalamount.signum()>0 && totalamount!=null) { actionLink = actionLink.replace("$billNumber", billNumbers.get(0)); messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); From 19f069132bc1713ecdfc2fdc6a994c3f3605a869 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Wed, 14 Feb 2024 15:00:19 +0530 Subject: [PATCH 30/49] PFM-5564 --- .../java/org/egov/wscalculation/service/DemandService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 852d2b6c7..e4a03511b 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 @@ -304,7 +304,7 @@ private List createDemand(RequestInfo requestInfo, List cal } BigDecimal totalAmount=fetchTotalBillAmount(demands,requestInfo); //log.info("Total Amount from fetch Bill"+String.valueOf(totalAmount)); - if(totalAmount.signum()> 0 && totalAmount!=null) + if(totalAmount!=null && totalAmount.signum()> 0) sendDownloadBillSMSNotification(requestInfo,tenantId,owner,waterConnectionRequest,property,demandDetails,consumerCode,demands,isForConnectionNO,businessService,billCycle,billNumbers,paymentDueDate,totalAmount); } } @@ -373,7 +373,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten log.info("Demand Object get bill" + demands.toString()); log.info("requestInfo get Bill" + requestInfo); log.info("bill number get bill size :" + billNumbers.size()); - if (billNumbers.size() > 0 && totalamount.signum()>0 && totalamount!=null) { + if (totalamount!=null && billNumbers.size() > 0 && totalamount.signum()>0) { actionLink = actionLink.replace("$billNumber", billNumbers.get(0)); messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); From fbdcdf73d20f0b981f94f411e0bd58c3ef963b6c Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 19 Feb 2024 14:01:23 +0530 Subject: [PATCH 31/49] PFM-5671 --- .../src/main/java/org/egov/pt/service/BoundaryService.java | 1 + .../src/main/java/org/egov/pt/service/EnrichmentService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/municipal-services/property-services/src/main/java/org/egov/pt/service/BoundaryService.java b/municipal-services/property-services/src/main/java/org/egov/pt/service/BoundaryService.java index 65810cd69..3c96d4aae 100644 --- a/municipal-services/property-services/src/main/java/org/egov/pt/service/BoundaryService.java +++ b/municipal-services/property-services/src/main/java/org/egov/pt/service/BoundaryService.java @@ -50,6 +50,7 @@ public class BoundaryService { */ public void getAreaType(Property property, RequestInfo requestInfo, String hierarchyTypeCode) { + //EnrichmentService 202 line was calling this method previously if (ObjectUtils.isEmpty(property)) return; String tenantId = property.getTenantId(); diff --git a/municipal-services/property-services/src/main/java/org/egov/pt/service/EnrichmentService.java b/municipal-services/property-services/src/main/java/org/egov/pt/service/EnrichmentService.java index a87178003..762662c2e 100644 --- a/municipal-services/property-services/src/main/java/org/egov/pt/service/EnrichmentService.java +++ b/municipal-services/property-services/src/main/java/org/egov/pt/service/EnrichmentService.java @@ -199,7 +199,7 @@ public PropertyCriteria getPropertyCriteriaFromPropertyIds(List proper */ public void enrichBoundary(Property property, RequestInfo requestInfo){ - boundaryService.getAreaType(property, requestInfo, PTConstants.BOUNDARY_HEIRARCHY_CODE); +// boundaryService.getAreaType(property, requestInfo, PTConstants.BOUNDARY_HEIRARCHY_CODE); } /** From dcb27c277b6a3d9c433752792ea0cabdd6938f4e Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Mon, 19 Feb 2024 15:08:58 +0530 Subject: [PATCH 32/49] PFM-5671 --- .../src/main/java/org/egov/vendor/service/BoundaryService.java | 1 + .../main/java/org/egov/vendor/service/EnrichmentService.java | 2 +- .../main/java/org/egov/vendor/validator/VendorValidator.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/municipal-services/vendor/src/main/java/org/egov/vendor/service/BoundaryService.java b/municipal-services/vendor/src/main/java/org/egov/vendor/service/BoundaryService.java index ef34a6c63..00dc88ed3 100644 --- a/municipal-services/vendor/src/main/java/org/egov/vendor/service/BoundaryService.java +++ b/municipal-services/vendor/src/main/java/org/egov/vendor/service/BoundaryService.java @@ -40,6 +40,7 @@ public BoundaryService(ServiceRequestRepository serviceRequestRepository, Object } public void getAreaType(VendorRequest request, String hierarchyTypeCode) { + //EnrichmentService 102 , VendorValidator 113 line was calling this method if (request.getVendor() == null) { return; } diff --git a/municipal-services/vendor/src/main/java/org/egov/vendor/service/EnrichmentService.java b/municipal-services/vendor/src/main/java/org/egov/vendor/service/EnrichmentService.java index 47018ffdd..784b7b886 100644 --- a/municipal-services/vendor/src/main/java/org/egov/vendor/service/EnrichmentService.java +++ b/municipal-services/vendor/src/main/java/org/egov/vendor/service/EnrichmentService.java @@ -99,7 +99,7 @@ public void enrichVendorSearch(List vendorList, RequestInfo requestInfo, addDrivers(requestInfo, vendor, tenantId); addVehicles(requestInfo, vendor, tenantId); - boundaryService.getAreaType(VendorRequest.builder().vendor(vendor).build(), config.getHierarchyTypeCode()); +// boundaryService.getAreaType(VendorRequest.builder().vendor(vendor).build(), config.getHierarchyTypeCode()); }); } diff --git a/municipal-services/vendor/src/main/java/org/egov/vendor/validator/VendorValidator.java b/municipal-services/vendor/src/main/java/org/egov/vendor/validator/VendorValidator.java index c4c4aed1d..c9a0b5a4d 100644 --- a/municipal-services/vendor/src/main/java/org/egov/vendor/validator/VendorValidator.java +++ b/municipal-services/vendor/src/main/java/org/egov/vendor/validator/VendorValidator.java @@ -110,7 +110,7 @@ public void validateCreate(VendorRequest vendorRequest) { RequestInfo requestInfo = vendorRequest.getRequestInfo(); Vendor vendor = vendorRequest.getVendor(); - boundaryService.getAreaType(vendorRequest, config.getHierarchyTypeCode()); +// boundaryService.getAreaType(vendorRequest, config.getHierarchyTypeCode()); vehicleService.manageVehicle(vendorRequest); ownerService.manageOwner(vendorRequest); ownerService.manageDrivers(vendorRequest); From 007b764e82e1a0a64f957884c58f7f084bcb6f0b Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Wed, 21 Feb 2024 12:30:20 +0530 Subject: [PATCH 33/49] mdms v2 and location changes --- .../providers/consumer_details_provider.dart | 28 +++++++++++++++++-- .../providers/expenses_details_provider.dart | 2 +- frontend/mgramseva/lib/services/urls.dart | 2 +- frontend/mgramseva/pubspec.yaml | 2 +- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index 2048a5d92..802b2f554 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -479,11 +479,35 @@ class ConsumerProvider with ChangeNotifier { "tenantId": commonProvider.userDetails!.selectedtenant!.code }); boundaryList = []; - boundaryList.addAll( - TenantBoundary.fromJson(result['TenantBoundary'][0]).boundary!); + result['TenantBoundary']!=null && result['TenantBoundary'].length>0?boundaryList.addAll( + TenantBoundary.fromJson(result['TenantBoundary'][0]).boundary!):{}; if (boundaryList.length == 1) { property.address.localityCtrl = boundaryList.first; onChangeOfLocality(property.address.localityCtrl); + }else{ + boundaryList.add(Boundary.fromJson({ + "code": "WARD1", + "name": commonProvider.userDetails!.selectedtenant!.name, + "label": "Locality", + "latitude": null, + "longitude": null, + "area": null, + "pincode": null, + "boundaryNum": 1, + "children": [] + })); + property.address.localityCtrl = Locality.fromJson({ + "code": "WARD1", + "name": commonProvider.userDetails!.selectedtenant!.name, + "label": "Locality", + "latitude": null, + "longitude": null, + "area": null, + "pincode": null, + "boundaryNum": 1, + "children": [] + }); + onChangeOfLocality(property.address.localityCtrl); } // notifyListeners(); } catch (e) { diff --git a/frontend/mgramseva/lib/providers/expenses_details_provider.dart b/frontend/mgramseva/lib/providers/expenses_details_provider.dart index c7aa47077..366999108 100644 --- a/frontend/mgramseva/lib/providers/expenses_details_provider.dart +++ b/frontend/mgramseva/lib/providers/expenses_details_provider.dart @@ -285,7 +285,7 @@ class ExpensesDetailsProvider with ChangeNotifier { if (boundaryList.length > 0) { code = boundaryList.first.code; } else { - code = commonProvider.userDetails?.selectedtenant?.city?.code; + code = "WARD1"; } var body = { diff --git a/frontend/mgramseva/lib/services/urls.dart b/frontend/mgramseva/lib/services/urls.dart index 7a467755b..53a9a368c 100644 --- a/frontend/mgramseva/lib/services/urls.dart +++ b/frontend/mgramseva/lib/services/urls.dart @@ -3,7 +3,7 @@ class Url { static const String LOCALIZATION = 'localization/messages/v1/_search'; - static const String MDMS = 'egov-mdms-service/v1/_search'; + static const String MDMS = 'mdms-v2/v1/_search'; static const String FILE_UPLOAD = 'filestore/v1/files'; static const String FILE_FETCH = 'filestore/v1/files/url'; static const String URL_SHORTNER = 'egov-url-shortening/shortener'; diff --git a/frontend/mgramseva/pubspec.yaml b/frontend/mgramseva/pubspec.yaml index 8a45a54a2..765917714 100644 --- a/frontend/mgramseva/pubspec.yaml +++ b/frontend/mgramseva/pubspec.yaml @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.20+36 +version: 1.2.21+37 environment: sdk: ">=2.12.0 <4.0.0" From 3d63324cc9b0d31a34cd1aadd715fb8b8612d389 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Wed, 21 Feb 2024 16:30:30 +0530 Subject: [PATCH 34/49] made lat and long dynamic in tenants.dart --- frontend/mgramseva/lib/model/mdms/tenants.dart | 4 ++-- frontend/mgramseva/lib/model/mdms/tenants.g.dart | 4 ++-- frontend/mgramseva/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/mgramseva/lib/model/mdms/tenants.dart b/frontend/mgramseva/lib/model/mdms/tenants.dart index d9ecce78c..78a742414 100644 --- a/frontend/mgramseva/lib/model/mdms/tenants.dart +++ b/frontend/mgramseva/lib/model/mdms/tenants.dart @@ -94,9 +94,9 @@ class City { @JsonKey(name: "ulbGrade") String? ulbGrade; @JsonKey(name: "longitude") - double? longitude; + dynamic? longitude; @JsonKey(name: "latitude") - double? latitude; + dynamic? latitude; @JsonKey(name: "code") String? code; @JsonKey(name: "ddrName") diff --git a/frontend/mgramseva/lib/model/mdms/tenants.g.dart b/frontend/mgramseva/lib/model/mdms/tenants.g.dart index f4be0014b..1c98a50ab 100644 --- a/frontend/mgramseva/lib/model/mdms/tenants.g.dart +++ b/frontend/mgramseva/lib/model/mdms/tenants.g.dart @@ -85,8 +85,8 @@ City _$CityFromJson(Map json) { ..districtName = json['districtName'] as String? ..regionName = json['regionName'] as String? ..ulbGrade = json['ulbGrade'] as String? - ..longitude = (json['longitude'] as num?)?.toDouble() - ..latitude = (json['latitude'] as num?)?.toDouble() + ..longitude = json['longitude'] + ..latitude = json['latitude'] ..code = json['code'] as String? ..ddrName = json['ddrName'] as String? ..regionCode = json['cateregionCodegory'] as String? diff --git a/frontend/mgramseva/package.json b/frontend/mgramseva/package.json index 96a15c476..757974e71 100644 --- a/frontend/mgramseva/package.json +++ b/frontend/mgramseva/package.json @@ -1,5 +1,5 @@ { "name": "mgramseva", - "version": "1.2.20", + "version": "1.2.21", "license": "egov" } From 6365201b2d9e109a684cd71130e8f3095e090070 Mon Sep 17 00:00:00 2001 From: debasishchakraborty-egovt Date: Thu, 22 Feb 2024 17:56:48 +0530 Subject: [PATCH 35/49] PFM-5655: Chnaged the logic to check buildingType with propertyType rather than UsageCategory --- .../org/egov/wscalculation/service/EstimationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java index 3f9b08b2f..d8244a524 100644 --- a/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java +++ b/municipal-services/ws-calculator/src/main/java/org/egov/wscalculation/service/EstimationService.java @@ -274,8 +274,9 @@ private List getSlabsFiltered(WaterConnection waterConnection, List WaterConnectionRequest.builder().waterConnection(waterConnection).requestInfo(requestInfo).build()); // get billing Slab log.debug(" the slabs count : " + billingSlabs.size()); - final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0] - : ""; + //final String buildingType = (property.getUsageCategory() != null) ? property.getUsageCategory().split("\\.")[0]: ""; + //TODO:FIX ME : here before we passing buildingtype as UsageCategory from proerty response . but while creating property usagecategoty is residentialeven when we are creating commercial connection. Hennce we have change this to proertytype + final String buildingType = (property.getPropertyType() != null) ? property.getPropertyType().split("\\.")[0]: ""; // final String buildingType = "Domestic"; final String connectionType = waterConnection.getConnectionType(); From 45822c3706934f9b512766792ef5c9bd7d9f8c10 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:29:33 +0530 Subject: [PATCH 36/49] PFM-5064 Restrict to show path two months only --- .../providers/consumer_details_provider.dart | 33 ++++++ .../consumer_details/consumer_details.dart | 7 +- .../mgramseva/lib/utils/common_methods.dart | 108 +++++++++++++++++- 3 files changed, 143 insertions(+), 5 deletions(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index 802b2f554..86f233fe4 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -649,6 +649,39 @@ class ConsumerProvider with ChangeNotifier { } return >[]; } + //Displaying Billing Cycle Vaule (EX- JAN-2021,,) + List> getBillingCycleMonthCountCurrent(TaxPeriod? billYear) { + var dates = >[]; + if (billYear!=null) { + DatePeriod ytd; + var fromDate = DateFormats.getFormattedDateToDateTime( + DateFormats.timeStampToDate(billYear?.fromDate)) as DateTime; + + var toDate = DateFormats.getFormattedDateToDateTime( + DateFormats.timeStampToDate(billYear?.toDate)) as DateTime; + + ytd = DatePeriod(fromDate,toDate,DateType.YTD); + + /// Get months based on selected billing year + var months = CommonMethods.getPastMonthUntilFinancialYTDMonthCount(ytd); + + /// if selected year is future year means all the months will be removed + if(fromDate.year > ytd.endDate.year) months.clear(); + + for (var i = 0; i < months.length; i++) { + var prevMonth = months[i].startDate; + var r = {"code": prevMonth, "name": '${ApplicationLocalizations.of(navigatorKey.currentContext!) + .translate((Constants.MONTHS[prevMonth.month - 1])) + + " - " + + prevMonth.year.toString()}'}; + dates.add(r); + } + } + if (dates.length > 0 && waterconnection.connectionType == 'Non_Metered') { + return dates; + } + return >[]; + } incrementIndex(index, consumerGenderKey) async { if (boundaryList.length > 1) { diff --git a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart index 226c66d02..7b71d911d 100644 --- a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart +++ b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart @@ -512,8 +512,8 @@ class _ConsumerDetailsState extends State { '', consumerProvider .onChangeOfBillYear, - consumerProvider - .getFinancialYearList(), + [consumerProvider + .getFinancialYearList().first], true, itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}', controller: consumerProvider @@ -532,7 +532,8 @@ class _ConsumerDetailsState extends State { consumerProvider .onChangeBillingCycle, consumerProvider - .getBillingCycle(), + .getBillingCycleMonthCountCurrent(consumerProvider + .billYear), true, itemAsString: (i) =>"${ApplicationLocalizations.of(context).translate(i['name'])}", controller: consumerProvider diff --git a/frontend/mgramseva/lib/utils/common_methods.dart b/frontend/mgramseva/lib/utils/common_methods.dart index 633b4d38f..5443a7d2c 100644 --- a/frontend/mgramseva/lib/utils/common_methods.dart +++ b/frontend/mgramseva/lib/utils/common_methods.dart @@ -57,7 +57,60 @@ class CommonMethods { * rahul.dev@egovernments.org * * */ - + static var daysInMonthLeap = [ + 31, + 29, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31 + ]; + static var daysInMonth = [ + 31, + 28, + 31, + 30, + 31, + 30, + 31, + 31, + 30, + 31, + 30, + 31 + ]; + static bool isLeapYear(int year) { + if (year % 4 == 0) { + if (year % 100 == 0) { + if (year % 400 == 0) { + return true; + } else { + return false; + } + } else { + return true; + } + } else { + return false; + } + } + static int daysToSub(int monthCount, int year) { + var days = 0; + for (int i = 0; i < monthCount; i++) { + if (isLeapYear(year)) { + days += daysInMonthLeap[i]; + } else { + days += daysInMonth[i]; + } + } + return days; + } static List getPastMonthUntilFinancialYTD(DatePeriod ytd, {bool showCurrentMonth = false}) { var monthList = []; @@ -109,7 +162,58 @@ class CommonMethods { .toList(); return list; } - + static List getPastMonthUntilFinancialYTDMonthCount(DatePeriod ytd, + {int monthCount=2,bool showCurrentMonth = false}) { + var monthList = []; + final currentTime = DateTime.now(); + DatePeriod newDT = DatePeriod(ytd.endDate.subtract(Duration(days: daysToSub(monthCount,currentTime.year))), ytd.endDate, DateType.MONTH); + if (currentTime.year < newDT.startDate.year) { + return []; + } + if (currentTime.year == newDT.startDate.year) { + //when current year is same as start year of financial year + for (int i = newDT.startDate.month; + i <= (showCurrentMonth ? currentTime.month : currentTime.month - 1); + i++) { + monthList.add(DateTime(currentTime.year, i)); + } + } else if (currentTime.year == newDT.endDate.year) { + //when current year is same as end year of financial year + for (int i = newDT.startDate.month; i <= 12; i++) { + monthList.add(DateTime(newDT.startDate.year, i)); + } + for (int i = 1; + i <= + (currentTime.month <= newDT.endDate.month + ? showCurrentMonth + ? currentTime.month + : currentTime.month - 1 + : newDT.endDate.month); + /* + * if current month is less than or equal to end month of financial year + * we are using months less than current month and if it is more than + * end month of financial year we are using till end month of financial + * year + */ + i++) { + monthList.add(DateTime(newDT.endDate.year, i)); + } + } else { + for (int i = newDT.startDate.month; i <= 12; i++) { + monthList.add(DateTime(newDT.startDate.year, i)); + } + for (int i = 1; i <= newDT.endDate.month; i++) { + monthList.add(DateTime(newDT.endDate.year, i)); + } + } + var list = monthList + .map((e) => DatePeriod(DateTime(e.year, e.month, 1), + DateTime(e.year, e.month + 1, 0, 23, 59, 59, 999), DateType.MONTH)) + .toList() + .reversed + .toList(); + return list; + } static List getPastMonthIncludingCurrentMonthUntilFinancialYTD( DatePeriod ytd) { var monthList = []; From 7f6db5bc31df0128ec5c509ab08b5dece8d99dc0 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:34:04 +0530 Subject: [PATCH 37/49] PFM-5064 fix daysToSub --- frontend/mgramseva/lib/utils/common_methods.dart | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frontend/mgramseva/lib/utils/common_methods.dart b/frontend/mgramseva/lib/utils/common_methods.dart index 5443a7d2c..6964be456 100644 --- a/frontend/mgramseva/lib/utils/common_methods.dart +++ b/frontend/mgramseva/lib/utils/common_methods.dart @@ -100,13 +100,17 @@ class CommonMethods { return false; } } - static int daysToSub(int monthCount, int year) { - var days = 0; + static int daysToSubtract(int monthCount, int year,int currentMonth) { + int days = 0; for (int i = 0; i < monthCount; i++) { - if (isLeapYear(year)) { - days += daysInMonthLeap[i]; + if (currentMonth - i < 0) { + days += isLeapYear(year - 1) + ? daysInMonthLeap[12 - (currentMonth - i).abs()] + : daysInMonth[12 - (currentMonth - i).abs()]; } else { - days += daysInMonth[i]; + days += isLeapYear(year) + ? daysInMonthLeap[currentMonth - i] + : daysInMonth[currentMonth - i]; } } return days; From afd1d20b47f7f5effa62e68062875f0d9373c65a Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 5 Mar 2024 22:37:11 +0530 Subject: [PATCH 38/49] PFM-5064 fix daysToSubtract --- frontend/mgramseva/lib/utils/common_methods.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/mgramseva/lib/utils/common_methods.dart b/frontend/mgramseva/lib/utils/common_methods.dart index 6964be456..4f671094c 100644 --- a/frontend/mgramseva/lib/utils/common_methods.dart +++ b/frontend/mgramseva/lib/utils/common_methods.dart @@ -170,7 +170,7 @@ class CommonMethods { {int monthCount=2,bool showCurrentMonth = false}) { var monthList = []; final currentTime = DateTime.now(); - DatePeriod newDT = DatePeriod(ytd.endDate.subtract(Duration(days: daysToSub(monthCount,currentTime.year))), ytd.endDate, DateType.MONTH); + DatePeriod newDT = DatePeriod(ytd.endDate.subtract(Duration(days: daysToSubtract(monthCount,currentTime.year,currentTime.month))), ytd.endDate, DateType.MONTH); if (currentTime.year < newDT.startDate.year) { return []; } From d1de16c544e9f2c2624bc858c1c8425946087710 Mon Sep 17 00:00:00 2001 From: Debasish Chakraborty <117706910+debasishchakraborty-egovt@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:14:10 +0530 Subject: [PATCH 39/49] Update build-config.yml --- build/build-config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/build-config.yml b/build/build-config.yml index ea8c9c688..dcde66e1d 100644 --- a/build/build-config.yml +++ b/build/build-config.yml @@ -134,3 +134,8 @@ config: dockerfile: "build/maven/Dockerfile" - work-dir: "business-services/egov-apportion-service/src/main/resources/db" image-name: "egov-apportion-service-db" + - name: "builds/mGramSeva/utilities/egov-penalty-schedular" + build: + - work-dir: "utilities/egov-penalty-schedular" + image-name: "egov-penalty-schedular" + dockerfile: "build/maven/Dockerfile" From 3ca65185f665a3ff6d35646762b04e3d107d5314 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Thu, 7 Mar 2024 11:51:21 +0530 Subject: [PATCH 40/49] PFM-5564 --- .../egov/wscalculation/service/DemandService.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 e4a03511b..641d01f87 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 @@ -378,10 +378,21 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); messageString = messageString.replace("{consumerno}", consumerCode); - messageString = messageString.replace("{billamount}", totalamount.toString()); +// messageString = messageString.replace("{billamount}", totalamount.toString()); + BigDecimal demandAmount= demandDetails.stream() + .map(DemandDetail::getTaxAmount).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal arrears=totalamount.subtract(demandAmount); + if(arrears.compareTo(BigDecimal.ZERO)>0) + { + messageString = messageString.replace("{billamount}", totalamount.toString()+"(includes Rs."+ arrears.toString()+ " arrears)"); + } + else + { + messageString = messageString.replace("{billamount}", totalamount.toString()); + } messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink)); - // System.out.println("Demand genaration Message get bill::" + messageString); + System.out.println("Demand genaration Message get bill::" + messageString); SMSRequest sms = SMSRequest.builder().mobileNumber(owner.getMobileNumber()).message(messageString).tenantid(tenantId) .category(Category.TRANSACTION).build(); From f046b453128dbde433e9cf680a0956245bc0d317 Mon Sep 17 00:00:00 2001 From: Saloni-eGov Date: Thu, 7 Mar 2024 13:14:01 +0530 Subject: [PATCH 41/49] PFM-5564 --- .../java/org/egov/wscalculation/service/DemandService.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 641d01f87..4016f83e0 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 @@ -378,7 +378,6 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten messageString = messageString.replace("{ownername}", owner.getName()); messageString = messageString.replace("{Period}", billCycle); messageString = messageString.replace("{consumerno}", consumerCode); -// messageString = messageString.replace("{billamount}", totalamount.toString()); BigDecimal demandAmount= demandDetails.stream() .map(DemandDetail::getTaxAmount).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal arrears=totalamount.subtract(demandAmount); @@ -392,7 +391,7 @@ private void sendDownloadBillSMSNotification(RequestInfo requestInfo, String ten } messageString = messageString.replace("{BILL_LINK}", getShortenedUrl(actionLink)); - System.out.println("Demand genaration Message get bill::" + messageString); +// System.out.println("Demand genaration Message get bill::" + messageString); SMSRequest sms = SMSRequest.builder().mobileNumber(owner.getMobileNumber()).message(messageString).tenantid(tenantId) .category(Category.TRANSACTION).build(); From 26372eeeef45482682f61fcca3e7a7729d6f43d6 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Sun, 7 Apr 2024 14:07:38 +0530 Subject: [PATCH 42/49] PFM-5064 fix daysToSubtract --- .../providers/consumer_details_provider.dart | 13 ++++- .../consumer_details/consumer_details.dart | 41 +++++++-------- .../mgramseva/lib/utils/common_methods.dart | 52 ------------------- 3 files changed, 31 insertions(+), 75 deletions(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index 86f233fe4..ea8b02df1 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -663,7 +663,7 @@ class ConsumerProvider with ChangeNotifier { ytd = DatePeriod(fromDate,toDate,DateType.YTD); /// Get months based on selected billing year - var months = CommonMethods.getPastMonthUntilFinancialYTDMonthCount(ytd); + var months = CommonMethods.getPastMonthUntilFinancialYTD(ytd); /// if selected year is future year means all the months will be removed if(fromDate.year > ytd.endDate.year) months.clear(); @@ -724,7 +724,16 @@ class ConsumerProvider with ChangeNotifier { } return []; } - + List> newFunction({int pastMonthCount = 2}){ + List financialYears = getFinancialYearList(); + var dates = >[]; + financialYears.forEach((year) { + dates.addAll(getBillingCycleMonthCountCurrent(year)); + }); + dates.sort((a, b) => b['code'].compareTo(a['code'])); + print(dates.toString()); + return dates.toList().length>2?dates.toList().sublist(0,2):dates.toList(); + } void onChangeOfAmountType(value) { waterconnection.paymentType = value; diff --git a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart index 7b71d911d..398409614 100644 --- a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart +++ b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart @@ -503,25 +503,25 @@ class _ConsumerDetailsState extends State { false ? Wrap( children: [ - SelectFieldBuilder( - i18.demandGenerate - .BILLING_YEAR_LABEL, - consumerProvider - .billYear, - '', - '', - consumerProvider - .onChangeOfBillYear, - [consumerProvider - .getFinancialYearList().first], - true, - itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}', - controller: consumerProvider - .waterconnection - .billingCycleYearCtrl, - key: Keys.bulkDemand - .BULK_DEMAND_BILLING_YEAR, - ), + // SelectFieldBuilder( + // i18.demandGenerate + // .BILLING_YEAR_LABEL, + // consumerProvider + // .billYear, + // '', + // '', + // consumerProvider + // .onChangeOfBillYear, + // consumerProvider + // .getFinancialYearList(), + // true, + // itemAsString: (i) =>'${ApplicationLocalizations.of(context).translate(i.financialYear)}', + // controller: consumerProvider + // .waterconnection + // .billingCycleYearCtrl, + // key: Keys.bulkDemand + // .BULK_DEMAND_BILLING_YEAR, + // ), SelectFieldBuilder( i18.consumer .CONSUMER_BILLING_CYCLE, @@ -532,8 +532,7 @@ class _ConsumerDetailsState extends State { consumerProvider .onChangeBillingCycle, consumerProvider - .getBillingCycleMonthCountCurrent(consumerProvider - .billYear), + .newFunction(), true, itemAsString: (i) =>"${ApplicationLocalizations.of(context).translate(i['name'])}", controller: consumerProvider diff --git a/frontend/mgramseva/lib/utils/common_methods.dart b/frontend/mgramseva/lib/utils/common_methods.dart index 4f671094c..9b057d4cb 100644 --- a/frontend/mgramseva/lib/utils/common_methods.dart +++ b/frontend/mgramseva/lib/utils/common_methods.dart @@ -166,58 +166,6 @@ class CommonMethods { .toList(); return list; } - static List getPastMonthUntilFinancialYTDMonthCount(DatePeriod ytd, - {int monthCount=2,bool showCurrentMonth = false}) { - var monthList = []; - final currentTime = DateTime.now(); - DatePeriod newDT = DatePeriod(ytd.endDate.subtract(Duration(days: daysToSubtract(monthCount,currentTime.year,currentTime.month))), ytd.endDate, DateType.MONTH); - if (currentTime.year < newDT.startDate.year) { - return []; - } - if (currentTime.year == newDT.startDate.year) { - //when current year is same as start year of financial year - for (int i = newDT.startDate.month; - i <= (showCurrentMonth ? currentTime.month : currentTime.month - 1); - i++) { - monthList.add(DateTime(currentTime.year, i)); - } - } else if (currentTime.year == newDT.endDate.year) { - //when current year is same as end year of financial year - for (int i = newDT.startDate.month; i <= 12; i++) { - monthList.add(DateTime(newDT.startDate.year, i)); - } - for (int i = 1; - i <= - (currentTime.month <= newDT.endDate.month - ? showCurrentMonth - ? currentTime.month - : currentTime.month - 1 - : newDT.endDate.month); - /* - * if current month is less than or equal to end month of financial year - * we are using months less than current month and if it is more than - * end month of financial year we are using till end month of financial - * year - */ - i++) { - monthList.add(DateTime(newDT.endDate.year, i)); - } - } else { - for (int i = newDT.startDate.month; i <= 12; i++) { - monthList.add(DateTime(newDT.startDate.year, i)); - } - for (int i = 1; i <= newDT.endDate.month; i++) { - monthList.add(DateTime(newDT.endDate.year, i)); - } - } - var list = monthList - .map((e) => DatePeriod(DateTime(e.year, e.month, 1), - DateTime(e.year, e.month + 1, 0, 23, 59, 59, 999), DateType.MONTH)) - .toList() - .reversed - .toList(); - return list; - } static List getPastMonthIncludingCurrentMonthUntilFinancialYTD( DatePeriod ytd) { var monthList = []; From 4a9022ac43528b455bc3748a79265b2c6042592b Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Sun, 7 Apr 2024 14:07:55 +0530 Subject: [PATCH 43/49] PFM-5064 fix daysToSubtract --- frontend/mgramseva/lib/providers/consumer_details_provider.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index ea8b02df1..0929b5976 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -731,7 +731,6 @@ class ConsumerProvider with ChangeNotifier { dates.addAll(getBillingCycleMonthCountCurrent(year)); }); dates.sort((a, b) => b['code'].compareTo(a['code'])); - print(dates.toString()); return dates.toList().length>2?dates.toList().sublist(0,2):dates.toList(); } void onChangeOfAmountType(value) { From e5506d5366c0f737b01b0414b21c29aa3ecdeff6 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Thu, 7 Mar 2024 15:06:34 +0530 Subject: [PATCH 44/49] PFM-5064 fix daysToSubtract --- .../mgramseva/lib/providers/consumer_details_provider.dart | 3 +++ .../lib/screeens/consumer_details/consumer_details.dart | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index 0929b5976..cbfa8d887 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -724,6 +724,9 @@ class ConsumerProvider with ChangeNotifier { } return []; } + List getLastFinancialYearList(int count) { + return getFinancialYearList().length>count?getFinancialYearList().sublist(0,count):getFinancialYearList(); + } List> newFunction({int pastMonthCount = 2}){ List financialYears = getFinancialYearList(); var dates = >[]; diff --git a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart index 398409614..28767b8f7 100644 --- a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart +++ b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart @@ -438,7 +438,7 @@ class _ConsumerDetailsState extends State { .waterconnection .previousReadingDateCtrl, firstDate: - DateTime.fromMillisecondsSinceEpoch(consumerProvider.languageList?.mdmsRes?.billingService?.taxPeriodList!.first.fromDate??0), + DateTime.fromMillisecondsSinceEpoch(consumerProvider.getLastFinancialYearList(2).reversed.first.fromDate??0), lastDate: DateTime.now(), onChangeOfDate: From 18293e944822544a21d44263769da0c9117edb2b Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Mon, 11 Mar 2024 11:41:24 +0530 Subject: [PATCH 45/49] Thermal Printer Advance Fix --- .../house_connection_and_bill/consumer_bill_payment.dart | 4 ++-- .../mgramseva/lib/providers/collect_payment_provider.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart b/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart index 6800b26dd..11e3be5d9 100644 --- a/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart +++ b/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart @@ -230,9 +230,9 @@ class ConsumerBillPaymentsState extends State { .toString()) + ' only')), getPrinterLabel( - i18.consumerReciepts.CONSUMER_PENDING_AMOUNT, + (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE, ('₹' + - ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)) + ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs() .toString())), SizedBox( height: 8, diff --git a/frontend/mgramseva/lib/providers/collect_payment_provider.dart b/frontend/mgramseva/lib/providers/collect_payment_provider.dart index 2e8f00870..51d78de5d 100644 --- a/frontend/mgramseva/lib/providers/collect_payment_provider.dart +++ b/frontend/mgramseva/lib/providers/collect_payment_provider.dart @@ -398,9 +398,9 @@ class CollectPaymentProvider with ChangeNotifier { .toString()) + ' only')), getPrinterLabel( - i18.consumerReciepts.CONSUMER_PENDING_AMOUNT, + (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE, ('₹' + - ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)) + ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs() .toString())), SizedBox( height: 8, From 36dc83ab498671a4fe50bed0f6af7c0e4f456c5a Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Mon, 11 Mar 2024 12:39:44 +0530 Subject: [PATCH 46/49] reverted mdms V2 --- frontend/mgramseva/lib/providers/consumer_details_provider.dart | 2 +- .../lib/screeens/consumer_details/consumer_details.dart | 2 +- frontend/mgramseva/lib/services/urls.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/mgramseva/lib/providers/consumer_details_provider.dart b/frontend/mgramseva/lib/providers/consumer_details_provider.dart index cbfa8d887..71f9c50d9 100644 --- a/frontend/mgramseva/lib/providers/consumer_details_provider.dart +++ b/frontend/mgramseva/lib/providers/consumer_details_provider.dart @@ -727,7 +727,7 @@ class ConsumerProvider with ChangeNotifier { List getLastFinancialYearList(int count) { return getFinancialYearList().length>count?getFinancialYearList().sublist(0,count):getFinancialYearList(); } - List> newFunction({int pastMonthCount = 2}){ + List> newBillingCycleFunction({int pastMonthCount = 2}){ List financialYears = getFinancialYearList(); var dates = >[]; financialYears.forEach((year) { diff --git a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart index 28767b8f7..c1b7e490c 100644 --- a/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart +++ b/frontend/mgramseva/lib/screeens/consumer_details/consumer_details.dart @@ -532,7 +532,7 @@ class _ConsumerDetailsState extends State { consumerProvider .onChangeBillingCycle, consumerProvider - .newFunction(), + .newBillingCycleFunction(), true, itemAsString: (i) =>"${ApplicationLocalizations.of(context).translate(i['name'])}", controller: consumerProvider diff --git a/frontend/mgramseva/lib/services/urls.dart b/frontend/mgramseva/lib/services/urls.dart index 53a9a368c..7a467755b 100644 --- a/frontend/mgramseva/lib/services/urls.dart +++ b/frontend/mgramseva/lib/services/urls.dart @@ -3,7 +3,7 @@ class Url { static const String LOCALIZATION = 'localization/messages/v1/_search'; - static const String MDMS = 'mdms-v2/v1/_search'; + static const String MDMS = 'egov-mdms-service/v1/_search'; static const String FILE_UPLOAD = 'filestore/v1/files'; static const String FILE_FETCH = 'filestore/v1/files/url'; static const String URL_SHORTNER = 'egov-url-shortening/shortener'; From 3540e0326a73df7373c37d288d3ddacd03b74a0b Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:08:35 +0530 Subject: [PATCH 47/49] PFM-5692 --- frontend/mgramseva/lib/services/urls.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/mgramseva/lib/services/urls.dart b/frontend/mgramseva/lib/services/urls.dart index 7a467755b..3a0c36f2f 100644 --- a/frontend/mgramseva/lib/services/urls.dart +++ b/frontend/mgramseva/lib/services/urls.dart @@ -6,7 +6,7 @@ class Url { static const String MDMS = 'egov-mdms-service/v1/_search'; static const String FILE_UPLOAD = 'filestore/v1/files'; static const String FILE_FETCH = 'filestore/v1/files/url'; - static const String URL_SHORTNER = 'egov-url-shortening/shortener'; + static const String URL_SHORTNER = 'eus/shortener'; static const String FETCH_FILESTORE_ID_PDF_SERVICE = 'pdf-service/v1/_create'; /// Expenses From 01994299858b742fbcf7b75e930d745028778cb7 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:09:55 +0530 Subject: [PATCH 48/49] revert PFM-5692 --- frontend/mgramseva/lib/services/urls.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/mgramseva/lib/services/urls.dart b/frontend/mgramseva/lib/services/urls.dart index 3a0c36f2f..7a467755b 100644 --- a/frontend/mgramseva/lib/services/urls.dart +++ b/frontend/mgramseva/lib/services/urls.dart @@ -6,7 +6,7 @@ class Url { static const String MDMS = 'egov-mdms-service/v1/_search'; static const String FILE_UPLOAD = 'filestore/v1/files'; static const String FILE_FETCH = 'filestore/v1/files/url'; - static const String URL_SHORTNER = 'eus/shortener'; + static const String URL_SHORTNER = 'egov-url-shortening/shortener'; static const String FETCH_FILESTORE_ID_PDF_SERVICE = 'pdf-service/v1/_create'; /// Expenses From d75aa6f9279a5b468db0c1dc5eb78ef44096dd15 Mon Sep 17 00:00:00 2001 From: Rahul Dev Garg <34365102+rahuldevgarg@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:14:46 +0530 Subject: [PATCH 49/49] PFM-5692 changes url shorting endpoint --- frontend/mgramseva/lib/services/urls.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/mgramseva/lib/services/urls.dart b/frontend/mgramseva/lib/services/urls.dart index 7a467755b..3a0c36f2f 100644 --- a/frontend/mgramseva/lib/services/urls.dart +++ b/frontend/mgramseva/lib/services/urls.dart @@ -6,7 +6,7 @@ class Url { static const String MDMS = 'egov-mdms-service/v1/_search'; static const String FILE_UPLOAD = 'filestore/v1/files'; static const String FILE_FETCH = 'filestore/v1/files/url'; - static const String URL_SHORTNER = 'egov-url-shortening/shortener'; + static const String URL_SHORTNER = 'eus/shortener'; static const String FETCH_FILESTORE_ID_PDF_SERVICE = 'pdf-service/v1/_create'; /// Expenses