Skip to content

Bring main into release-3.12.2 (restores code lost in the 3.12.0 merge) - #408

Merged
drtechie merged 2 commits into
release-3.12.2from
main
Nov 6, 2026
Merged

drtechie merged 2 commits into
release-3.12.2from
main

Conversation

@drtechie

@drtechie drtechie commented Nov 6, 2026

Copy link
Copy Markdown
Member

release-3.12.2 was cut from main before #407 merged, so it does not compile.

This brings in #407: the cherry-picked "fix code merge issue" commit, which restores

  • the UserServiceRoleDTO fields,
  • UserServiceRoleRepo.getUserRolesByIds,
  • the TBConfirmedCaseService referral follow-up methods.

It is a fast-forward with no other changes.

🤖 Generated with Claude Code

SauravBizbRolly and others added 2 commits November 6, 2026 13:58
(cherry picked from commit 3379e00)
fix: restore code lost when release 3.12.0 was merged to main
@coderabbitai

coderabbitai Bot commented Nov 6, 2026

Copy link
Copy Markdown

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 59 minutes.

Check out review usage here.

View limit details

Limit details: You’ve used the included review currently available.

Learn how review limits work.

Review configuration:

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 35b1d3f1-299c-4dce-a72c-49f475d5c4b4
Commits

Reviewing files that changed from the base of the PR and between 77f36c7 and 81d1983.

Files selected for processing: 4

  • src/main/java/com/iemr/flw/dto/iemr/UserServiceRoleDTO.java
  • src/main/java/com/iemr/flw/repo/iemr/UserServiceRoleRepo.java
  • src/main/java/com/iemr/flw/service/TBConfirmedCaseService.java
  • src/main/java/com/iemr/flw/service/impl/TBConfirmedCaseServiceImpl.java
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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


} catch (Exception e) {
// Replace with your project's logger if available
e.printStackTrace();

} catch (Exception e) {

e.printStackTrace();
@sonarqubecloud

sonarqubecloud Bot commented Nov 6, 2026

Copy link
Copy Markdown

@drtechie
drtechie merged commit f2012fa into release-3.12.2 Nov 6, 2026
4 of 6 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.

3 participants