Skip to content

integration tests fixes #3285

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

Merged
lbownik merged 1 commit into from
May 8, 2026
Merged

integration tests fixes #3285

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import edu.harvard.iq.dataverse.persistence.user.GuestUser;
import edu.harvard.iq.dataverse.persistence.user.RoleAssignee;
import edu.harvard.iq.dataverse.persistence.user.RoleAssignment;
import edu.harvard.iq.dataverse.persistence.user.RoleAssignmentRepository;
import edu.harvard.iq.dataverse.privateurl.PrivateUrlUtil;

import javax.annotation.PostConstruct;
Expand Down Expand Up @@ -59,6 +60,9 @@ public class RoleAssigneeServiceBean {

@EJB
DataverseRoleServiceBean dataverseRoleService;

@EJB
RoleAssignmentRepository roleAssignmentRepository;

protected Map<String, RoleAssignee> predefinedRoleAssignees = new TreeMap<>();

Expand Down Expand Up @@ -98,9 +102,7 @@ public RoleAssignee getRoleAssignee(String identifier) {
}

public List<RoleAssignment> getAssignmentsFor(String roleAssigneeIdentifier) {
return em.createNamedQuery("RoleAssignment.listByAssigneeIdentifier", RoleAssignment.class)
.setParameter("assigneeIdentifier", roleAssigneeIdentifier)
.getResultList();
return this.roleAssignmentRepository.findByAssigneeIdentifier(roleAssigneeIdentifier);
}

public Optional<RoleAssignment> getAssignmentFor(String roleAssigneeIdentifier,
Expand Down Expand Up @@ -391,8 +393,6 @@ public List<RoleAssignee> filterRoleAssignees(String query, DvObject dvObject,
}

public void removeAllRolesForUserByIdentifier(String identifier) {
em.createNamedQuery("RoleAssignment.deleteAllByAssigneeIdentifier", RoleAssignment.class)
.setParameter("assigneeIdentifier", identifier)
.executeUpdate();
this.roleAssignmentRepository.deleteAllByAssigneeIdentifier(identifier);
}
}
Loading