fix: resolve ONLY_FULL_GROUP_BY violations and bulk registration username bug by vishwab1 · Pull Request #136 · PSMRI/Admin-API

vishwab1 · 2026-06-29T08:01:35Z

📋 Description

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

Summary

Fix bulk employee registration setting username from contact number instead of the actual username field (BulkRegistrationServiceImpl.java)
Remove unnecessary GROUP BY clauses causing ONLY_FULL_GROUP_BY SQL mode violations in two service-lookup queries, replacing one with DISTINCT to preserve dedup behavior without grouping by a non-selected column

✅ 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.

Bulk registration

# Conflicts: # src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

3.3.0

remove unwanted line

fix code

* Httpheader content disposition changed * Coderabbitai comments adrressed

Feature/signaturerelease

fix: amm-1927 send headers only if the request is from the allowed origin

Release 3.5.0

Release 3.6.1

# Conflicts: # src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureServiceImpl.java

fix vulnerabilitie code

fix security hotspots

…#121) * fix:changed the pom xml * fix: added facilty type master change * feat: created facility creation * fix: rabiit review fix * fix: rabiit review fix * fix: rabiit review fix * fix: pom version

* fix:changed the pom xml * fix: added facilty type master change * feat: created facility creation * feat:added work location * feat:added work location * fix: rabiit review fix * fix: rabiit review fix * fix: rabiit review fix * fix: ui chnges * fix: pom version * fix: corrections * fix: facilty hierachy * fix: facility heirachy * fix: remove logs folder from repository Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: add logs/ to .gitignore Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* fix:changed the pom xml * fix: added facilty type master change * feat: created facility creation * feat:added work location * feat:added work location * fix: rabiit review fix * fix: rabiit review fix * fix: rabiit review fix * fix: ui chnges * fix: pom version * fix: corrections * fix: facilty hierachy * fix: facility heirachy * fix: item facility mapping and store updates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: fixed inventory flow --------- Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

* Cherry-pick health and version API enhancements to release-3.6.1 (#124) * feat(health,version): add health and version endponts * fix(health): add constant and remove duplicates * fix(health): avoid permanent DEGRADED from historical deadlocks * fix(health): Removed the unnecessary boolean literal * fix(health): Fixed the broken lock-wait detection * fix(health): avoid blocking DB I/O under write lock and restore interrupt flag * fix(health): add cancelFutures in healthservice * fix(health): close basic DB connection before advanced checks and remove shared-map race * feat: expose account lock state in SearchEmployee4 (#129) Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com> * Fix the reset password issue (#131) * fix: reset password * fix: build issue * fix: update the url * fix: update config properties * fix: initialize constructor --------- Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com> Co-authored-by: Varun Deep Saini <deep.sa@rippling.com> Co-authored-by: Varun Deep Saini <varun.23bcs10048@ms.sst.scaler.com> Co-authored-by: Vanitha S <116701245+vanitha1822@users.noreply.github.com>

GROUP BY sm.serviceName selected non-aggregated, non-functionally-dependent columns (serviceID, isNational, statusID), which MySQL rejects under ONLY_FULL_GROUP_BY. Use SELECT DISTINCT instead since no aggregation is actually needed.

…tead of username field mUser.setUserName(employee.getContactNo()) was using the uploaded contact number as the login username, ignoring the actual UserName column in the bulk upload sheet. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

# Conflicts: # src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationServiceImpl.java # src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

coderabbitai · 2026-06-29T08:01:46Z

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: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 4f4b084d-5049-4bc9-afd5-d8ae809f4738

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

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.}

…plicate-mapping fix - New isolated tables/entities: NikshayTU, NikshayFacility, NikshayVillageFacilityMapping, with read-only cascading lookup endpoints (NikshayLocationController) — no existing master tables touched. - M_UserServiceRoleMapping2 gains NikshayTUID/NikshayFacilityID (nullable, additive), persisted on both create and update save paths. - Complete the pre-existing softDeleteOldMappings fix by adding the missing service interface/impl methods the controller already called. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

…y hierarchy Nikshay's TU/Facility/Village hierarchy was previously matched against AMRIT's existing state/district/block/village masters by name. That approach left ~44% of villages unmatched in practice — partly from incomplete migration runs, partly from real staleness in AMRIT's own district/block data (e.g. Andhra Pradesh's 2022 district reorganization never propagated to m_districtblock/m_DistrictBranchMapping). Replace it with a fully self-contained Nikshay hierarchy (NikshayState, NikshayDistrict, NikshayTU, NikshayFacility, NikshayVillage) sourced directly from Nikshay's own imported data, with no AMRIT matching involved. Verified: 100% village coverage (325,426/325,426) vs the previous approach's ~56%. NikshayLocationController's endpoints keep the same paths and query params, now backed by the new tables.

Admin-UI now saves one row per user-role with a comma-joined list of TU/Facility IDs instead of one row per TU x Facility combination, so the DB columns became TEXT. Update the entity and the request-body DTO (Previleges1097_3) to match — both were still Integer, which would have failed to deserialize a value like "12,45,78". Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

…or Edit v_userservicerolemapping (and its entity, what the Admin-UI's mapped-list screen reads) never exposes DistrictID/NikshayTUID/NikshayFacilityID, only legacy AMRIT WorkingDistrictID/WorkingDistrictName - always null for Stop TB, which never populates WorkingLocationID. Edit had no way to read back what was saved, so the TU/Facility/Village pickers always loaded empty. Reads m_userservicerolemapping directly by USRMappingID (reusing the existing EmployeeMasterRepo.findByUSRMappingID), same pattern as the FLW-API worklist-scope query - additive only, the shared view and every other service line reading it stay untouched. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

@Modifying

InvalidDataAccessApiUsageException: "Executing an update/delete query" - a @Modifying UPDATE query with no surrounding transaction. Pre-existing bug in shared code (updateUserRoleMapping, used by every service line), dormant until now: Stop TB's Edit form was always invalid before today's fixes (Update button permanently disabled), so nothing ever reached this code path through Stop TB specifically. Same pattern the other @Modifying query in this file already follows correctly. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

getMappedRole()'s null-district patch (getDirectStateDistrictByMappingIDs) joins the raw DistrictID column against AMRIT's m_district - correct for HWC/FLW, where that column genuinely holds an AMRIT district ID. Stop TB's DistrictID holds a Nikshay district ID instead, so the same join resolves to whatever AMRIT district happens to share that numeric ID by coincidence (e.g. Nikshay's Angul, ID 292, resolving to AMRIT's Uttar Kannad, also ID 292) - showing a completely wrong, unrelated district name in the mapped-users list. Skip the District patch for Stop TB rows specifically; State/Block patching is untouched since those values are genuinely AMRIT-sourced even for Stop TB. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

sonarqubecloud · 2026-07-15T09:32:05Z

Quality Gate failed

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

See analysis details on SonarQube Cloud

SauravBizbRolly and others added 30 commits March 4, 2025 10:37

Bulk registration

3c2135e

Bulk registration

23cccac

Bulk registration

83f693e

Merge pull request #69 from toarunmishra/bulk_registration

8ae4c09

Bulk registration

add userName and password in Bulk registration

cdd7b2a

add userName and password in Bulk registration

128c8f9

Merge pull request #88 from toarunmishra/bulk_registration

a069382

Bulk registration

Merge remote-tracking branch 'upstream/develop' into enhancement

3fd079a

# Conflicts: # src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

Merge pull request #90 from toarunmishra/3.3.0

fcbc3da

3.3.0

remove unwanted line

5cd719d

Merge pull request #91 from toarunmishra/3.3.0

2a55c54

remove unwanted line

fix code

110fa59

Merge pull request #92 from toarunmishra/3.3.0

83d3387

fix code

fix code

b1a893f

fix code

b67332f

fix code

bdde896

fix code

5315e05

fix code

486d412

fix code

4e5dab6

fix code

cd7f567

fix code

f06d077

fix code

84b679a

fix code

7b123e9

fix code

a28294f

fix code

093ba26

Httpheader content disposition changed

8820fe2

Coderabbitai comments adrressed

2aab70e

Httpheader content disposition changed (#100)

20eaaed

* Httpheader content disposition changed * Coderabbitai comments adrressed

Compile error resolved

e04b9e5

Merge pull request #101 from PSMRI/feature/signaturerelease

bd11453

Feature/signaturerelease

5Amogh and others added 21 commits November 18, 2025 11:08

Enhance regex pattern for URL matching

eb98a5a

Merge pull request #110 from PSMRI/amm-1927

bffa971

fix: amm-1927 send headers only if the request is from the allowed origin

Merge branch 'release-3.6.0' into release-3.5.0

c6ded08

Merge pull request #111 from PSMRI/release-3.5.0

2a04bfb

Release 3.5.0

Merge pull request #112 from PSMRI/release-3.6.1

75d06ca

Release 3.6.1

fix code

b421d8b

Merge remote-tracking branch 'upstream/release-3.6.0' into release-3.6.0

9c206a4

# Conflicts: # src/main/java/com/iemr/admin/service/employeemaster/EmployeeSignatureServiceImpl.java

fix code

76db67c

Merge branch 'main' into release-3.6.0

d5b3e20

fix vulnerabilitie code

711128e

Merge pull request #115 from PSMRI/fix/vulnerabilitie

091bd75

fix vulnerabilitie code

fix security hotspots

f76f68c

Merge pull request #116 from PSMRI/fix/remove_log

a52081b

fix security hotspots

fixed conflicts

ea22db4

Add facility hierarchy creation with village and parent-child mapping (…

68e4130

…#121) * fix:changed the pom xml * fix: added facilty type master change * feat: created facility creation * fix: rabiit review fix * fix: rabiit review fix * fix: rabiit review fix * fix: pom version

Merge remote-tracking branch 'origin/release-3.8.2' into vb/fixservice

32e65ca

# Conflicts: # src/main/java/com/iemr/admin/service/bulkRegistration/BulkRegistrationServiceImpl.java # src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java

vanitha1822 approved these changes Jun 29, 2026

View reviewed changes

vishwab1 and others added 6 commits July 10, 2026 13:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: resolve ONLY_FULL_GROUP_BY violations and bulk registration username bug#136

fix: resolve ONLY_FULL_GROUP_BY violations and bulk registration username bug#136
vishwab1 wants to merge 88 commits into
release-3.8.2from
vb/fixservice

vishwab1 commented Jun 29, 2026

Uh oh!

coderabbitai Bot commented Jun 29, 2026 •

edited

Loading

Review skipped

Uh oh!

sonarqubecloud Bot commented Jul 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

vishwab1 commented Jun 29, 2026

📋 Description

Summary

✅ Type of Change

ℹ️ Additional Information

Uh oh!

coderabbitai Bot commented Jun 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

sonarqubecloud Bot commented Jul 15, 2026

Quality Gate failed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

coderabbitai Bot commented Jun 29, 2026 •

edited

Loading