Skip to content

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

Merged
vishwab1 merged 2 commits into
release-3.6.2from
sn/3.6.2
May 21, 2026
Merged

Allowing numbers with zero is search by phone number.#162
vishwab1 merged 2 commits into
release-3.6.2from
sn/3.6.2

Conversation

@snehar-nd
Copy link
Copy Markdown
Contributor

📋 Description

JIRA ID:

AMM-2313


✅ Type of Change

  • 🐞 Bug fix (non-breaking change which resolves an issue)

ℹ️ Additional Information

Please describe how the changes were tested, and include any relevant screenshots, logs, or other information that provides additional context.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 21, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 3747da52-a902-4bb2-9f46-49aa246e5cda

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch sn/3.6.2

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@sonarqubecloud
Copy link
Copy Markdown

@vishwab1 vishwab1 merged commit f9471c8 into release-3.6.2 May 21, 2026
4 checks passed
vishwab1 pushed a commit that referenced this pull request May 22, 2026
* Elasticsearch implementation for Beneficiary Search (#123)

* fix: ES Implementation-mapping, indexing and async records

* fix: add service for ES Search

* fix: search implementation

* fix: add additional fields as per the requirement

* fix: comment extra fields

* fix: rename the files, remove commented code

* fix: update pom.xml

* fix: revert advancesearch

* fix: add properties

* fix: coderabbit comments

* fix: remove comment code

* fix: accept numeric values for search

* fix: update the env variable

* fix: advance search functionality

* fix: update the advance search ES functionality

* fix: sync and fetch benid

* fix: size limit issue

* fix: improve response time

* fix: updated the end point to advancedSearchES

* fix: age issue while moving to nurse worklist (#130)

* Optimize the Elasticsearch for better Response Time (#131)

* fix: optimize the index and reduce the size

* fix: align indent

* fix: abha / health id issue

* fix: sync optimization

* fix: get abha created date

* fix: state issue

* fix: village issue

* fix: add abha details

* fix: abha fix and refresh index

* fix: refresh index

* fix: remove duplicate dependency

* fix: fuzzy search, resume, refresh api's

* fix: add middlename, maritalstatus

* fix: remove refresh while bulk indexing

* fix: add license

* fix: remove the bean function to create the index automatically (#133)

* Fix ES Issue in the Query (#137)

* fix: ES Exception

* fix: ES exception

* Nd/vs/fix es (#138)

* fix: ES Exception

* fix: ES exception

* fix: enable multi-word fuzzy search requirement (#139)

* fix: enable multi-word fuzzy search requirement

* Downgrade version from 3.6.2 to 3.6.1

* fix: multi-word search (#140)

* Fix the column mismatch issue in beneficiary search (#142)

* fix: column mismatch issue

* fix: update marital status

* add new column in rmnch table for death and child record

* add new column in rmnch table for death and child record

* Cherry-pick health and version API enhancements to release-3.6.1 (#145)

* feat(health,version): add health and version endpoints

* feat(health,version): add health and version endpoints without auth

* fix(health):  remove unused private methods

* fix(health): fix exception issue

* fix(health): redact error details for unauthenticated health checks

* fix code quality issues and reduce cognitive complexity

* feat(health): add MySQL health endpoint

* refactor(health): simplify MySQL health check and remove sensitive details

* fix(health): remove unused imports and variables

* refactor(health): address nitpicks (configurable ES scheme, log noise, graceful shutdown, record)

* fix(health): scope PROCESSLIST lock-wait check to application DB user

* refactor(health): remove unused params and reuse response/error constants

* fix(health): remove unused imports and methods

* chore(health): clean up unused imports, params, and dead helpers

* fix(health): avoid sharing JDBC connections across threads in advanced MySQL checks

* refactor(health): reuse REDIS_COMPONENT constant and extract nested try block

* fix(health): avoid blocking DB I/O under write lock and restore interrupt flag

* fix(health): cancel in-flight futures on generic failure

* feat(health,version): add index existance, read-only detection, canary write for elasticsearch health check

* refactor(health): reduce cognitive complexity, remove dead throws, and clean code smells

* Rebase 3.6.2 (#150)

* fix: enable multi-word fuzzy search requirement (#139)

* fix: enable multi-word fuzzy search requirement

* Downgrade version from 3.6.2 to 3.6.1

* fix: multi-word search (#140)

* Fix the column mismatch issue in beneficiary search (#142)

* fix: column mismatch issue

* fix: update marital status

* add new column in rmnch table for death and child record

* add new column in rmnch table for death and child record

* Cherry-pick health and version API enhancements to release-3.6.1 (#145)

* feat(health,version): add health and version endpoints

* feat(health,version): add health and version endpoints without auth

* fix(health):  remove unused private methods

* fix(health): fix exception issue

* fix(health): redact error details for unauthenticated health checks

* fix code quality issues and reduce cognitive complexity

* feat(health): add MySQL health endpoint

* refactor(health): simplify MySQL health check and remove sensitive details

* fix(health): remove unused imports and variables

* refactor(health): address nitpicks (configurable ES scheme, log noise, graceful shutdown, record)

* fix(health): scope PROCESSLIST lock-wait check to application DB user

* refactor(health): remove unused params and reuse response/error constants

* fix(health): remove unused imports and methods

* chore(health): clean up unused imports, params, and dead helpers

* fix(health): avoid sharing JDBC connections across threads in advanced MySQL checks

* refactor(health): reuse REDIS_COMPONENT constant and extract nested try block

* fix(health): avoid blocking DB I/O under write lock and restore interrupt flag

* fix(health): cancel in-flight futures on generic failure

* feat(health,version): add index existance, read-only detection, canary write for elasticsearch health check

* refactor(health): reduce cognitive complexity, remove dead throws, and clean code smells

---------

Co-authored-by: Saurav Mishra <saurav.mishra@bizbrolly.com>
Co-authored-by: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com>
Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>

* feat(jwt): enhance jwt validation logging and public endpoint check (#151)

* fix: pom version (#152)

* Add the missing properties for 1097_Preprod (#153)

* fix: add the missing properties

* fix: update db url

* docs: add CLAUDE.md for Claude Code guidance

* fix: map sexualOrientationID during beneficiary update in 1097

convertIdentityEditDTOToMBeneficiarydetail() was missing sexualOrientationID
and sexualOrientationType, so the field was never persisted on update.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* Sexual orientation data not reflecting under DB record (#157)

* fix: enable multi-word fuzzy search requirement (#139)

* fix: enable multi-word fuzzy search requirement

* Downgrade version from 3.6.2 to 3.6.1

* fix: multi-word search (#140)

* Fix the column mismatch issue in beneficiary search (#142)

* fix: column mismatch issue

* fix: update marital status

* add new column in rmnch table for death and child record

* add new column in rmnch table for death and child record

* Cherry-pick health and version API enhancements to release-3.6.1 (#145)

* feat(health,version): add health and version endpoints

* feat(health,version): add health and version endpoints without auth

* fix(health):  remove unused private methods

* fix(health): fix exception issue

* fix(health): redact error details for unauthenticated health checks

* fix code quality issues and reduce cognitive complexity

* feat(health): add MySQL health endpoint

* refactor(health): simplify MySQL health check and remove sensitive details

* fix(health): remove unused imports and variables

* refactor(health): address nitpicks (configurable ES scheme, log noise, graceful shutdown, record)

* fix(health): scope PROCESSLIST lock-wait check to application DB user

* refactor(health): remove unused params and reuse response/error constants

* fix(health): remove unused imports and methods

* chore(health): clean up unused imports, params, and dead helpers

* fix(health): avoid sharing JDBC connections across threads in advanced MySQL checks

* refactor(health): reuse REDIS_COMPONENT constant and extract nested try block

* fix(health): avoid blocking DB I/O under write lock and restore interrupt flag

* fix(health): cancel in-flight futures on generic failure

* feat(health,version): add index existance, read-only detection, canary write for elasticsearch health check

* refactor(health): reduce cognitive complexity, remove dead throws, and clean code smells

* fix: map sexualOrientationID during beneficiary update in 1097

convertIdentityEditDTOToMBeneficiarydetail() was missing sexualOrientationID
and sexualOrientationType, so the field was never persisted on update.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com>
Co-authored-by: Saurav Mishra <saurav.mishra@bizbrolly.com>
Co-authored-by: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com>
Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>

* feat: add getBenFamilyDetails API and fix searchFamily queries

- Add POST /family/getBenFamilyDetails endpoint that returns full family
  details (master record + all members) for a given beneficiaryRegId
- Fix searchFamily and searchFamilyWithFamilyId queries: replace
  noOfmembers > 0 guard with deleted=false filter so families with
  zero/null member count and soft-deleted records are handled correctly;
  also make villageId optional and use LIKE prefix match for familyName

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: preserve existing occupation and education when incoming values are null

During beneficiary edit, convertIdentityEditDTOToMBeneficiarydetail creates
a fresh entity and overwrites all columns on save. Added null-guards for
occupationId, occupation, educationId, and education so existing DB values
are preserved when the incoming DTO omits them — consistent with the existing
pattern for familyId and headOfFamily_Relation.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* fix: replace in-memory queue with SELECT FOR UPDATE SKIP LOCKED for BenRegId allocation (#159)

* aam-2126 Memeberlist is not displying properly

* fix: aam-2313 phone number leading with zero - removed zero (#161)

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

* fix: aam-2313 phone number leading with zero - removed zero

* fix: aam-2313 serach by user phone number fix for number leading with zero

---------

Co-authored-by: Saurav Mishra <saurav.mishra@bizbrolly.com>
Co-authored-by: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com>
Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
Co-authored-by: SnehaRH <sneha@navadhiti.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants