Skip to content

1097 searchUserByPhone api logic modified #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
helenKaryamsetty wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

1097 searchUserByPhone api logic modified #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2579272
1097 searchUserByPhone api logic modified
Aug 28, 2024
748f004
java-version file added
Aug 29, 2024
9db397e
1097 searchuserbyphone api logic
Aug 29, 2024
8c69fb3
added dependency-check and corrected vulnerebilities
Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .java-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8
17.0
25 changes: 17 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,17 +170,17 @@
</dependency>


<!--<dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.1</version>
<version>2.17.2</version>
<exclusions>
<exclusion>
<artifactId>org.json</artifactId>
<groupId>json</groupId>
</exclusion>
</exclusions>
</dependency>-->
</dependency>

<dependency>
<groupId>org.json</groupId>
Expand Down Expand Up @@ -261,7 +261,7 @@
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.3.0</version>
<version>2.6.0</version>

</dependency>

Expand Down Expand Up @@ -415,7 +415,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version>
<version>5.3.0</version>
<exclusions>
<exclusion>
<artifactId>org.apache.xmlgraphics</artifactId>
Expand Down Expand Up @@ -453,7 +453,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>6.1.6</version>
<version>6.1.12</version>
</dependency>

<dependency>
Expand All @@ -466,7 +466,7 @@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>2.30.1</version>
<version>3.1.8</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
Expand All @@ -493,8 +493,17 @@
</dependencies>

<build>
<finalName>commonapi-v1.0</finalName>
<finalName>commonapi-v3.0.0</finalName>
<plugins>
<plugin>
<groupId>org.owasp</groupId>
<artifactId>dependency-check-maven</artifactId>
<version>10.0.3</version>
<configuration>
<format>HTML</format>
<nvdApiServerId>nvd</nvdApiServerId>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand Down
14 changes: 8 additions & 6 deletions src/main/java/com/iemr/common/service/beneficiary/IEMRSearchUserServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -219,10 +219,9 @@ public List<BeneficiaryModel> userExitsCheckWithHealthId_ABHAId(String healthID,
List<BeneficiaryModel> beneficiaryList = new ArrayList<BeneficiaryModel>();
// search patient by ben id, call Identity API
List<BeneficiariesDTO> 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);
}
Expand All @@ -232,6 +231,7 @@ public List<BeneficiaryModel> userExitsCheckWithHealthId_ABHAId(String healthID,
}
return beneficiaryList;
}

private String getHealthId(String healthID) {
String healthIdNumber = null;
if (null != healthID) {
Expand All @@ -249,6 +249,7 @@ private String getHealthId(String healthID) {
}
return healthIdNumber;
}

// search patient by healthidNo / ABHA Id No
@Override
public List<BeneficiaryModel> userExitsCheckWithHealthIdNo_ABHAIdNo(String healthIDNo, String auth, Boolean is1097)
Expand Down Expand Up @@ -372,7 +373,8 @@ public List<BeneficiaryModel> getBeneficiaryListFromMapper(List<BeneficiariesDTO
benDetailForOutboundDTOList.forEach(beneficiaryModel -> {

BeneficiaryModel beneficiary = benCompleteMapper.benDetailForOutboundDTOToIBeneficiary(beneficiaryModel);
if (beneficiary.getAge() == 0) {

if (beneficiary.getAge() == null && beneficiary.getActualAge() != null) {
beneficiary.setAge(beneficiary.getActualAge());
}
beneficiary.setBenPhoneMaps(benPhoneMapper.benPhoneMapToResponseByID(beneficiaryModel));
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down