From 9ffcdf2fd30468986c40960f15c5bafacd76b7a6 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 11 Dec 2024 15:59:55 +0530 Subject: [PATCH 1/4] Update beneficiary --- .../java/com/iemr/common/identity/service/IdentityService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index b8c32146..361a950f 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -963,6 +963,7 @@ private MBeneficiarydetail convertIdentityEditDTOToMBeneficiarydetail(IdentityEd beneficiarydetail.setAreaId(dto.getAreaId()); beneficiarydetail.setBeneficiaryRegID(dto.getBeneficiaryRegId()); beneficiarydetail.setCommunity(dto.getCommunity()); + beneficiarydetail.setLiteracyStatus(dto.getLiteracyStatus()); beneficiarydetail.setCommunityId(dto.getCommunityId()); beneficiarydetail.setDob(dto.getDob()); beneficiarydetail.setEducation(dto.getEducation()); From 9aa15cf7a7ab8ae5213060f250a87611e696d34b Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Fri, 14 Feb 2025 14:49:49 +0530 Subject: [PATCH 2/4] AMM-1224 --- .../iemr/common/identity/repo/BenMappingRepo.java | 15 ++++++++++++++- .../common/identity/service/IdentityService.java | 14 +++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java index e9ab9f8f..fcb3c99d 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java @@ -122,6 +122,19 @@ Long getBeneficiaryCountsByVillageIDAndLastModifyDate(@Param("villageIDs") List< @Param("lastModDate") Timestamp lastModifiedDate); - @Query("SELECT t FROM MBeneficiarymapping t WHERE t.vanSerialNo =:vanSerialNo AND t.vanID=:vanID") + //@Query("SELECT t FROM MBeneficiarymapping t WHERE t.vanSerialNo =:vanSerialNo AND t.vanID=:vanID") + @Query(value = "select bm FROM MBeneficiarymapping bm " + +"LEFT JOIN MBeneficiaryregidmapping brm ON brm.benRegId=bm.benRegId and brm.vanID=bm.vanID " + +"LEFT JOIN MBeneficiarycontact bc ON bc.vanSerialNo = bm.benContactsId and bm.vanID=bc.vanID " + +"LEFT JOIN MBeneficiarydetail bd on bm.benDetailsId = bd.vanSerialNo and bm.vanID=bd.vanID " + +"LEFT JOIN MBeneficiaryaddress ba ON ba.vanSerialNo = bm.benAddressId and bm.vanID=ba.vanID " + +"LEFT JOIN MBeneficiaryconsent bt on bt.vanSerialNo=bm.benConsentId and bm.vanID=bt.vanID " + //+"LEFT JOIN MBensecurestack bs on bs.benSecureStackId=bm.benSecureStackId and bm.vanID=bs.vanID " + +"LEFT JOIN MBeneficiaryImage bi on bi.vanSerialNo=bm.benImageId and bm.vanID=bi.vanID " + +"LEFT JOIN MBeneficiaryAccount bac on bac.vanSerialNo=bm.benAccountID and bm.vanID=bac.vanID " + +"LEFT JOIN MBeneficiaryidentity bid on bid.vanSerialNo=bm.benMapId and bm.vanID=bid.vanID " + +"LEFT JOIN MBeneficiaryfamilymapping bfm on bfm.vanSerialNo=bm.benMapId and bm.vanID=bfm.vanID " + +"LEFT JOIN MBeneficiaryservicemapping bsm on bsm.vanSerialNo=bm.benMapId and bm.vanID=bsm.vanID " + +"where bm.vanSerialNo=:vanSerialNo and bm.vanID=:vanID") MBeneficiarymapping getMapping(@Param("vanSerialNo") BigInteger vanSerialNo,@Param("vanID") Integer vanID); } diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index 361a950f..cab28218 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -59,6 +59,7 @@ import com.iemr.common.identity.domain.MBeneficiarymapping; import com.iemr.common.identity.domain.MBeneficiaryregidmapping; import com.iemr.common.identity.domain.MBeneficiaryservicemapping; +import com.iemr.common.identity.domain.TBendataaccess; import com.iemr.common.identity.domain.VBenAdvanceSearch; import com.iemr.common.identity.dto.AbhaAddressDTO; import com.iemr.common.identity.dto.BenIdImportDTO; @@ -92,8 +93,15 @@ import com.iemr.common.identity.utils.mapper.OutputMapper; import com.iemr.common.identity.utils.response.OutputResponse; +import jakarta.persistence.EntityManager; import jakarta.persistence.NoResultException; import jakarta.persistence.QueryTimeoutException; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; @Service public class IdentityService { @@ -101,6 +109,9 @@ public class IdentityService { public static final String CREATED_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; @Autowired private DataSource dataSource; + + @Autowired + private EntityManager entityManager; private JdbcTemplate jdbcTemplate; @@ -578,7 +589,8 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { benMapOBJ.setCreatedBy(String.valueOf(benMapArr[10])); benMapOBJ.setCreatedDate((Timestamp) benMapArr[11]); benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); - + + BigInteger benRegId = new BigInteger(benMapArr[5].toString()); RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo From a5a88bc4268c0b60f287ccc703394b007198ab09 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Fri, 14 Feb 2025 17:14:19 +0530 Subject: [PATCH 3/4] removed unused code --- .../common/identity/service/IdentityService.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index cab28218..8a0caa83 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -59,7 +59,6 @@ import com.iemr.common.identity.domain.MBeneficiarymapping; import com.iemr.common.identity.domain.MBeneficiaryregidmapping; import com.iemr.common.identity.domain.MBeneficiaryservicemapping; -import com.iemr.common.identity.domain.TBendataaccess; import com.iemr.common.identity.domain.VBenAdvanceSearch; import com.iemr.common.identity.dto.AbhaAddressDTO; import com.iemr.common.identity.dto.BenIdImportDTO; @@ -93,15 +92,9 @@ import com.iemr.common.identity.utils.mapper.OutputMapper; import com.iemr.common.identity.utils.response.OutputResponse; -import jakarta.persistence.EntityManager; import jakarta.persistence.NoResultException; import jakarta.persistence.QueryTimeoutException; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.JoinType; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; + @Service public class IdentityService { @@ -109,9 +102,6 @@ public class IdentityService { public static final String CREATED_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; @Autowired private DataSource dataSource; - - @Autowired - private EntityManager entityManager; private JdbcTemplate jdbcTemplate; From 887eee33b0543dfa3127d4ed2d04f77794b174b8 Mon Sep 17 00:00:00 2001 From: ravishanigarapu <133210792+ravishanigarapu@users.noreply.github.com> Date: Mon, 17 Feb 2025 10:24:59 +0530 Subject: [PATCH 4/4] Update package.yml --- .github/workflows/package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 6fa70bc5..50db3609 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -42,7 +42,7 @@ jobs: run: mvn -B package --file pom.xml - name: Upload WAR file as artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Identity-API path: target/identity-0.0.1.war