From afc7467eac52bc5776834942522b6944b6f15186 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Tue, 19 Dec 2023 10:48:13 +0100
Subject: [PATCH] comment out 4fcb2b104fa975b20f7a97e9186529b07dec28af to pass
tests
---
.../generic/server/task/UserManager.java | 70 +++++++++----------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java
index fd1ef85d3a9..81b4040c849 100644
--- a/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java
+++ b/server-application-server/source/java/ch/systemsx/cisd/openbis/generic/server/task/UserManager.java
@@ -1553,41 +1553,41 @@ public class UserManager
}
if (roleCreations.isEmpty() == false)
{
- // Filter out already existing roles to not repeat creations
- // This is to manage a corner case when a user role has been added manually unnecessarily.
- List<RoleAssignmentCreation> filteredRoleCreations = new ArrayList<>();
- for (RoleAssignmentCreation roleAssignmentCreationToCheck : roleCreations)
- {
- PersonPermId userId = (PersonPermId) roleAssignmentCreationToCheck.getUserId();
- SpacePermId spaceId = (SpacePermId) roleAssignmentCreationToCheck.getSpaceId();
- RoleAssignmentSearchCriteria roleAssignmentSearchCriteria =
- new RoleAssignmentSearchCriteria();
- roleAssignmentSearchCriteria.withUser().withUserId()
- .thatEquals(userId.getPermId());
- roleAssignmentSearchCriteria.withSpace().withCode()
- .thatEquals(spaceId.getPermId());
- SearchResult<RoleAssignment> roleAssignmentSearchResult =
- service.searchRoleAssignments(sessionToken,
- roleAssignmentSearchCriteria, new RoleAssignmentFetchOptions());
-
- boolean found = false;
- if (!roleAssignmentSearchResult.getObjects().isEmpty())
- {
- Role role = roleAssignmentCreationToCheck.getRole();
- for (RoleAssignment roleAssignment : roleAssignmentSearchResult.getObjects())
- {
- if (roleAssignment.getRole().equals(role))
- {
- found = true;
- }
- }
- }
- if (!found)
- {
- filteredRoleCreations.add(roleAssignmentCreationToCheck);
- }
- }
- roleCreations = filteredRoleCreations;
+// // Filter out already existing roles to not repeat creations
+// // This is to manage a corner case when a user role has been added manually unnecessarily.
+// List<RoleAssignmentCreation> filteredRoleCreations = new ArrayList<>();
+// for (RoleAssignmentCreation roleAssignmentCreationToCheck : roleCreations)
+// {
+// PersonPermId userId = (PersonPermId) roleAssignmentCreationToCheck.getUserId();
+// SpacePermId spaceId = (SpacePermId) roleAssignmentCreationToCheck.getSpaceId();
+// RoleAssignmentSearchCriteria roleAssignmentSearchCriteria =
+// new RoleAssignmentSearchCriteria();
+// roleAssignmentSearchCriteria.withUser().withUserId()
+// .thatEquals(userId.getPermId());
+// roleAssignmentSearchCriteria.withSpace().withCode()
+// .thatEquals(spaceId.getPermId());
+// SearchResult<RoleAssignment> roleAssignmentSearchResult =
+// service.searchRoleAssignments(sessionToken,
+// roleAssignmentSearchCriteria, new RoleAssignmentFetchOptions());
+//
+// boolean found = false;
+// if (!roleAssignmentSearchResult.getObjects().isEmpty())
+// {
+// Role role = roleAssignmentCreationToCheck.getRole();
+// for (RoleAssignment roleAssignment : roleAssignmentSearchResult.getObjects())
+// {
+// if (roleAssignment.getRole().equals(role))
+// {
+// found = true;
+// }
+// }
+// }
+// if (!found)
+// {
+// filteredRoleCreations.add(roleAssignmentCreationToCheck);
+// }
+// }
+// roleCreations = filteredRoleCreations;
operations.add(new CreateRoleAssignmentsOperation(roleCreations));
}
if (roleDeletions.isEmpty() == false)
--
GitLab