[BUG] 🐛 Fix conflict when getting by mail a user with a similar mail #872
Conversation
This file contains 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
CChemin
force-pushed
the
fix-search-multiple-mails
branch
from
2ef2806 to
dbe91e6
Compare
Donatien26
previously approved these changes
Dec 11, 2023
clement-dufaure
previously approved these changes
Dec 11, 2023
CChemin
force-pushed
the
fix-search-multiple-mails
branch
2 times, most recently
from
f8f6360 to
bbedfaa
Compare
Signed-off-by: Cécile Chemin <[email protected]>
CChemin
dismissed stale reviews from Donatien26 and clement-dufaure
via
7dacfdf
CChemin
force-pushed
the
fix-search-multiple-mails
branch
from
bbedfaa to
7dacfdf
Compare
Ragatzino
approved these changes
Dec 12, 2023
| @@ -366,11 +366,15 @@ public Optional<User> getUserByMail(String mail) { | |||
| logger.debug("Searching user with mail {}", mail); | |||
| User searchedUser = new User(); | |||
| searchedUser.setMail(mail); | |||
| PageResult<User> users = | |||
| searchUsers(searchedUser, new PageableResult(2, 0, null), SearchType.OR.name()); | |||
| List<User> users = | |||
There was a problem hiding this comment.
This part got me confused at first, and it is better this way
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.
No description provided.