Fixed possible constraint violation with an existed organization. #6674
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
Usecase is following: If we have already an organization with name, let's say "org" and the new user also has name "org" then we will have constraint violation. In this case, we will try to create the user with name "org"+random string.
skabashnyuk
added
the
kind/task
benoitf
added
the
status/code-review
sleshchenko
reviewed
Oct 11, 2017
| AccountImpl account = accounts[0]; | ||
| account.setName(accounts[1].getName()); | ||
|
|
||
| accountDao.create(account); |
There was a problem hiding this comment.
You try to create user with the existing name and id. To ensure that conflict is thrown because of names conflct it is needed to rewrite this test as
AccountImpl account = new AccountImpl(NameGenerator.generate("account", 5), accounts[0].getName(), "test");
accountDao.create(account);
| managerProvider.get().persist(account); | ||
| final EntityManager manager = managerProvider.get(); | ||
| manager.persist(account); | ||
| manager.flush(); |
There was a problem hiding this comment.
Please add flushing to doRemove method too. See UserDao.
| cheUser.setName(generate(cheUser.getName(), 4)); | ||
| return userManager.create(cheUser, false); | ||
| } catch (ServerException | ConflictException e1) { | ||
| throw new ServletException("Unable to create new user", e1); |
There was a problem hiding this comment.
With such try catches this method looks unreadable. Please consider to rewrite it somehow, e.g.
private synchronized User getOrCreateUser(String id, String email, String username)
throws ServletException {
try {
Optional<User> user = doGetUser(id);
if (user.isPresent()) {
return user.get();
}
final UserImpl cheUser = new UserImpl(id, email, username, generate("", 12), emptyList());
try {
return userManager.create(cheUser, false);
} catch (ConflictException ex) {
cheUser.setName(generate(cheUser.getName(), 4));
return userManager.create(cheUser, false);
}
} catch (ServerException | ConflictException e) {
throw new ServletException("Unable to create new user", e);
}
}
private Optional<User> doGetUser(String id) throws ServerException {
try {
return Optional.of(userManager.getById(id));
} catch (NotFoundException e) {
return Optional.empty();
}
}
There was a problem hiding this comment.
1:1 by readability imo...:)
There was a problem hiding this comment.
BTW throw new ServletException("Unable to create new user", e); this line is one time in my variant 😃
mshaposhnik
reviewed
Oct 11, 2017
| managerProvider.get().persist(account); | ||
| final EntityManager manager = managerProvider.get(); | ||
| manager.persist(account); | ||
| manager.flush(); |
There was a problem hiding this comment.
Pls fix AccountDao.doRemove() in the same way.
mshaposhnik
approved these changes
Oct 11, 2017
sleshchenko
approved these changes
Oct 11, 2017
vparfonov
approved these changes
Oct 11, 2017
benoitf
removed
the
status/code-review
|
Build success. https://ci.codenvycorp.com/job/che-pullrequests-build/4095/ |
|
ci-test build report: |
This pull request was closed.
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.
What does this PR do?
Usecase is following:
If we have already an organization with name, let's say "org" and the new user also has name "org" then we will have constraint violation.
In this case, we will try to create the user with name "org"+random string.
What issues does this PR fix or reference?
#6650
n/a
Release Notes
n/a
Docs PR
n/a