From 257927273a97cfe4fdd4aa83e708a6b0db0c6672 Mon Sep 17 00:00:00 2001 From: indraniBan Date: Wed, 28 Aug 2024 23:41:57 +0530 Subject: [PATCH 1/4] 1097 searchUserByPhone api logic modified --- .../service/beneficiary/IEMRSearchUserServiceImpl.java | 9 +++++++-- src/main/resources/application.properties | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java index 322c371f..3c0f4a84 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java @@ -372,8 +372,13 @@ public List getBeneficiaryListFromMapper(List { BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel); - if (beneficiary.getAge() == 0) { - beneficiary.setAge(beneficiary.getActualAge()); +// if (beneficiary.getAge() == 0) { +// beneficiary.setAge(beneficiary.getActualAge()); +// } + if (beneficiary.getAge() == null) { + if(beneficiary.getActualAge() != null) { + beneficiary.setAge(beneficiary.getActualAge()); + } } beneficiary.setBenPhoneMaps(benPhoneMapper.benPhoneMapToResponseByID(beneficiaryModel)); beneficiary.setSexualOrientation( diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index db5021b4..566366f5 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -15,8 +15,8 @@ spring.jpa.hibernate.ddl-auto=none spring.jackson.serialization.fail-on-empty-beans=false spring.jpa.hibernate.show_sql=true spring.jpa.hibernate.format_sql=true -spring.http.multipart.max-request-size=1000MB -spring.http.multipart.max-file-size=1000MB +spring.servlet.multipart.max-request-size=1000MB +spring.servlet.multipart.max-file-size=1000MB ##sms details for CHO CHOSmsTemplate= CHO UPTSU SMS From 748f004b13311a6aa93ea9bc05dd59343ab8aa82 Mon Sep 17 00:00:00 2001 From: indraniBan Date: Thu, 29 Aug 2024 11:25:26 +0530 Subject: [PATCH 2/4] java-version file added --- .java-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.java-version b/.java-version index 62593409..7f83a844 100644 --- a/.java-version +++ b/.java-version @@ -1 +1 @@ -1.8 +17.0 \ No newline at end of file From 9db397eba12df2f4b2f3228df1e9ba0c129961ae Mon Sep 17 00:00:00 2001 From: indraniBan Date: Thu, 29 Aug 2024 13:40:31 +0530 Subject: [PATCH 3/4] 1097 searchuserbyphone api logic --- .../IEMRSearchUserServiceImpl.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java index 3c0f4a84..97b0fc11 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java @@ -198,7 +198,7 @@ private void addCreatedDateToOtherFields(BeneficiaryModel beneficiaryModel) { JsonNode otherFieldsNode = objectMapper.readTree(beneficiaryModel.getOtherFields()); // Convert createdDate to a string - String createdDateString = beneficiaryModel.getCreatedDate().toString(); + String createdDateString = beneficiaryModel.getCreatedDate().toString(); // Add createdDate to the JSON node ((ObjectNode) otherFieldsNode).put("createdDate", createdDateString); @@ -219,10 +219,9 @@ public List userExitsCheckWithHealthId_ABHAId(String healthID, List beneficiaryList = new ArrayList(); // search patient by ben id, call Identity API List listBen = null; - if(healthID.contains("@")) { - listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID, - auth, is1097); - }else { + if (healthID.contains("@")) { + listBen = identityBeneficiaryService.getBeneficiaryListByHealthID_ABHAAddress(healthID, auth, is1097); + } else { String healthIdNumber = getHealthId(healthID); listBen = identityBeneficiaryService.getBeneficiaryListByHealthIDNo_ABHAIDNo(healthIdNumber, auth, is1097); } @@ -232,6 +231,7 @@ public List userExitsCheckWithHealthId_ABHAId(String healthID, } return beneficiaryList; } + private String getHealthId(String healthID) { String healthIdNumber = null; if (null != healthID) { @@ -249,6 +249,7 @@ private String getHealthId(String healthID) { } return healthIdNumber; } + // search patient by healthidNo / ABHA Id No @Override public List userExitsCheckWithHealthIdNo_ABHAIdNo(String healthIDNo, String auth, Boolean is1097) @@ -372,13 +373,9 @@ public List getBeneficiaryListFromMapper(List { BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel); -// if (beneficiary.getAge() == 0) { -// beneficiary.setAge(beneficiary.getActualAge()); -// } - if (beneficiary.getAge() == null) { - if(beneficiary.getActualAge() != null) { - beneficiary.setAge(beneficiary.getActualAge()); - } + + if (beneficiary.getAge() == null && beneficiary.getActualAge() != null) { + beneficiary.setAge(beneficiary.getActualAge()); } beneficiary.setBenPhoneMaps(benPhoneMapper.benPhoneMapToResponseByID(beneficiaryModel)); beneficiary.setSexualOrientation( From 8c69fb3101605f3cfd99845a23850eb8d40851ce Mon Sep 17 00:00:00 2001 From: indraniBan Date: Mon, 2 Sep 2024 22:30:14 +0530 Subject: [PATCH 4/4] added dependency-check and corrected vulnerebilities --- pom.xml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index f7b57a56..037237cf 100644 --- a/pom.xml +++ b/pom.xml @@ -170,17 +170,17 @@ - + org.json @@ -261,7 +261,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 2.3.0 + 2.6.0 @@ -415,7 +415,7 @@ org.apache.poi poi-ooxml - 5.2.5 + 5.3.0 org.apache.xmlgraphics @@ -453,7 +453,7 @@ org.springframework spring-web - 6.1.6 + 6.1.12 @@ -466,7 +466,7 @@ org.glassfish.jersey.core jersey-common - 2.30.1 + 3.1.8 org.glassfish.jersey.core @@ -493,8 +493,17 @@ - commonapi-v1.0 + commonapi-v3.0.0 + + org.owasp + dependency-check-maven + 10.0.3 + + HTML + nvd + + org.apache.maven.plugins maven-jar-plugin