Skip to content

Merge Release 3.6.1 to main#146

Merged
drtechie merged 13 commits intomainfrom
release-3.6.1
Mar 19, 2026
Merged

Merge Release 3.6.1 to main#146
drtechie merged 13 commits intomainfrom
release-3.6.1

Conversation

@vanitha1822
Copy link
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 13 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
@coderabbitai
Copy link

coderabbitai bot commented Mar 19, 2026

Warning

Rate limit exceeded

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

⌛ 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: 9fb289d0-2b35-4036-a861-d27461316847

📥 Commits

Reviewing files that changed from the base of the PR and between 2ed618d and 3703ac6.

📒 Files selected for processing (36)
  • pom.xml
  • src/main/environment/common_ci.properties
  • src/main/environment/common_docker.properties
  • src/main/environment/common_example.properties
  • src/main/java/com/iemr/common/identity/IdentityApplication.java
  • src/main/java/com/iemr/common/identity/config/ElasticsearchConfig.java
  • src/main/java/com/iemr/common/identity/config/ElasticsearchSyncConfig.java
  • src/main/java/com/iemr/common/identity/controller/IdentityESController.java
  • src/main/java/com/iemr/common/identity/controller/elasticsearch/ElasticsearchSyncController.java
  • src/main/java/com/iemr/common/identity/controller/health/HealthController.java
  • src/main/java/com/iemr/common/identity/controller/version/VersionController.java
  • src/main/java/com/iemr/common/identity/data/elasticsearch/BeneficiaryDocument.java
  • src/main/java/com/iemr/common/identity/data/elasticsearch/ElasticsearchSyncJob.java
  • src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
  • src/main/java/com/iemr/common/identity/domain/User.java
  • src/main/java/com/iemr/common/identity/dto/BeneficiariesESDTO.java
  • src/main/java/com/iemr/common/identity/mapper/BeneficiaryESMapper.java
  • src/main/java/com/iemr/common/identity/repo/BenAddressRepo.java
  • src/main/java/com/iemr/common/identity/repo/BenDetailRepo.java
  • src/main/java/com/iemr/common/identity/repo/BenMappingRepo.java
  • src/main/java/com/iemr/common/identity/repo/V_BenAdvanceSearchRepo.java
  • src/main/java/com/iemr/common/identity/repo/elasticsearch/SyncJobRepo.java
  • src/main/java/com/iemr/common/identity/service/IdentityService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/BeneficiaryDocumentDataService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/BeneficiaryElasticsearchIndexService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/BeneficiaryElasticsearchIndexUpdater.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/BeneficiaryTransactionHelper.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/ElasticsearchIndexingService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/ElasticsearchService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/ElasticsearchSyncService.java
  • src/main/java/com/iemr/common/identity/service/elasticsearch/SyncJobService.java
  • src/main/java/com/iemr/common/identity/service/health/HealthService.java
  • src/main/java/com/iemr/common/identity/utils/CookieUtil.java
  • src/main/java/com/iemr/common/identity/utils/JwtAuthenticationUtil.java
  • src/main/java/com/iemr/common/identity/utils/JwtUserIdValidationFilter.java
  • src/main/resources/application.properties
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch release-3.6.1
📝 Coding Plan
  • Generate coding plan for human review comments

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

Quality Gate Failed Quality Gate failed

Failed conditions
3.9% Duplication on New Code (required ≤ 3%)
E Security Rating on New Code (required ≥ A)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

elasticsearch.host=localhost
elasticsearch.port=9200
elasticsearch.username=elastic
elasticsearch.password=piramalES

Check notice

Code scanning / SonarCloud

Credentials should not be hard-coded Low

Make sure these credentials get revoked, changed, and removed from the code. See more on SonarQube Cloud
@RequestBody String searchFilter,
HttpServletRequest request) {

logger.info("IdentityESController.advanceSearchBeneficiariesES - start {}", searchFilter);

Check notice

Code scanning / SonarCloud

Logging should not be vulnerable to injection attacks Low

Change this code to not log user-controlled data. See more on SonarQube Cloud
// Check existence
boolean exists = transactionalWrapper.existsByBenRegId(benRegIdBig);
if (!exists) {
logger.error("Beneficiary does not exist in database: {}", benRegId);

Check notice

Code scanning / SonarCloud

Logging should not be vulnerable to injection attacks Low

Change this code to not log user-controlled data. See more on SonarQube Cloud
.id(doc.getBenId())
.document(doc).refresh(Refresh.True));

logger.info("SUCCESS! Beneficiary {} synced to Elasticsearch with ABHA", benRegId);

Check notice

Code scanning / SonarCloud

Logging should not be vulnerable to injection attacks Low

Change this code to not log user-controlled data. See more on SonarQube Cloud
@vanitha1822 vanitha1822 requested a review from drtechie March 19, 2026 10:03
@drtechie drtechie merged commit b33f298 into main Mar 19, 2026
1 of 3 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.

4 participants