2.8 release code (#61)

* 2.8 release code

* sewerage code added

build/build-config.yml

@@ -601,6 +601,14 @@ config:
         dockerfile: "build/maven/Dockerfile"
       - work-dir: "municipal-services/birth-death-services/src/main/resources/db"
         image-name: "birth-death-services-db"
+
+  - name: "builds/digit-dev/municipal-services/birth-registration"
+    build:
+      - work-dir: "municipal-services/birth-registration"
+        image-name: "birth-registration"
+        dockerfile: "build/maven/Dockerfile"
+      - work-dir: "municipal-services/birth-registration/src/main/resources/db"
+        image-name: "birth-registration-db"
 
  # Utilities
 
@@ -670,7 +678,7 @@ config:
     build:
       - work-dir: "utilities/demo-utility"
         image-name: "demo-utility"
-        dockerfile: "build/maven/Dockerfile"
+        dockerfile: "build/maven/Dockerfile"      
 
   # Frontend
 
@@ -749,4 +757,4 @@ config:
       - work-dir: finance/egov
         image-name: egov-finance
         dockerfile: finance/Dockerfile
-
+  

build/maven/Dockerfile

@@ -1,6 +1,6 @@
 
-#FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build
-FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
+FROM egovio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build
+# FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
 ARG WORK_DIR
 WORKDIR /app
 
@@ -26,4 +26,4 @@ COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/
 
 RUN chmod +x /opt/egov/start.sh
 
-CMD ["/opt/egov/start.sh"]
+CMD ["/opt/egov/start.sh"]

business-services/billing-service/CHANGELOG.md

@@ -1,7 +1,15 @@
 
 All notable changes to this module will be documented in this file.
-## 1.3.4 - 2022-01-13
+## 1.3.5 - 2023-02-01
+
+- Transition from 1.3.5-beta version to 1.3.5 version
+
+## 1.3.5-beta - 2022-11-13
+- Amendment Query bug fix
+
+## 1.3.4 - 2022-01-04
 - Updated to log4j2 version 2.17.1
+
 ## 1.3.3 - 2021-07-26
 
  - Earliest bill search

business-services/billing-service/README.md

@@ -15,7 +15,7 @@ NA
 
 ### Swagger API Contract
 
-https://raw.githubusercontent.com/egovernments/DIGIT-OSS/master/business-services/Docs/billingservice/V-2.0.yml
+https://raw.githubusercontent.com/egovernments/business-services/master/Docs/billingservice/V-2.0.yml
 
 ## Service Details
 

business-services/billing-service/pom.xml

@@ -12,7 +12,7 @@
 	</parent>
 	<groupId>com.egov.demand</groupId>
 	<artifactId>billing-service</artifactId>
-	<version>1.3.4-SNAPSHOT</version>
+	<version>1.3.5-SNAPSHOT</version>
 	<name>billing-service</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
@@ -30,6 +30,11 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>5.2.20.RELEASE</version>
+		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
@@ -47,18 +52,6 @@
 			<groupId>org.springframework.kafka</groupId>
 			<artifactId>spring-kafka</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.5</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.5</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-devtools</artifactId>
@@ -86,12 +79,12 @@
 		<dependency>
 			<groupId>org.egov.services</groupId>
 			<artifactId>services-common</artifactId>
-			<version>1.0.1-SNAPSHOT</version>
+			<version>1.1.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.egov.services</groupId>
 			<artifactId>tracer</artifactId>
-			<version>2.0.0-SNAPSHOT</version>
+			<version>2.1.2-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.flywaydb</groupId>

business-services/billing-service/src/main/java/org/egov/demand/amendment/model/Action.java

@@ -70,6 +70,5 @@ public Action addRolesItem(String rolesItem) {
         this.roles.add(rolesItem);
         return this;
         }
-
 }
 

business-services/billing-service/src/main/java/org/egov/demand/amendment/model/AmendmentCriteria.java

@@ -42,10 +42,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
 
-import org.egov.demand.amendment.model.enums.AmendmentStatus;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Builder.Default;
@@ -64,12 +63,19 @@ public class AmendmentCriteria {
 	private String tenantId;
 
 	private String amendmentId;
+
+	@Min(0)
+	private Integer offset;
+
+	@Min(1)
+	private Integer limit;
 
 	@Default
 	private Set<String> consumerCode = new HashSet<>();
 
 	@NotNull
 	private String businessService;
 
-	private AmendmentStatus status;
+	@Default
+	private Set<String> status = new HashSet<>();
 }

business-services/billing-service/src/main/java/org/egov/demand/amendment/model/AmendmentUpdate.java

@@ -5,6 +5,7 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
+import org.egov.demand.amendment.model.enums.AmendmentReason;
 import org.egov.demand.amendment.model.enums.AmendmentStatus;
 import org.egov.demand.model.AuditDetails;
 
@@ -53,7 +54,20 @@ public class AmendmentUpdate {
 	@JsonProperty("documents")
 	@Valid
 	private List<Document> documents;
-
+
+	@NotNull
+	@JsonProperty("amendmentReason")
+	private AmendmentReason amendmentReason;
+
+	@JsonProperty("reasonDocumentNumber")
+	private String reasonDocumentNumber;
+
+	@JsonProperty("effectiveFrom")
+	private Long effectiveFrom;
+
+	@JsonProperty("effectiveTill")
+	private Long effectiveTill;
+
 	public AmendmentCriteria toSearchCriteria() {
 
 		return AmendmentCriteria.builder()

business-services/billing-service/src/main/java/org/egov/demand/config/ApplicationProperties.java

@@ -40,13 +40,13 @@
 
 package org.egov.demand.config;
 
-import java.util.Map;
-
+import lombok.Getter;
+import lombok.ToString;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
-import lombok.Getter;
-import lombok.ToString;
+import java.util.List;
+import java.util.Map;
 
 @Configuration
 @Getter
@@ -192,5 +192,7 @@ public class ApplicationProperties {
 
     @Value("${amendment.id.format.name}")
     private String amendmentIdFormatName;
-
+
+	@Value("${statelevel.rolecode.excluded.list}")
+	private List<String> statelevelRolecodeExclusionList;
 }

business-services/billing-service/src/main/java/org/egov/demand/consumer/BulkBillGenerationConsumer.java

@@ -0,0 +1,101 @@
+package org.egov.demand.consumer;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.egov.demand.model.BulkBillGenerator;
+import org.egov.demand.model.Demand;
+import org.egov.demand.model.GenerateBillCriteria;
+import org.egov.demand.model.MigrationCount;
+import org.egov.demand.service.BillServicev2;
+import org.egov.demand.service.DemandService;
+import org.egov.demand.web.contract.DemandRequest;
+import org.egov.tracer.kafka.CustomKafkaTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@Slf4j
+public class BulkBillGenerationConsumer {
+
+	@Autowired
+	private DemandService demandService;
+
+	@Autowired
+	private ObjectMapper objectMapper;
+
+	@Autowired
+	private BillServicev2 billService;
+
+	@Autowired
+	private CustomKafkaTemplate<String, Object> kafkaTemplate;
+
+	@KafkaListener(topics = { "${kafka.topics.bulk.bill.generation}" })
+	public void processMessage(Map<String, Object> consumerRecord, @Header(KafkaHeaders.RECEIVED_TOPIC) String topic) {
+
+		log.debug("key:" + topic + ":" + "value:" + consumerRecord);
+
+		BulkBillGenerator billGenerator = objectMapper.convertValue(consumerRecord, BulkBillGenerator.class);
+		DemandRequest request = DemandRequest.builder()
+				.requestInfo(billGenerator.getRequestInfo())
+				.demands(billGenerator.getCreateDemands())
+				.build();
+
+		log.info(" Billing-bulkbill-consumer-batch log for batch : " + billGenerator.getMigrationCount().getOffset()
+				+ " with no of records " + billGenerator.getCreateDemands().size());
+
+		try {
+			demandService.create(request);
+		} catch (Exception e) {
+			logError(" Demand creation ", e.getMessage(), billGenerator.getMigrationCount());
+		}
+
+		request.setDemands(billGenerator.getUpdateDemands());
+		try {
+			if (!CollectionUtils.isEmpty(billGenerator.getUpdateDemands()))
+				demandService.updateAsync(request, null);
+		} catch (Exception e) {
+			logError(" Demand update ", e.getMessage(), billGenerator.getMigrationCount());
+		}
+
+		Set<String> consumerCodes = billGenerator.getCreateDemands()
+				.stream()
+				.map(Demand::getConsumerCode)
+				.collect(Collectors.toSet());
+		String tenantId = billGenerator.getCreateDemands().get(0).getTenantId();
+		String businessService = billGenerator.getCreateDemands().get(0).getBusinessService();
+
+		GenerateBillCriteria genBillCriteria = GenerateBillCriteria.builder()
+				.consumerCode(consumerCodes)
+				.businessService(businessService)
+				.tenantId(tenantId)
+				.build();
+
+		try {
+			billService.generateBill(genBillCriteria, billGenerator.getRequestInfo());
+		} catch (Exception e) {
+			logError(" Bill Gen ", e.getMessage(), billGenerator.getMigrationCount());
+		}
+
+		MigrationCount migrationCount = billGenerator.getMigrationCount();
+		migrationCount.setAuditTime(System.currentTimeMillis());
+		migrationCount.setMessage("prcoess succeded in billing service");
+		kafkaTemplate.send(migrationCount.getAuditTopic(), billGenerator.getMigrationCount());
+	}
+
+	private void logError(String process, String message, MigrationCount bulkBillCount) {
+		bulkBillCount.setAuditTime(System.currentTimeMillis());
+		bulkBillCount.setMessage("prcoess failed in billing service during "+ process + " with error message : " + message);
+		kafkaTemplate.send(bulkBillCount.getAuditTopic(), bulkBillCount);
+	}
+
+}

business-services/billing-service/src/main/java/org/egov/demand/model/BillV2.java

@@ -27,6 +27,9 @@ public class BillV2 {
 	@JsonProperty("id")
 	@Size(max = 256)
 	private String id;
+
+	@JsonProperty("userId")
+	private String userId;
 
 	@JsonProperty("mobileNumber")
 	@Pattern(regexp = "^[0-9]{10}$", message = "MobileNumber should be 10 digit number")

business-services/billing-service/src/main/java/org/egov/demand/model/BulkBillGenerator.java

@@ -0,0 +1,23 @@
+package org.egov.demand.model;
+
+import java.util.List;
+
+import org.egov.common.contract.request.RequestInfo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BulkBillGenerator {
+
+	private RequestInfo requestInfo;
+
+	private List<Demand> createDemands;
+
+	private List<Demand> updateDemands;
+
+	private MigrationCount migrationCount;
+}