Skip to content

feat: Retrieve Memberships from User ACL instead of OrganizationService - MEED-10149 - Meeds-io/MIPs#240 #471

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
sofyenne merged 1 commit into from
Feb 16, 2026
Merged

feat: Retrieve Memberships from User ACL instead of OrganizationService - MEED-10149 - Meeds-io/MIPs#240 #471

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions .../src/main/java/org/exoplatform/processes/listener/RequestCommentNotificationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.exoplatform.commons.api.notification.model.PluginKey;
import org.exoplatform.commons.notification.impl.NotificationContextImpl;
import org.exoplatform.commons.utils.CommonsUtils;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.processes.model.WorkFlow;
import org.exoplatform.processes.notification.plugin.RequestCommentPlugin;
Expand All @@ -37,8 +38,8 @@
public class RequestCommentNotificationListener extends TaskCommentNotificationListener {
private ProcessesService processesService;

public RequestCommentNotificationListener(OrganizationService organizationService, ProcessesService processesService) {
super(organizationService);
public RequestCommentNotificationListener(UserACL userACL, ProcessesService processesService) {
super(userACL);
this.processesService = processesService;
}

Expand Down
34 changes: 17 additions & 17 deletions processes-services/src/main/java/org/exoplatform/processes/storage/ProcessesStorageImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@
import java.util.*;
import java.util.stream.Collectors;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;

import org.exoplatform.commons.exception.ObjectNotFoundException;
import org.exoplatform.commons.file.model.FileInfo;
import org.exoplatform.commons.file.model.FileItem;
import org.exoplatform.commons.file.services.FileService;
import org.exoplatform.commons.file.services.FileStorageException;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.processes.Utils.EntityMapper;
import org.exoplatform.processes.Utils.ProcessesUtils;
import org.exoplatform.processes.dao.WorkDraftDAO;
Expand Down Expand Up @@ -64,7 +66,7 @@ public class ProcessesStorageImpl implements ProcessesStorage {
private final ListenerService listenerService;
private final ProcessesAttachmentService processesAttachmentService;
private final FileService fileService;
private final OrganizationService organizationService;
private final UserACL userACL;
private final String DATE_FORMAT = "yyyy/MM/dd";
private final SimpleDateFormat formatter = new SimpleDateFormat(DATE_FORMAT);

Expand All @@ -78,7 +80,7 @@ public ProcessesStorageImpl(WorkFlowDAO workFlowDAO,
ListenerService listenerService,
ProcessesAttachmentService processesAttachmentService,
FileService fileService,
OrganizationService organizationService) {
UserACL userACL) {
this.workFlowDAO = workFlowDAO;
this.workDraftDAO = workDraftDAO;
this.identityManager = identityManager;
Expand All @@ -89,7 +91,7 @@ public ProcessesStorageImpl(WorkFlowDAO workFlowDAO,
this.listenerService = listenerService;
this.processesAttachmentService = processesAttachmentService;
this.fileService = fileService;
this.organizationService = organizationService;
this.userACL = userACL;
}

@Override
Expand Down Expand Up @@ -134,7 +136,7 @@ public WorkFlow saveWorkFlow(WorkFlow workFlow, long userId) throws IllegalArgum
if (workFlow == null) {
throw new IllegalArgumentException("workflow argument is null");
}
Identity identity = identityManager.getIdentity(String.valueOf(userId));
Identity identity = identityManager.getIdentity(userId);
if (identity == null) {
throw new IllegalArgumentException("identity is not exist");
}
Expand Down Expand Up @@ -299,7 +301,7 @@ public List<Work> getWorks(long userIdentityId, WorkFilter workFilter, int offse

@Override
public Work getWorkById(long userIdentityId, long workId) {
Identity identity = identityManager.getIdentity(String.valueOf(userIdentityId));
Identity identity = identityManager.getIdentity(userIdentityId);
if (identity == null) {
throw new IllegalArgumentException("identity is not exist");
}
Expand Down Expand Up @@ -389,7 +391,7 @@ public Work saveWork(Work work, long userId) throws IllegalArgumentException {
if (work == null) {
throw new IllegalArgumentException("work argument is null");
}
Identity identity = identityManager.getIdentity(String.valueOf(userId));
Identity identity = identityManager.getIdentity(userId);
if (identity == null) {
throw new IllegalArgumentException("identity is not exist");
}
Expand Down Expand Up @@ -511,7 +513,7 @@ public List<Work> findAllWorkDraftsByUser(WorkFilter workFilter, int offset, int
*/
@Override
public Work saveWorkDraft(Work work, long userId) {
Identity identity = identityManager.getIdentity(String.valueOf(userId));
Identity identity = identityManager.getIdentity(userId);
if (identity == null) {
throw new IllegalArgumentException("identity is not exist");
}
Expand Down Expand Up @@ -577,20 +579,18 @@ public List<WorkFlow> findWorkFlows(ProcessesFilter processesFilter, long userId
List<String> memberships = new ArrayList<>();
boolean isMemberProcessesGroup = false;
if (userIdentityId > 0) {
Identity identity = identityManager.getIdentity(String.valueOf(userIdentityId));
Identity identity = identityManager.getIdentity(userIdentityId);
if (identity != null) {
userName = identity.getRemoteId();
memberships.add(userName);
try {
Collection<Membership> ms = organizationService.getMembershipHandler().findMembershipsByUser(userName);
if (ms != null) {
for (Membership membership : ms) {
if (membership.getGroupId().equals(PROCESSES_GROUP)) {
isMemberProcessesGroup = true;
}
String membership_ = membership.getMembershipType() + ":" + membership.getGroupId();
memberships.add(membership_);
}
org.exoplatform.services.security.Identity aclIdentity = userACL.getUserIdentity(userName);
isMemberProcessesGroup = aclIdentity.isMemberOf(PROCESSES_GROUP);
if (CollectionUtils.isNotEmpty(aclIdentity.getMemberships())) {
memberships.addAll(aclIdentity.getMemberships()
.stream()
.map(m -> m.getMembershipType() + ":" + m.getGroup())
.toList());
}
} catch (Exception e) {
LOG.error("Error while getting the user memberships", e);
Expand Down
39 changes: 20 additions & 19 deletions ...es-services/src/test/java/org/exoplatform/processes/storage/ProcessesStorageImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import javax.ws.rs.ext.RuntimeDelegate;

import org.apache.commons.lang3.StringUtils;
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.services.security.MembershipEntry;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
Expand Down Expand Up @@ -130,7 +132,7 @@ public class ProcessesStorageImplTest {
private FileService fileService;

@Mock
private OrganizationService organizationService;
private UserACL userACL;

private ProcessesStorage processesStorage;

Expand Down Expand Up @@ -158,7 +160,7 @@ public void setUp() throws Exception {
listenerService,
processesAttachmentService,
fileService,
organizationService);
userACL);

}

Expand Down Expand Up @@ -213,7 +215,7 @@ public void saveWorkflow() throws EntityNotFoundException {
Throwable exception1 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.saveWorkFlow(null, 1l));
assertEquals("workflow argument is null", exception1.getMessage());

when(identityManager.getIdentity("1")).thenReturn(null);
when(identityManager.getIdentity(1)).thenReturn(null);
Throwable exception2 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.saveWorkFlow(workFlow, 1l));
assertEquals("identity is not exist", exception2.getMessage());

Expand All @@ -222,7 +224,7 @@ public void saveWorkflow() throws EntityNotFoundException {
when(workFlow.getProjectId()).thenReturn(0L);
when(workFlow.getSpaceId()).thenReturn("1");
when(projectService.getProject(workFlow.getProjectId())).thenReturn(projectDto);
when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
when(space.getGroupId()).thenReturn("/spaces/processes_space");
when(space.getId()).thenReturn("2");
when(spaceService.getSpaceByGroupId("/spaces/processes_space")).thenReturn(space);
Expand Down Expand Up @@ -319,12 +321,12 @@ public void saveWork() throws EntityNotFoundException, IllegalAccessException, O
when(statusDto.getProject()).thenReturn(projectDto);
Throwable exception1 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.saveWork(null, 1l));
assertEquals("work argument is null", exception1.getMessage());
when(identityManager.getIdentity("1")).thenReturn(null);
when(identityManager.getIdentity(1)).thenReturn(null);
Throwable exception2 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.saveWork(work, 1l));
assertEquals("identity is not exist", exception2.getMessage());
work.setId(0L);
work.setProjectId(1L);
when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
when(projectService.getProject(work.getProjectId())).thenReturn(projectDto);
ENTITY_MAPPER.when(() -> EntityMapper.workToTask(work)).thenReturn(taskDto);
ENTITY_MAPPER.when(() -> EntityMapper.taskToWork(taskDto)).thenReturn(work);
Expand Down Expand Up @@ -385,11 +387,11 @@ public void saveWorkDraft() {
workEntity.equals(workEntity);
workEntity.toString();
Identity identity = mock(Identity.class);
when(identityManager.getIdentity("1")).thenReturn(null);
when(identityManager.getIdentity(1)).thenReturn(null);
Throwable exception1 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.saveWorkDraft(work, 1l));
assertEquals("identity is not exist", exception1.getMessage());
ENTITY_MAPPER.when(() -> EntityMapper.toEntity(work)).thenReturn(workEntity);
when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
work.setWorkFlow(workFlow);
when(workDraftDAO.create(workEntity)).thenReturn(workEntity);
processesStorage.saveWorkDraft(work, 1L);
Expand Down Expand Up @@ -420,10 +422,10 @@ public void getWorkById() throws Exception {
List<TaskDto> list = new ArrayList<>();
list.add(taskDto);
when(identity.getRemoteId()).thenReturn("root");
when(identityManager.getIdentity("1")).thenReturn(null);
when(identityManager.getIdentity(1)).thenReturn(null);
Throwable exception1 = assertThrows(IllegalArgumentException.class, () -> this.processesStorage.getWorkById(1L, 1L));
assertEquals("identity is not exist", exception1.getMessage());
when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
when(taskService.findTasks(any(), ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt())).thenReturn(list);
processesStorage.getWorkById(1L, 1L);
EntityMapper.taskToWork(taskDto);
Expand All @@ -435,7 +437,6 @@ public void getWorkById() throws Exception {

@Test
public void updateWorkCompleted() throws EntityNotFoundException {
COMMONS_UTILS.when(() -> CommonsUtils.getService(OrganizationService.class)).thenReturn(organizationService);
COMMONS_UTILS.when(() -> CommonsUtils.getService(SpaceService.class)).thenReturn(spaceService);
TaskDto taskDto = new TaskDto();
StatusDto statusDto = new StatusDto();
Expand Down Expand Up @@ -533,7 +534,7 @@ public void getWorks() throws Exception {
currentProfile.setProperty(Profile.FULL_NAME, username);
currentIdentity.setProfile(currentProfile);

when(identityManager.getIdentity((String.valueOf(currentOwnerId)))).thenReturn(currentIdentity);
when(identityManager.getIdentity(currentOwnerId)).thenReturn(currentIdentity);

PROCESSES_UTILS.when(() -> ProcessesUtils.getUserNameByIdentityId(any(), anyLong())).thenCallRealMethod();
String user = ProcessesUtils.getUserNameByIdentityId(identityManager, 1l);
Expand Down Expand Up @@ -598,7 +599,7 @@ public void getIllustrationImageById() throws Exception {
}

@Test
public void findWorkflow() throws Exception {
public void testFindWorkflow() throws Exception {
IllustrativeAttachment illustrativeAttachment = new IllustrativeAttachment(null,
"image.png",
"image/png",
Expand All @@ -623,9 +624,11 @@ public void findWorkflow() throws Exception {
when(workFlow.getProjectId()).thenReturn(0L);
when(workFlow.getSpaceId()).thenReturn("1");

when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
when(identity.getRemoteId()).thenReturn("user");
when(identity.getId()).thenReturn("1");
org.exoplatform.services.security.Identity aclIdentity = mock(org.exoplatform.services.security.Identity.class);
when(userACL.getUserIdentity("user")).thenReturn(aclIdentity);
when(space.getGroupId()).thenReturn("/spaces/processes_space");
when(spaceService.getSpaceByGroupId("/spaces/processes_space")).thenReturn(space);
when(spaceService.getSpaceById("1")).thenReturn(space);
Expand Down Expand Up @@ -664,7 +667,6 @@ public void findWorkflow() throws Exception {
when(workFlowDAO.findWorkFlows(filter, memberships, 0, 0)).thenReturn(workFlowEntities);
when(workFlow.getIllustrativeAttachment()).thenReturn(illustrativeAttachment);
this.processesStorage.saveWorkFlow(workFlow, 1L);
when(organizationService.getMembershipHandler()).thenReturn(membershipHandler);
assertEquals(null, this.processesStorage.getWorkFlowById(1));

Collection<Membership> memberships_ = new ArrayList();
Expand All @@ -688,8 +690,7 @@ public void findWorkflow() throws Exception {

PROCESSES_UTILS.when(() -> ProcessesUtils.getProjectParentSpace(workFlow.getProjectId())).thenReturn(space);
ENTITY_MAPPER.when(() -> EntityMapper.fromEntity(newWorkFlowEntity1, null)).thenReturn(workFlow);

when(organizationService.getMembershipHandler().findMembershipsByUser(identity.getRemoteId())).thenReturn(memberships_);
when(aclIdentity.getMemberships()).thenReturn(memberships_.stream().map(m -> new MembershipEntry(m.getGroupId(), m.getMembershipType())).toList());
assertEquals(1, this.processesStorage.findWorkFlows(filter, Long.parseLong(identity.getId()), 0, 0).size());

MembershipImpl adminProcesses = new MembershipImpl();
Expand All @@ -701,7 +702,7 @@ public void findWorkflow() throws Exception {
PROCESSES_UTILS.when(() -> ProcessesUtils.getProjectParentSpace(workFlow.getProjectId())).thenReturn(space);
ENTITY_MAPPER.when(() -> EntityMapper.fromEntity(newWorkFlowEntity1, null)).thenReturn(workFlow);

when(organizationService.getMembershipHandler().findMembershipsByUser(identity.getRemoteId())).thenReturn(memberships_);
when(aclIdentity.getMemberships()).thenReturn(memberships_.stream().map(m -> new MembershipEntry(m.getGroupId(), m.getMembershipType())).toList());
assertEquals(0, this.processesStorage.findWorkFlows(filter, Long.parseLong(identity.getId()), 0, 0).size());
}

Expand Down Expand Up @@ -731,7 +732,7 @@ public void countWorkflow() {
when(workFlow.getProjectId()).thenReturn(0L);
when(workFlow.getSpaceId()).thenReturn("1");

when(identityManager.getIdentity("1")).thenReturn(identity);
when(identityManager.getIdentity(1)).thenReturn(identity);
when(space.getGroupId()).thenReturn("/spaces/processes_space");
when(spaceService.getSpaceByGroupId("/spaces/processes_space")).thenReturn(space);
when(spaceService.getSpaceById("1")).thenReturn(space);
Expand Down
Loading