From ff301e459589aa4cd0c105e3f184f4d78c7f7d83 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Fri, 21 Mar 2025 13:45:30 +0530 Subject: [PATCH 1/6] AMM-1217 --- pom.xml | 6 +-- .../identity/repo/BenFamilyMappingRepo.java | 2 + .../common/identity/repo/BenIdentityRepo.java | 2 + .../common/identity/repo/BenMappingRepo.java | 5 +++ .../identity/repo/BenServiceMappingRepo.java | 4 ++ .../identity/service/IdentityService.java | 40 ++++++++++++++----- 6 files changed, 47 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 9b881e3d..14df17d3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 17 jdt_apt 1.2.0.Final - 1.18.22 + 1.18.36 ${ENV_VAR} target/classes/application.properties target/classes/common_${environment}.properties @@ -292,7 +292,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.14.0 ${java.version} ${java.version} @@ -300,7 +300,7 @@ org.projectlombok lombok - ${lombok.version} + ${org.projectlombok.version} org.mapstruct diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java index f4f55096..f15a8e4d 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; +import com.iemr.common.identity.domain.MBeneficiaryidentity; @Repository public interface BenFamilyMappingRepo extends CrudRepository { @@ -50,5 +51,6 @@ List findByCreatedDateBetweenOrderByBenFamilyMapIdAsc @Modifying @Query(" UPDATE MBeneficiaryfamilymapping set vanSerialNo = :benFamilyMapId WHERE benFamilyMapId = :benFamilyMapId") int updateVanSerialNo(@Param("benFamilyMapId") BigInteger benFamilyMapId); + } diff --git a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java index c3f4bc8a..e20315c3 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiaryidentity; +import com.iemr.common.identity.domain.MBeneficiaryservicemapping; @Repository public interface BenIdentityRepo extends CrudRepository { @@ -88,4 +89,5 @@ List findByBenMapIdAndVanID(@Param("benMapId") BigInteger @Query(value = "select i from MBeneficiaryidentity i where i.identityNo = :identityNo") List searchByIdentityNo(@Param("identityNo") String identityNo); + } 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 fcb3c99d..e3080a5d 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java @@ -33,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiarymapping; +import com.iemr.common.identity.domain.MBeneficiaryservicemapping; import com.iemr.common.identity.domain.VBenAdvanceSearch; import com.iemr.common.identity.dto.IdentityDTO; import com.iemr.common.identity.dto.IdentitySearchDTO; @@ -137,4 +138,8 @@ Long getBeneficiaryCountsByVillageIDAndLastModifyDate(@Param("villageIDs") List< +"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); + + @Query("SELECT a FROM MBeneficiarymapping a WHERE a.vanSerialNo =:vanSerialNo AND a.vanID =:vanID ") + MBeneficiarymapping getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo, + @Param("vanID") Integer vanID); } diff --git a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java index 15801662..49ed72d1 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenServiceMappingRepo.java @@ -82,4 +82,8 @@ Long countByProviderServiceMapIdAndRegisteredDateBetween(Integer registeredProvi @Modifying @Query(" UPDATE MBeneficiaryservicemapping set vanSerialNo = :benServiceMapID WHERE benServiceMapID = :benServiceMapID ") int updateVanSerialNo(@Param("benServiceMapID") BigInteger benServiceMapID); + + @Query("SELECT a FROM MBeneficiaryservicemapping a WHERE a.benMapId =:benMapId AND a.vanID =:vanID ") + List getWithVanSerialNoVanID(@Param("benMapId") BigInteger benMapId, + @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 8a0caa83..c123eebb 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -573,12 +573,34 @@ public List searhBeneficiaryByGovIdentity(String identity) } private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { - MBeneficiarymapping benMapOBJ = new MBeneficiarymapping(); + MBeneficiarymapping mapping = new MBeneficiarymapping(); if (benMapArr != null && benMapArr.length == 12 && benMapArr[8] != null && benMapArr[9] != null) { - benMapOBJ.setBenMapId(getBigIntegerValueFromObject(benMapArr[0])); - benMapOBJ.setCreatedBy(String.valueOf(benMapArr[10])); - benMapOBJ.setCreatedDate((Timestamp) benMapArr[11]); - benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); + mapping.setBenMapId(getBigIntegerValueFromObject(benMapArr[0])); + mapping.setCreatedBy(String.valueOf(benMapArr[10])); + mapping.setCreatedDate((Timestamp) benMapArr[11]); + mapping = mappingRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); + MBeneficiaryaddress address = addressRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[1]), (Integer) benMapArr[8]); + MBeneficiaryconsent consent = consentRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[2]), (Integer) benMapArr[8]); + MBeneficiarycontact contact = contactRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[3]), (Integer) benMapArr[8]); + MBeneficiarydetail details = detailRepo.getWith_vanSerialNo_vanID(getBigIntegerValueFromObject(benMapArr[4]), (Integer) benMapArr[8]); + MBeneficiaryregidmapping regidmapping = regIdRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[5]), (Integer) benMapArr[8]); + MBeneficiaryAccount account = accountRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[7]), (Integer) benMapArr[8]); + MBeneficiaryImage image = imageRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[6]), (Integer) benMapArr[8]); + List servicemap = serviceMapRepo.getWithVanSerialNoVanID(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + List identity = identityRepo.findByBenMapIdAndVanID(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + List familymapping = familyMapRepo.findByBenMapIdAndVanIDOrderByBenFamilyMapIdAsc(getBigIntegerValueFromObject(benMapArr[0]), (Integer) benMapArr[8]); + + mapping.setMBeneficiaryaddress(address); + mapping.setMBeneficiaryconsent(consent); + mapping.setMBeneficiarycontact(contact); + mapping.setMBeneficiarydetail(details); + mapping.setMBeneficiaryfamilymappings(familymapping); + mapping.setMBeneficiaryidentities(identity); + mapping.setMBeneficiaryImage(image); + mapping.setMBeneficiaryregidmapping(regidmapping); + mapping.setMBeneficiaryservicemappings(servicemap); + mapping.setMBeneficiaryAccount(account); + //benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]); @@ -588,15 +610,15 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { if (obj != null) { if (obj.getHouseoldId() != null) - benMapOBJ.setHouseHoldID(obj.getHouseoldId()); + mapping.setHouseHoldID(obj.getHouseoldId()); if (obj.getGuidelineId() != null) - benMapOBJ.setGuideLineID(obj.getGuidelineId()); + mapping.setGuideLineID(obj.getGuidelineId()); if (obj.getRchid() != null) - benMapOBJ.setRchID(obj.getRchid()); + mapping.setRchID(obj.getRchid()); } } - return benMapOBJ; + return mapping; } private MBeneficiarymapping getBeneficiariesDTONewPartial(Object[] benMapArr) { MBeneficiarymapping benMapOBJ = new MBeneficiarymapping(); From ecabd888b8666c1df6431644e5dbf1df20f84766 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Fri, 21 Mar 2025 13:59:13 +0530 Subject: [PATCH 2/6] removed unused imports --- src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java index e20315c3..f194f027 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenIdentityRepo.java @@ -33,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiaryidentity; -import com.iemr.common.identity.domain.MBeneficiaryservicemapping; @Repository public interface BenIdentityRepo extends CrudRepository { From 4030d5635fa5f14c5b7eaff576409c4b6a0ed7fb Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Tue, 25 Mar 2025 17:59:47 +0530 Subject: [PATCH 3/6] removed unused imports --- .../java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java index f15a8e4d..3310adab 100644 --- a/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/BenFamilyMappingRepo.java @@ -33,7 +33,6 @@ import org.springframework.transaction.annotation.Transactional; import com.iemr.common.identity.domain.MBeneficiaryfamilymapping; -import com.iemr.common.identity.domain.MBeneficiaryidentity; @Repository public interface BenFamilyMappingRepo extends CrudRepository { From 1d2e222f193c9e83cb113c641ae693e894f0c9e1 Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Wed, 2 Apr 2025 12:46:21 +0530 Subject: [PATCH 4/6] AMM-1252 --- .../iemr/common/identity/service/IdentityService.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 c123eebb..21bfbc50 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -35,6 +35,7 @@ import javax.sql.DataSource; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -1607,13 +1608,15 @@ public List getBeneficiariesDeatilsByBenRegIdList(List floatList = new ArrayList<>(); - for (String str : stringNumbers) { - floatList.add(Float.parseFloat(str)); + if(!StringUtils.isEmpty(trimmedInput)) { + String[] stringNumbers = trimmedInput.split(",\\s*"); + for (String str : stringNumbers) { + floatList.add(Float.parseFloat(str)); + } } bdto.setFaceEmbedding(floatList); } From 5670ba579678da04efc23af359a50b14c5cb85cc Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Thu, 17 Apr 2025 17:58:32 +0530 Subject: [PATCH 5/6] swagger changes --- src/main/environment/1097_ci.properties | 6 +++++- src/main/environment/common_ci.properties | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/environment/1097_ci.properties b/src/main/environment/1097_ci.properties index a2ddb2ec..667dcd8f 100644 --- a/src/main/environment/1097_ci.properties +++ b/src/main/environment/1097_ci.properties @@ -5,4 +5,8 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver #ELK logging file name -logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@ \ No newline at end of file +logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@ + +springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ +springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ + diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 641d6ca1..32cb2713 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -5,4 +5,7 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@ spring.datasource.driver-class-name=com.mysql.jdbc.Driver #ELK logging file name -logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@ \ No newline at end of file +logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@ + +springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ +springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ From f679f75fbeb4aeb550fea19f56d6d20d8bdbad2f Mon Sep 17 00:00:00 2001 From: Ravi Shanigarapu Date: Thu, 15 May 2025 09:20:22 +0530 Subject: [PATCH 6/6] bug(Identity-API) Edit family tagging null condition added --- .../identity/service/familyTagging/FamilyTagServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java index f890f693..2a60571b 100644 --- a/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java +++ b/src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java @@ -157,7 +157,7 @@ public String editFamilyDetails(String request) throws IEMRException { if (benFamilyRS != null) { if (benFamilyObj.getIsHeadOfTheFamily() != null && benFamilyObj.getMemberName() != null) { - if(benFamilyRS.getFamilyHeadName().trim().equals(benFamilyObj.getMemberName().trim()) && Boolean.TRUE.equals(!benFamilyObj.getIsHeadOfTheFamily())) + if(null != benFamilyRS.getFamilyHeadName() && benFamilyRS.getFamilyHeadName().trim().equals(benFamilyObj.getMemberName().trim()) && Boolean.TRUE.equals(!benFamilyObj.getIsHeadOfTheFamily())) benFamilyRS.setFamilyHeadName(""); else benFamilyRS.setFamilyHeadName(benFamilyObj.getMemberName());