chore: convert user to userdetails refactoring #21441
Open
+101
−89
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
…om:dhis2/dhis2-core into chore/use-userdetails-in-bundles # Conflicts: # dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/user/UserServiceTest.java
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
…serdetails-in-user-query-params
Signed-off-by: Morten Svanaes <[email protected]>
…om:dhis2/dhis2-core into chore/use-userdetails-in-bundles
netroms
changed the title
…his2-core into chore/more-usercredentials-refactor
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
Fixed
Show fixed
Hide fixed
Signed-off-by: Morten Svanaes <[email protected]>
Signed-off-by: Morten Svanaes <[email protected]>
…usercredentials-refactor
…usercredentials-refactor
…2/dhis2-core into chore/more-usercredentials-refactor
Signed-off-by: Morten Svanaes <[email protected]>
…usercredentials-refactor
| @@ -550,6 +550,9 @@ Map<String, Optional<Locale>> findNotifiableUsersWithPasswordLastUpdatedBetween( | |||
| */ | |||
| UserDetails createUserDetails(String userUid) throws NotFoundException; | |||
|
|
|||
| @CheckForNull | |||
| UserDetails createUserDetailsSafe(@Nonnull String userUid); | |||
There was a problem hiding this comment.
It would be nice to use the UID type, especially for new methods, if possible.
There was a problem hiding this comment.
Yeah, would be great to do a big refactor just for that. Feels right to do that after UserDetails are mostly done.
|
| @@ -495,6 +502,8 @@ public WebMessage replicateUser(@PathVariable String uid, HttpServletRequest req | |||
| return conflict(result.getErrorMessage()); | |||
| } | |||
|
|
|||
| Session session = entityManager.unwrap(Session.class); | |||
There was a problem hiding this comment.
Using the entity manager and session at the controller layer feels a bit wrong. It kind of hints that this should be done at the service level.
There was a problem hiding this comment.
yes, totally. We should refactor this one.
david-mackessy
approved these changes
Jul 25, 2025
vietnguyen
approved these changes
Jul 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
Refactoring the use of User to UserDetails, this PR focuses to eliminate the use of UserDetails.fromUser() method, which usually means UserDetails can be used of properly refactored from the top, typically the controller.