#CCSD-389 Birth& death module integrated with user service for applicant

.github/workflows/publishAllPackages.yml

@@ -2,7 +2,7 @@ name: Node.js Publish UI Packages
 
 on:
   push:
-    branches: ["develop"]
+    branches: ["sandbox"]
 
     paths:
       - "frontend/micro-ui/web/micro-ui-internals/**"

birth-death-services/pom.xml

@@ -48,12 +48,15 @@
       <version>2.9.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
+      <dependency>
+          <groupId>org.projectlombok</groupId>
+          <artifactId>lombok</artifactId>
+          <version>1.18.30</version> <!-- or latest -->
+          <scope>provided</scope>
+      </dependency>
+
+
+      <dependency>
     	<groupId>org.postgresql</groupId>
       <artifactId>postgresql</artifactId>
       <version>42.7.1</version>
@@ -78,6 +81,26 @@
 			</exclusion>
 		</exclusions>
 	</dependency>
+          <dependency>
+              <groupId>javax.validation</groupId>
+              <artifactId>validation-api</artifactId>
+              <version>2.0.1.Final</version>
+          </dependency>
+      <dependency>
+          <groupId>org.hibernate.validator</groupId>
+          <artifactId>hibernate-validator</artifactId>
+          <version>7.0.5.Final</version> <!-- Ensure compatibility with Spring Boot version -->
+      </dependency>
+      <dependency>
+          <groupId>org.glassfish</groupId>
+          <artifactId>jakarta.el</artifactId>
+          <version>4.0.2</version> <!-- For Expression Language support -->
+      </dependency>
+      <dependency>
+          <groupId>net.minidev</groupId>
+          <artifactId>json-smart</artifactId>
+          <version>2.5.0</version>
+      </dependency>
   </dependencies>
 <repositories>
     <repository>

birth-death-services/src/main/java/org/bel/birthdeath/BirthDeathApplication.java

@@ -13,6 +13,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.context.annotation.Primary;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -33,6 +34,7 @@ public static void main(String[] args) {
 	}
 
 	@Bean
+    @Primary
     public ObjectMapper objectMapperBnd(){
         return new ObjectMapper()
                 .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)

birth-death-services/src/main/java/org/bel/birthdeath/birth/certmodel/BirthCertAppln.java

@@ -31,4 +31,10 @@ public class BirthCertAppln {
 	private String tenantId;
 
 	private String fileStoreId;
+
+	private String motherName;
+
+	private String fatherName;
+
+	private String dateOfBirth;
 }

birth-death-services/src/main/java/org/bel/birthdeath/birth/certmodel/BirthCertificate.java

@@ -6,8 +6,7 @@
 import org.bel.birthdeath.birth.calculation.Calculation;
 import org.bel.birthdeath.common.model.Amount;
 import org.bel.birthdeath.common.model.AuditDetails;
-import org.egov.common.contract.request.User;
-
+import org.bel.birthdeath.common.model.user.User;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;

birth-death-services/src/main/java/org/bel/birthdeath/birth/model/EgBirthDtl.java

@@ -2,20 +2,25 @@
 
 import java.sql.Timestamp;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.bel.birthdeath.common.contract.ParentInfo;
+import org.bel.birthdeath.common.contract.ParentInfoProvider;
+import org.bel.birthdeath.common.model.user.User;
 
 @Getter
 @Setter
 @ToString
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class EgBirthDtl{
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class EgBirthDtl implements ParentInfoProvider {
 
 	private String id;
 
@@ -70,7 +75,9 @@ public class EgBirthDtl{
 	private String hospitalid;
 
 	private EgBirthFatherInfo birthFatherInfo;
-
+
+	private User user;
+
 	private EgBirthMotherInfo birthMotherInfo;
 
 	private EgBirthPermaddr birthPermaddr;
@@ -84,4 +91,14 @@ public class EgBirthDtl{
 	private String fullName;
 
 	private Boolean isLegacyRecord = false;
+
+	@Override
+	public String getTenantid() {
+		return this.tenantid;
+	}
+
+	@Override
+	public ParentInfo getFatherInfo() {
+		return this.birthFatherInfo;
+	}
 }

birth-death-services/src/main/java/org/bel/birthdeath/birth/model/EgBirthFatherInfo.java

@@ -6,45 +6,41 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
+import org.bel.birthdeath.common.contract.ParentInfo;
 
 @Getter
 @Setter
 @ToString
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
-public class EgBirthFatherInfo {
+public class EgBirthFatherInfo implements ParentInfo {
 
 	private String id;
-
 	private String aadharno;
-
 	private String createdby;
-
 	private Long createdtime;
-
 	private String education;
-
 	private String emailid;
-
 	private String firstname;
-
 	private String lastname;
-
 	private String middlename;
-
 	private String mobileno;
-
 	private String nationality;
-
 	private String proffession;
-
 	private String religion;
-
 	private String lastmodifiedby;
-
 	private Long lastmodifiedtime;
-
 	private String fullName;
 
-}
+	// Step 3: Implement interface methods explicitly
+	@Override
+	public String getFirstname() {
+		return this.firstname;
+	}
+
+	@Override
+	public String getMobileno() {
+		return this.mobileno;
+	}
+}

birth-death-services/src/main/java/org/bel/birthdeath/birth/repository/BirthRepository.java

@@ -205,7 +205,8 @@ public EgovPdfResp saveBirthCertPdf(BirthPdfApplicationRequest pdfApplicationReq
 		try {
 		SimpleDateFormat format = new SimpleDateFormat("dd-MM-yyyy");	
 		pdfApplicationRequest.getBirthCertificate().forEach(cert-> {
-			String uiHost = config.getUiAppHost();
+			String stateLevelTenantId = centralInstanceUtil.getStateLevelTenant(cert.getTenantid());
+			String uiHost = config.getUiAppHostMap().get(stateLevelTenantId);
 			String birthCertPath = config.getBirthCertLink();
 			birthCertPath = birthCertPath.replace("$id",cert.getId());
 			birthCertPath = birthCertPath.replace("$tenantId",cert.getTenantid());
@@ -260,7 +261,7 @@ public List<EgBirthDtl> getBirthDtlsAll(SearchCriteria criteria ,RequestInfo req
 			birthDtls.forEach(birthDtl -> {
 				birthDtl.setBirthFatherInfo(encryptionDecryptionUtil.decryptObject(birthDtl.getBirthFatherInfo(), BirthDeathConstants.BND_DESCRYPT_KEY, EgBirthFatherInfo.class, requestInfo));
 				birthDtl.setBirthMotherInfo(encryptionDecryptionUtil.decryptObject(birthDtl.getBirthMotherInfo(), BirthDeathConstants.BND_DESCRYPT_KEY, EgBirthMotherInfo.class, requestInfo));
-				commonUtils.maskAndShowLast4Chars(birthDtl);
+//				commonUtils.maskAndShowLast4Chars(birthDtl);
 			});
 		}
         return birthDtls;

birth-death-services/src/main/java/org/bel/birthdeath/birth/repository/builder/BirthDtlAllQueryBuilder.java

@@ -23,10 +23,10 @@ public class BirthDtlAllQueryBuilder {
 
 	private static String QUERY_MASTER_FULL_ALL = "SELECT bdtl.id birthdtlid,bfat.id bfatid,bmot.id bmotid,bpmad.id bpmadid,bpsad.id bpsadid," +
 			"bdtl.tenantid tenantid, registrationno, dateofbirth, counter, gender , " + 
-			"CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Others'  END AS genderstr ," +
+			"CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Transgender' WHEN gender = '4' THEN 'Others' END AS genderstr ," +
 			"(select bh.hospitalname from {schema}.eg_birth_death_hospitals bh where bh.id=hospitalid)  AS hospitalname, placeofbirth, dateofreport, remarks," +
 			"hospitalid , informantsname , informantsaddress , islegacyrecord, " +
-			"bfat.firstname bfatfn ,bmot.firstname bmotfn , bdtl.firstname bdtlfn ," + 
+			"bfat.firstname bfatfn , bfat.mobileno bfatfmobileno, bmot.firstname bmotfn , bdtl.firstname bdtlfn ," +
 			"bfat.middlename bfatmn ,bmot.middlename bmotmn , bdtl.middlename bdtlmn ," + 
 			"bfat.lastname bfatln ,bmot.lastname bmotln , bdtl.lastname bdtlln ," + 
 			"bfat.aadharno bfataadharno ,bmot.aadharno bmotaadharno ," + 
@@ -47,9 +47,9 @@ public class BirthDtlAllQueryBuilder {
 			"left join {schema}.eg_birth_presentaddr bpsad on bpsad.birthdtlid = bdtl.id";
 
     private static String QUERY_MASTER_ALL = "SELECT bdtl.id birthdtlid, bdtl.tenantid tenantid, registrationno, dateofbirth, counter, gender , "
-    		+ "CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Others'  END AS genderstr ,"
+    		+"CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Transgender' WHEN gender = '4' THEN 'Others' END AS genderstr ," 
     		+ " (select bh.hospitalname from {schema}.eg_birth_death_hospitals bh where bh.id=hospitalid)  AS hospitalname, placeofbirth, dateofreport, remarks, "
-    		+ "bfat.firstname bfatfn ,bmot.firstname bmotfn , bdtl.firstname bdtlfn ,"
+    		+ "bfat.firstname bfatfn ,bfat.mobileno bfatfmobileno, bmot.firstname bmotfn , bdtl.firstname bdtlfn ,"
     		+ "bfat.middlename bfatmn ,bmot.middlename bmotmn , bdtl.middlename bdtlmn ,"
     		+ "bfat.lastname bfatln ,bmot.lastname bmotln , bdtl.lastname bdtlln ,"
     		+ "bpmad.houseno pmhouseno,bpmad.buildingno pmbuildingno,bpmad.streetname pmstreetname,bpmad.locality pmlocality,bpmad.tehsil pmtehsil,"
@@ -64,20 +64,26 @@ public class BirthDtlAllQueryBuilder {
     		"left join {schema}.eg_birth_presentaddr bpsad on bpsad.birthdtlid = bdtl.id ";
 
     private static final String QUERY_MASTER = "SELECT bdtl.id birthdtlid, tenantid, registrationno, dateofbirth, counter, gender ,hospitalname, "+
-    		"CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Others'  END AS genderstr ," +
+    		"CASE WHEN gender = '1' THEN 'Male' WHEN gender = '2' THEN 'Female' WHEN gender = '3' THEN 'Transgender' WHEN gender = '4' THEN 'Others' END AS genderstr ," +
     		" (select bh.hospitalname from {schema}.eg_birth_death_hospitals bh where bh.id=hospitalid)  AS hospitalname ,"+
-    		"bfat.firstname bfatfn ,bmot.firstname bmotfn , bdtl.firstname bdtlfn ,"+
+    		"bfat.firstname bfatfn ,bfat.mobileno bfatfmobileno, bmot.firstname bmotfn , bdtl.firstname bdtlfn ,"+
     		"bfat.middlename bfatmn ,bmot.middlename bmotmn , bdtl.middlename bdtlmn ,"+
     		"bfat.lastname bfatln ,bmot.lastname bmotln , bdtl.lastname bdtlln "+
     		"FROM {schema}.eg_birth_dtls bdtl " +
     		"left join {schema}.eg_birth_father_info bfat on bfat.birthdtlid = bdtl.id " +
     		"left join {schema}.eg_birth_mother_info bmot on bmot.birthdtlid = bdtl.id " ;
 
-    private static String APPLSQUERY ="select breq.birthCertificateNo, breq.createdtime, breq.status, bdtl.registrationno, bdtl.tenantid, "
+	private static String APPLSQUERY ="select breq.birthCertificateNo, breq.createdtime, breq.status, bdtl.registrationno, bdtl.tenantid, "
     		+ "concat(COALESCE(bdtl.firstname,'') , ' ', COALESCE(bdtl.middlename,'') ,' ', COALESCE(bdtl.lastname,'')) as name, "
-    		+ "CASE WHEN breq.lastmodifiedtime/1000 < (extract(epoch from NOW())-?*24*60*60) THEN 'EXPIRED' ELSE breq.filestoreid END as filestoreid "
-    		+ "from {schema}.eg_birth_cert_request breq left join {schema}.eg_birth_dtls bdtl on bdtl.id=breq.birthDtlId where  "
-    		+ "breq.createdby=? order by breq.createdtime DESC ";
+    		+ "CASE WHEN breq.lastmodifiedtime/1000 < (extract(epoch from NOW())-?*24*60*60) THEN 'EXPIRED' ELSE breq.filestoreid END as filestoreid, "
+    		+ "concat(COALESCE(bmot.firstname,'') , ' ', COALESCE(bmot.middlename,'') ,' ', COALESCE(bmot.lastname,'')) as mothername, "
+    		+ "concat(COALESCE(bfat.firstname,'') , ' ', COALESCE(bfat.middlename,'') ,' ', COALESCE(bfat.lastname,'')) as fathername, "
+    		+ "bdtl.dateofbirth as dateofbirth "
+    		+ "from {schema}.eg_birth_cert_request breq "
+    		+ "left join {schema}.eg_birth_dtls bdtl on bdtl.id=breq.birthDtlId "
+    		+ "left join {schema}.eg_birth_mother_info bmot on bmot.birthdtlid = bdtl.id "
+    		+ "left join {schema}.eg_birth_father_info bfat on bfat.birthdtlid = bdtl.id "
+    		+ "where breq.createdby=? order by breq.createdtime DESC ";
 
     private static final String PAGINATIONWRAPPER = "SELECT * FROM " +
             "(SELECT *, DENSE_RANK() OVER (ORDER BY dateofbirth DESC , birthdtlid) offset_ FROM " +

birth-death-services/src/main/java/org/bel/birthdeath/birth/repository/rowmapper/BirthCertApplnRowMapper.java

@@ -2,7 +2,10 @@
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -19,15 +22,47 @@ public class BirthCertApplnRowMapper implements ResultSetExtractor<List<BirthCer
 	@Override
 	public List<BirthCertAppln> extractData(ResultSet rs) throws SQLException, DataAccessException {
 		Map<String, BirthCertAppln> birthDtlMap = new LinkedHashMap<>();
+		SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
 		try {
 			while (rs.next()) {
 				String applNo = rs.getString("birthCertificateNo");
 				BirthCertAppln certReq = birthDtlMap.get(applNo);
 
 				if (certReq == null) {
-					certReq = BirthCertAppln.builder().applicationNumber(rs.getString("birthCertificateNo")).applicationDate(rs.getString("createdtime"))
-							.status(rs.getString("status")).regNo(rs.getString("registrationno")).tenantId(rs.getString("tenantid")).name(rs.getString("name"))
-							.applicationCategory("Birth").applicationType("CERT_DOWNLOAD").fileStoreId(rs.getString("filestoreid"))
+					// Format application date
+					String applicationDate = rs.getString("createdtime");
+
+					// Get date of birth in epoch format
+					String dateOfBirth = "NA";
+					Timestamp dobTimestamp = rs.getTimestamp("dateofbirth");
+					if (dobTimestamp != null) {
+						dateOfBirth = String.valueOf(dobTimestamp.getTime());
+					}
+
+					// Get parent names
+					String motherName = rs.getString("mothername");
+					if (motherName == null || motherName.trim().isEmpty()) {
+						motherName = "NA";
+					}
+
+					String fatherName = rs.getString("fathername");
+					if (fatherName == null || fatherName.trim().isEmpty()) {
+						fatherName = "NA";
+					}
+
+					certReq = BirthCertAppln.builder()
+							.applicationCategory("Birth")
+							.applicationType("CERT_DOWNLOAD")
+							.applicationNumber(applNo)
+							.applicationDate(applicationDate)
+							.regNo(rs.getString("registrationno"))
+							.name(rs.getString("name"))
+							.status(rs.getString("status"))
+							.tenantId(rs.getString("tenantid"))
+							.fileStoreId(rs.getString("filestoreid"))
+							.motherName(motherName)
+							.fatherName(fatherName)
+							.dateOfBirth(dateOfBirth)
 							.build();
 					birthDtlMap.put(applNo, certReq);
 				}
@@ -40,4 +75,4 @@ public List<BirthCertAppln> extractData(ResultSet rs) throws SQLException, DataA
 		return new ArrayList<> (birthDtlMap.values());
 	}
 
-}
+}

birth-death-services/src/main/java/org/bel/birthdeath/birth/repository/rowmapper/BirthDtlsAllRowMapper.java

@@ -35,7 +35,7 @@ public List<EgBirthDtl> extractData(ResultSet rs) throws SQLException, DataAcces
 							.aadharno(rs.getString("bmotaadharno")).build();
 					motherInfo.setFullName(utils.addfullName(motherInfo.getFirstname(),motherInfo.getMiddlename(),motherInfo.getLastname()));
 
-					EgBirthFatherInfo fatherInfo = EgBirthFatherInfo.builder().firstname(rs.getString("bfatfn")).middlename(rs.getString("bfatmn")).lastname(rs.getString("bfatln"))
+					EgBirthFatherInfo fatherInfo = EgBirthFatherInfo.builder().firstname(rs.getString("bfatfn")).middlename(rs.getString("bfatmn")).lastname(rs.getString("bfatln")).mobileno(rs.getString("bfatfmobileno"))
 							.aadharno(rs.getString("bfataadharno")).build();
 					fatherInfo.setFullName(utils.addfullName(fatherInfo.getFirstname(),fatherInfo.getMiddlename(),fatherInfo.getLastname()));
 
@@ -52,7 +52,7 @@ public List<EgBirthDtl> extractData(ResultSet rs) throws SQLException, DataAcces
 							presentaddr.getDistrict(),presentaddr.getCity(),presentaddr.getState(),presentaddr.getPinno(),presentaddr.getCountry()));
 
 					birthDtl = EgBirthDtl.builder().id(birthdtlid).registrationno(rs.getString("registrationno")).hospitalname(rs.getString("hospitalname")).dateofreport(rs.getTimestamp("dateofreport")).gender(rs.getInt("gender"))
-							.dateofbirth(rs.getTimestamp("dateofbirth")).counter(rs.getInt("counter")).genderStr(rs.getString("genderstr")).tenantid(rs.getString("tenantid")).dateofissue(System.currentTimeMillis())
+							.dateofbirth(rs.getTimestamp("dateofbirth")).counter(rs.getInt("counter")).genderStr(rs.getString("genderstr")).tenantid(rs.getString("tenantid")).dateofissue(rs.getTimestamp("dateofreport") != null ? rs.getTimestamp("dateofreport").getTime() : System.currentTimeMillis())
 							.firstname(rs.getString("bdtlfn")).middlename(rs.getString("bdtlmn")).lastname(rs.getString("bdtlln")).birthMotherInfo(motherInfo).birthFatherInfo(fatherInfo)
 							.birthPermaddr(permaddr).birthPresentaddr(presentaddr).placeofbirth(rs.getString("placeofbirth")).remarks(rs.getString("remarks"))
 							.build();