Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify default role allocation for users #3061

Merged
merged 1 commit into from
Mar 2, 2022
Merged

Simplify default role allocation for users #3061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 12 additions & 42 deletions catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/RoleRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.ws.rs.core.UriInfo;
Expand Down Expand Up @@ -361,13 +359,23 @@ private void setDefaultToTrue(Role role) throws IOException, ParseException {
updatedDefaultRole = updatedDefaultRole.withDefault(false);
new RoleUpdater(origDefaultRole, updatedDefaultRole, Operation.PATCH).update();
}
List<User> users = getAllUsers();
if (users.isEmpty()) {
return;
}
LOG.info("Creating 'user --- has ---> role' relationship for {} role", role.getName());
updateUsers(new RoleEntityInterface(role).getEntityReference(), null);
for (User user : users) {
daoCollection
.relationshipDAO()
.insert(user.getId(), role.getId(), Entity.USER, Entity.ROLE, Relationship.HAS.ordinal());
}
}

private void setDefaultToFalse(Role role) {
LOG.info("Deleting 'user --- has ---> role' relationship for {} role", role.getName());
updateUsers(null, new RoleEntityInterface(role).getEntityReference());
daoCollection
.relationshipDAO()
.deleteTo(role.getId().toString(), Entity.ROLE, Relationship.HAS.ordinal(), Entity.USER);
}

private List<User> getAllUsers() {
Expand All @@ -383,43 +391,5 @@ private List<User> getAllUsers() {
throw EntityNotFoundException.byMessage(CatalogExceptionMessage.entitiesNotFound(Entity.USER));
}
}

private void updateUsers(EntityReference addRole, EntityReference removeRole) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No changes to tests, since the logic remains the same.

List<User> users = getAllUsers();
if (users.isEmpty()) {
return;
}
EntityRepository<User> userRepository = Entity.getEntityRepository(Entity.USER);
users
.parallelStream()
.forEach(
user -> {
try {
updateUser(userRepository, user, addRole, removeRole);
} catch (IOException | ParseException e) {
throw new RuntimeException(e);
}
});
}

private void updateUser(
EntityRepository<User> userRepository, User user, EntityReference addRole, EntityReference removeRole)
throws IOException, ParseException {
User origUser = userRepository.get(null, user.getId().toString(), UserRepository.USER_PATCH_FIELDS);
User updatedUser = userRepository.get(null, user.getId().toString(), UserRepository.USER_PATCH_FIELDS);
List<EntityReference> roles = updatedUser.getRoles();
if (roles == null) {
roles = new ArrayList<>();
}
Set<EntityReference> rolesSet = new HashSet<>(roles);
if (addRole != null) {
rolesSet.add(addRole);
}
if (removeRole != null) {
rolesSet.remove(removeRole);
}
updatedUser.setRoles(new ArrayList<>(rolesSet));
Entity.getEntityRepository(Entity.USER).getUpdater(origUser, updatedUser, Operation.PATCH).update();
}
}
}