Skip to content

Allowing numbers with zero is search by phone number. #162

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

Merged
vishwab1 merged 2 commits into from
May 21, 2026
Merged

Allowing numbers with zero is search by phone number. #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f042a2
fix: aam-2313 phone number leading with zero - removed zero
snehar-nd May 21, 2026
3eec70f
fix: aam-2313 serach by user phone number fix for number leading with…
snehar-nd May 21, 2026
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
10 changes: 8 additions & 2 deletions src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,12 @@
List<MBeneficiarycontact> findByPreferredSMSPhoneNumOrderByBenContactsIDAsc(String smsPhoneNum);


@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);
// @Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum ")
// List<MBeneficiarycontact> findByAnyPhoneNum(@Param("phoneNum") String phoneNum);

Check warning on line 53 in src/main/java/com/iemr/common/identity/repo/BenContactRepo.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AZ5LErQNXwKvQzDbjRnU&open=AZ5LErQNXwKvQzDbjRnU&pullRequest=162

@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum IN :variants")
List<MBeneficiarycontact> findByAnyPhoneNum(@Param("variants") List<String> variants);



@Query("select c from MBeneficiarycontact c where c.preferredPhoneNum = :phoneNum or c.phoneNum1 = :phoneNum "
Expand All @@ -70,4 +74,6 @@
MBeneficiarycontact getWithVanSerialNoVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
@Param("vanID") Integer vanID);



}
14 changes: 13 additions & 1 deletion src/main/java/com/iemr/common/identity/service/IdentityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -555,7 +556,15 @@
List<BeneficiariesDTO> list = new ArrayList<>();

try {
List<MBeneficiarycontact> benContact = contactRepo.findByAnyPhoneNum(phoneNum);
// List<MBeneficiarycontact> benContact = contactRepo.findByAnyPhoneNum(phoneNum);

Check warning on line 559 in src/main/java/com/iemr/common/identity/service/IdentityService.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AZ5LErTOXwKvQzDbjRnV&open=AZ5LErTOXwKvQzDbjRnV&pullRequest=162

String clean = phoneNum.trim();
if (clean.startsWith("+91")) clean = clean.substring(3);
else if (clean.startsWith("91") && clean.length() == 12) clean = clean.substring(2);
else if (clean.startsWith("0") && clean.length() == 11) clean = clean.substring(1);

List<String> variants = Arrays.asList(clean, "0" + clean, "91" + clean, "+91" + clean);
List<MBeneficiarycontact> benContact = contactRepo.findByAnyPhoneNum(variants);

logger.info(benContact.size() + " contacts found for phone number " + phoneNum);

Expand Down Expand Up @@ -1679,6 +1688,9 @@
} else if (cleaned.startsWith("91") && cleaned.length() == 12) {
// Handle case where + is already removed but 91 remains
cleaned = cleaned.substring(2);
} else if (cleaned.startsWith("0") && cleaned.length() == 11) {
// Handle case where number starts with 0 and is 11 digits long
cleaned = cleaned.substring(1);
}

return cleaned.trim();
Expand Down
Loading