Skip to content

Merge Release 3.6.2 to Main#163

Merged
vishwab1 merged 30 commits into
mainfrom
release-3.6.2
May 22, 2026
Merged

Merge Release 3.6.2 to Main#163
vishwab1 merged 30 commits into
mainfrom
release-3.6.2

Conversation

@vanitha1822
Copy link
Copy Markdown
Member

📋 Description

JIRA ID:

Please provide a summary of the change and the motivation behind it. Include relevant context and details.


✅ Type of Change

  • 🐞 Bug fix (non-breaking change which resolves an issue)
  • New feature (non-breaking change which adds functionality)
  • 🔥 Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • 🛠 Refactor (change that is neither a fix nor a new feature)
  • ⚙️ Config change (configuration file or build script updates)
  • 📚 Documentation (updates to docs or readme)
  • 🧪 Tests (adding new or updating existing tests)
  • 🎨 UI/UX (changes that affect the user interface)
  • 🚀 Performance (improves performance)
  • 🧹 Chore (miscellaneous changes that don't modify src or test files)

ℹ️ Additional Information

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

vanitha1822 and others added 29 commits January 8, 2026 09:27
* 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: 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: ES Exception

* fix: ES exception
* fix: ES Exception

* fix: ES exception
* fix: enable multi-word fuzzy search requirement

* Downgrade version from 3.6.2 to 3.6.1
* fix: column mismatch issue

* fix: update marital status
add new column in rmnch table for death and child record
* 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: 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>
* fix: add the missing properties

* fix: update db url
convertIdentityEditDTOToMBeneficiarydetail() was missing sexualOrientationID
and sexualOrientationType, so the field was never persisted on update.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* 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>
- 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>
…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>
Get all family tag data for beneficiary ID
Family members list is not displaying properly
* fix: aam-2313 phone number leading with zero - removed zero

* fix: aam-2313 serach by user phone number fix for number leading with zero
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 22, 2026

Warning

Rate limit exceeded

@vanitha1822 has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 56 minutes and 8 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 08d90002-d3d7-4034-a4df-72871324440e

📥 Commits

Reviewing files that changed from the base of the PR and between 8e63ae4 and 26f29a8.

📒 Files selected for processing (13)
  • CLAUDE.md
  • pom.xml
  • src/main/environment/1097_ci.properties
  • src/main/environment/1097_example.properties
  • src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
  • src/main/java/com/iemr/common/identity/repo/BenContactRepo.java
  • src/main/java/com/iemr/common/identity/repo/BenRegIdMappingRepo.java
  • src/main/java/com/iemr/common/identity/repo/familyTag/FamilyTagRepo.java
  • src/main/java/com/iemr/common/identity/service/BenRegIdClaimService.java
  • src/main/java/com/iemr/common/identity/service/IdentityService.java
  • src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagService.java
  • src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java
  • src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch release-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

@vanitha1822 vanitha1822 self-assigned this May 22, 2026
@vishwab1 vishwab1 merged commit 6e0d0f7 into main May 22, 2026
3 of 4 checks passed
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.

5 participants