CCSD-578 fix

Author: salaudeenegov

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

@@ -31,4 +31,11 @@ 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/repository/builder/BirthDtlAllQueryBuilder.java

@@ -75,9 +75,15 @@ public class BirthDtlAllQueryBuilder {
 
     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);
 				}