Merge with Main by vanitha1822 · Pull Request #151 · PSMRI/TM-API

vanitha1822 · 2026-05-22T06:46:15Z

📋 Description

JIRA ID:

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

✅ Type of Change

ℹ️ Additional Information

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

story: amm-1668 task - 1754

* story: amm-1668 task - 1754 dto updated * story: amm-1668 task - 1754

…tData. (#96) * Update version in pom.xml to 3.4.0 * story: amm-1668 task - 1754 * story: amm-1668 task - 1754 dto updated (#92) * story: amm-1668 task - 1754 dto updated (#93) * story: amm-1668 task - 1754 dto updated * story: amm-1668 task - 1754 * fix: amm-1879 doctor signature was not coming for ncdcare --------- Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com>

fix: aam-1896 prescribed quantity was not coming in the casesheet

3.4.0 to 3.4.1

fix: amm-1919 fix for update doctor data for higher refferal data

Fix the WASA Issue : IDOR Vulnerability

* fix: amm-1927 res headers based on origin via allowed cors * fix: amm-1927 coderabbit comments resolved * localhost regex added * Update regex pattern for localhost in interceptor

@PreAuthorize

* fix: add @PreAuthorize to RBAC * fix: wasa RBAC implementation * fix: remove duplicate dependency * fix: coderabbit comments * fix: update role * fix: enable the request matcher

Sn/3.5.1

…ated qntity

Implement Role-Based Access Control with JWT and Auth Integration

add role in register api

fix: amm-2063 added beneficiarytype but not reflecting in the DB level

Updating version from 3.6.0 to 3.6.2

fix: amm-2063 updated the updateBeneficiary flow

feat: amm-2175 dockendra ecg abnormal findings feature added

Amm 2175 api issue fix

Rebase 3.6.2 on 3.6.1

* fix: add labtech role for ecg controller * fix: add role

* fix: add labtech role for ecg controller * fix: add role * fix: url issue in download document * Remove authorization check from getKMFile method Removed authorization check for getKMFile endpoint.

* fix: beneficiary update url * fix: edit url * fix: update the url

This reverts commit 7284ca0.

coderabbitai · 2026-05-22T06:46:23Z

Warning

Rate limit exceeded

@vanitha1822 has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 49 minutes and 32 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: 81adf2f8-f696-41c2-90f6-f9f2a180510c

📥 Commits

Reviewing files that changed from the base of the PR and between 185a56a and f20a53c.

📒 Files selected for processing (13)

pom.xml
src/main/java/com/iemr/tm/controller/common/main/WorklistController.java
src/main/java/com/iemr/tm/controller/common/master/CommonMasterController.java
src/main/java/com/iemr/tm/data/labModule/ECGAbnormalFindingMaster.java
src/main/java/com/iemr/tm/data/labModule/LabResultEntry.java
src/main/java/com/iemr/tm/repo/labModule/ECGAbnormalFindingMasterRepo.java
src/main/java/com/iemr/tm/service/common/master/CommonMasterServiceImpl.java
src/main/java/com/iemr/tm/service/common/master/CommonMaterService.java
src/main/java/com/iemr/tm/service/common/transaction/CommonServiceImpl.java
src/main/java/com/iemr/tm/service/labtechnician/LabTechnicianServiceImpl.java
src/main/java/com/iemr/tm/utils/IntegerListConverter.java
src/main/java/com/iemr/tm/utils/StringListConverter.java
src/main/java/com/iemr/tm/utils/mapper/SecurityConfig.java

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch nd/vs/merge-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 · 2026-05-22T06:47:37Z

Quality Gate failed

Failed conditions
17.6% Duplication on New Code (required ≤ 3%)

See analysis details on SonarQube Cloud

5Amogh and others added 30 commits July 21, 2025 11:57

Update version in pom.xml to 3.4.0

db7796b

story: amm-1668 task - 1754

1652329

Merge pull request #91 from PSMRI/amo-3.4

dd39e29

story: amm-1668 task - 1754

story: amm-1668 task - 1754 dto updated (#92)

cf8ad95

story: amm-1668 task - 1754 dto updated (#93)

317ae6f

* story: amm-1668 task - 1754 dto updated * story: amm-1668 task - 1754

fix: amm-1879 doctor signature was not coming for ncdcare

784f42f

fix: aam-1896 prescribed quantity was not coming in the casesheet

3cecdb8

Merge pull request #99 from PSMRI/sn/3.5.1

2806427

fix: aam-1896 prescribed quantity was not coming in the casesheet

Update pom.xml

cfcaba1

3.4.0 to 3.4.1

fix: amm-1919 fix for update doctor data for higher refferal data

f3df470

Merge pull request #100 from PSMRI/sn/3.5.1

0068d0e

fix: amm-1919 fix for update doctor data for higher refferal data

fix: signature enhancement for casesheet

e5aa845

fix: signature enhancement for casesheet

e8f5ba2

fix: signature enhancement for casesheet

a1766fd

fix: signature enhancement for casesheet for ncdscreening

3647439

fix: updated beneficiaryflowststusrepo file

7f43bb3

fix: wasa-IDOR Vulnerability

b23f4c7

fix: coderabbit comments

9cd210c

fix: amm-1927 res headers based on origin via allowed cors

5e5aca1

fix: amm-1927 coderabbit comments resolved

c8f1b33

localhost regex added

8b431b6

Update regex pattern for localhost in interceptor

ce2a0b0

fix: remove userid from request

c455c66

Merge pull request #102 from PSMRI/nd/vs/wasa_1922

5dbf22f

Fix the WASA Issue : IDOR Vulnerability

fix: amm-1927 res headers based on origin via allowed cors (#103)

eb786bf

* fix: amm-1927 res headers based on origin via allowed cors * fix: amm-1927 coderabbit comments resolved * localhost regex added * Update regex pattern for localhost in interceptor

Role Based Broken Access Control Implementation : WASA (#104)

2e76160

* fix: add @PreAuthorize to RBAC * fix: wasa RBAC implementation * fix: remove duplicate dependency * fix: coderabbit comments * fix: update role * fix: enable the request matcher

fix:1896 added space for single dose after food string due

67952c6

Merge pull request #105 from PSMRI/sn/3.5.1

844ed52

Sn/3.5.1

fix:1896 added single dose after and before food confition for calcul…

c7b4dac

…ated qntity

vanitha1822 and others added 24 commits December 17, 2025 15:47

fix: role based on both jwt and auth token

4e626a5

Merge pull request #121 from PSMRI/nd/vs/rbac_authtoken

09a9511

Implement Role-Based Access Control with JWT and Auth Integration

add role in register api

7929c79

Merge pull request #122 from PSMRI/fix/add_role_in_registerapi

cf1492b

add role in register api

fix: amm-2063 added beneficiarytype but not reflecting in the DB level

d549203

Merge pull request #125 from PSMRI/sn/3.6.1

966aef4

fix: amm-2063 added beneficiarytype but not reflecting in the DB level

Bump version from 3.6.0 to 3.6.2

9b6a94b

Merge pull request #126 from PSMRI/snehar-nd-patch-1

3fbbb79

Updating version from 3.6.0 to 3.6.2

fix: amm-2063 updated the updateBeneficiary flow

41a496e

Merge pull request #128 from PSMRI/sn/3.6.1

537cedf

fix: amm-2063 updated the updateBeneficiary flow

feat: amm-2175 ecg abnormal findings feature added

833d8b9

Merge pull request #133 from PSMRI/amm-2175

90a931a

feat: amm-2175 dockendra ecg abnormal findings feature added

fix: amm-2175 api issue fix

d9506a9

fix: amm-2175 api issue fix

7dc4053

Merge pull request #135 from PSMRI/amm-2175

6e856d1

Amm 2175 api issue fix

fix: rebase with 3.6.1

8edc363

Merge pull request #142 from PSMRI/fix-release-3.6.2

9f46e4b

Rebase 3.6.2 on 3.6.1

feat(security)Allow public access to health and version endpoints (#143)

2a681fa

feat(security)Allow public access to health and version endpoints (#143)

ac0fa54

Add Lab Technician Role for ECG (#144)

d887c44

* fix: add labtech role for ecg controller * fix: add role

Resolve OpenKM download failure and ECG controller access issue (#145)

e19ad70

* fix: add labtech role for ecg controller * fix: add role * fix: url issue in download document * Remove authorization check from getKMFile method Removed authorization check for getKMFile endpoint.

Fix the Update issue (#147)

7284ca0

* fix: beneficiary update url * fix: edit url * fix: update the url

Revert "Fix the Update issue (#147)" (#148)

06f0f65

This reverts commit 7284ca0.

fix: merge with main

f20a53c

vanitha1822 self-assigned this May 22, 2026

vanitha1822 requested a review from vishwab1 May 22, 2026 06:47

vishwab1 approved these changes May 22, 2026

View reviewed changes

vishwab1 merged commit 2c8fdd2 into main May 22, 2026
2 of 4 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge with Main#151

Merge with Main#151
vishwab1 merged 59 commits into
mainfrom
nd/vs/merge-3.6.2

vanitha1822 commented May 22, 2026

Uh oh!

coderabbitai Bot commented May 22, 2026

Rate limit exceeded

Uh oh!

sonarqubecloud Bot commented May 22, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

vanitha1822 commented May 22, 2026

📋 Description

✅ Type of Change

ℹ️ Additional Information

Uh oh!

coderabbitai Bot commented May 22, 2026

Rate limit exceeded

Uh oh!

sonarqubecloud Bot commented May 22, 2026

Quality Gate failed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants