AP-6692 Update artifact's owner field when change ACL

Apromore-Clients/manager-client/src/main/java/org/apromore/manager/client/ManagerService.java

@@ -148,9 +148,9 @@ boolean logoutUserAllSessions(final String username,
 
     String saveLogPermissions(int logId, String userId, boolean hasRead, boolean hasWrite, boolean hasOwnership);
 
-    String removeFolderPermissions(int folderId, String userId);
+    String removeFolderPermissions(int folderId, String userId, AccessType accessType);
 
-    String removeProcessPermissions(int processId, String userId);
+    String removeProcessPermissions(int processId, String userId, AccessType accessType);
 
     String removeLogPermissions(int logId, String userId, String username, AccessType accessType) throws UserNotFoundException;
 

Apromore-Clients/manager-client/src/main/java/org/apromore/manager/client/ManagerServiceImpl.java

@@ -420,23 +420,23 @@ public String saveLogPermissions(int logId, String userId, boolean hasRead, bool
   }
 
   @Override
-  public String removeFolderPermissions(int folderId, String userId) {
+  public String removeFolderPermissions(int folderId, String userId, AccessType accessType) {
     LOGGER.info("User id {} remove folder id {} permissions", userId, folderId);
-    return authorizationSrv.removeFolderPermissions(folderId, userId);
+    return authorizationSrv.removeFolderPermissions(folderId, userId, accessType);
   }
 
   @Override
-  public String removeProcessPermissions(int processId, String userId) {
+  public String removeProcessPermissions(int processId, String userId, AccessType accessType) {
     LOGGER.info("User id {} remove permissions from process model id {}", userId, processId);
-    return authorizationSrv.removeProcessPermissions(processId, userId);
+    return authorizationSrv.removeProcessPermissions(processId, userId, accessType);
   }
 
   @Override
   public String removeLogPermissions(int logId, String userId, String username,
       AccessType accessType) throws UserNotFoundException {
     LOGGER.info("User \"{}\" (id {}) remove permissions from log id {} (access type {})", username,
         userId, logId, accessType);
-    return authorizationSrv.removeLogPermissions(logId, userId, username, accessType);
+    return authorizationSrv.removeLogPermissions(logId, userId, accessType);
   }
 
   /**

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/AuthorizationService.java

@@ -255,15 +255,15 @@ public interface AuthorizationService {
      * @param processId    Process ID
      * @param groupRowGuid Group UID
      */
-    void deleteProcessAccess(Integer processId, String groupRowGuid);
+    void deleteProcessAccess(Integer processId, String groupRowGuid, AccessType accessType);
 
     /**
      * Delete one GroupLog record
      *
      * @param folderId     Folder ID
      * @param groupRowGuid Group UID
      */
-    void deleteFolderAccess(Integer folderId, String groupRowGuid);
+    void deleteFolderAccess(Integer folderId, String groupRowGuid, AccessType accessType);
 
     /**
      * Delete one GroupUsermetadata record
@@ -282,11 +282,11 @@ String saveProcessPermissions(Integer processId, String groupRowGuid, boolean ha
     String saveLogPermissions(Integer logId, String groupRowGuid, boolean hasRead, boolean hasWrite,
                               boolean hasOwnership);
 
-    String removeFolderPermissions(Integer folderId, String groupRowGuid);
+    String removeFolderPermissions(Integer folderId, String groupRowGuid, AccessType accessType);
 
-    String removeProcessPermissions(Integer processId, String groupRowGuid);
+    String removeProcessPermissions(Integer processId, String groupRowGuid, AccessType accessType);
 
-    String removeLogPermissions(Integer logId, String groupRowGuid, String username, AccessType accessType);
+    String removeLogPermissions(Integer logId, String groupRowGuid, AccessType accessType);
 
     String removeUsermetadataPermissions(Integer usermetadataId, String groupRowGuid);
 

Apromore-Core-Components/Apromore-Manager/src/main/java/org/apromore/service/impl/AuthorizationServiceImpl.java

@@ -8,12 +8,12 @@
  * it under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of the
  * License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Lesser Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Lesser Public
  * License along with this program.  If not, see
  * <http://www.gnu.org/licenses/lgpl-3.0.html>.
@@ -490,19 +490,19 @@ public void saveUserMetadataAccessType(Integer userMetadataId, String groupRowGu
   public void deleteLogAccess(Integer logId, String groupRowGuid, String username,
       AccessType accessType) {
 
-    removeLogPermissions(logId, groupRowGuid, username, accessType);
+    removeLogPermissions(logId, groupRowGuid, accessType);
   }
 
   @Override
-  public void deleteProcessAccess(Integer processId, String groupRowGuid) {
+  public void deleteProcessAccess(Integer processId, String groupRowGuid, AccessType accessType) {
 
-    removeProcessPermissions(processId, groupRowGuid);
+    removeProcessPermissions(processId, groupRowGuid, accessType);
   }
 
   @Override
-  public void deleteFolderAccess(Integer folderId, String groupRowGuid) {
+  public void deleteFolderAccess(Integer folderId, String groupRowGuid, AccessType accessType) {
 
-    removeFolderPermissions(folderId, groupRowGuid);
+    removeFolderPermissions(folderId, groupRowGuid, accessType);
   }
 
   @Override
@@ -546,46 +546,77 @@ public String saveFolderPermissions(Integer folderId, String groupRowGuid, boole
 
   @Override
   @Transactional(readOnly = false)
-  public String removeFolderPermissions(Integer folderId, String groupRowGuid) {
+  public String removeFolderPermissions(Integer folderId, String groupRowGuid, AccessType accessType) {
 
-    //
     List<Folder> subFoldersWithCurrentFolders = folderService.getSubFolders(folderId, true);
     Group group = groupRepository.findByRowGuid(groupRowGuid);
-    List<Integer> folderIds = new ArrayList<Integer>();
+    List<Integer> folderIds = new ArrayList<>();
 
     for (Folder folder : subFoldersWithCurrentFolders) {
       folderIds.add(folder.getId());
       removeGroupFolder(group, folder);
+
+      // Update Folder's user attribute when this user is removed from owner list
+      if (group.getUser().equals(folder.getCreatedBy()) && accessType.isOwner()) {
+        for (GroupFolder groupFolder : folder.getGroupFolders()) {
+          if ("USER".equals(groupFolder.getGroup().getType().toString())
+              && groupFolder.getGroup().getUser() != folder.getCreatedBy()) {
+            folder.setCreatedBy(groupFolder.getGroup().getUser());
+          }
+        }
+      }
     }
 
     for (Process process : processRepository.findByFolderIdIn(folderIds)) {
-      removeGroupProcess(group, process);
+      removeProcessPermissions(process.getId(), group.getRowGuid(),
+          AccessType.getAccessType(groupProcessRepository.findByGroupAndProcess(group, process).getAccessRights()));
     }
 
     for (Log log : logRepository.findByFolderIdIn(folderIds)) {
-      removeGroupLog(group, log);
+      removeLogPermissions(log.getId(), group.getRowGuid(),
+          AccessType.getAccessType(groupLogRepository.findByGroupAndLog(group, log).getAccessRights()));
     }
     return "";
 
   }
 
   @Override
   @Transactional(readOnly = false)
-  public String removeProcessPermissions(Integer processId, String groupRowGuid) {
+  public String removeProcessPermissions(Integer processId, String groupRowGuid, AccessType accessType) {
     Process process = processRepository.findById(processId).get();
     Group group = groupRepository.findByRowGuid(groupRowGuid);
     removeGroupProcess(group, process);
+
+    // Update Process's user attribute when this user is removed from owner list
+    if (group.getUser().equals(process.getUser()) && accessType.isOwner()) {
+      for (GroupProcess groupProcess : process.getGroupProcesses()) {
+        if ("USER".equals(groupProcess.getGroup().getType().toString())
+          && groupProcess.getGroup().getUser() != process.getUser()) {
+          process.setUser(groupProcess.getGroup().getUser());
+        }
+      }
+    }
+
     return "";
   }
 
   @Override
   @Transactional(readOnly = false)
-  public String removeLogPermissions(Integer logId, String groupRowGuid, String username,
-      AccessType accessType) {
+  public String removeLogPermissions(Integer logId, String groupRowGuid, AccessType accessType) {
     Log log = logRepository.findById(logId).get();
     Group group = groupRepository.findByRowGuid(groupRowGuid);
     removeGroupLog(group, log);
 
+    // Update Log's user attribute when this user is removed from owner list
+    if (group.getUser().equals(log.getUser()) && accessType.isOwner()) {
+      for (GroupLog groupLog : log.getGroupLogs()) {
+        if ("USER".equals(groupLog.getGroup().getType().toString())
+            && groupLog.getGroup().getUser() != log.getUser()) {
+          log.setUser(groupLog.getGroup().getUser());
+        }
+      }
+    }
+
     // TODO: If access type = restricted, remove GroupUsermetadata
     // If access type = restricted, remove permission with user metadata that linked to specified
     // log
@@ -741,20 +772,23 @@ private void removeGroupFolder(Group group, Folder folder) {
     GroupFolder groupFolder = groupFolderRepository.findByGroupAndFolder(group, folder);
     if (groupFolder != null) {
       groupFolderRepository.delete(groupFolder);
+      groupFolderRepository.flush();
     }
   }
 
   private void removeGroupProcess(Group group, Process process) {
     GroupProcess groupProcess = groupProcessRepository.findByGroupAndProcess(group, process);
     if (groupProcess != null) {
       groupProcessRepository.delete(groupProcess);
+      groupProcessRepository.flush();
     }
   }
 
   private void removeGroupLog(Group group, Log log) {
     GroupLog groupLog = groupLogRepository.findByGroupAndLog(group, log);
     if (groupLog != null) {
       groupLogRepository.delete(groupLog);
+      groupLogRepository.flush();
     }
   }
 

Apromore-Core-Components/Apromore-Manager/src/test/java/org/apromore/service/impl/ProcessServiceImplUnitTest.java

@@ -824,7 +824,7 @@ void testUpdateProcessMetadata_CurrentPublic_TobeMadePublic() throws Exception {
         expect(processRepo.save((Process) EasyMock.anyObject())).andReturn(process);
         expect(processModelVersionRepo.save((ProcessModelVersion) EasyMock.anyObject())).andReturn(pmv);
         expect(processBranchRepo.save((ProcessBranch) EasyMock.anyObject())).andReturn(branch);
-
+        workspaceSrv.createPublicStatusForUsers(process);
         replayAll();
 
         // Mock Call
@@ -898,7 +898,6 @@ void testUpdateProcessMetadata_CurrentNonPublic_TobeMadePublic() throws Exceptio
         expect(processRepo.save((Process) EasyMock.anyObject())).andReturn(process);
         expect(processModelVersionRepo.save((ProcessModelVersion) EasyMock.anyObject())).andReturn(pmv);
         expect(processBranchRepo.save((ProcessBranch) EasyMock.anyObject())).andReturn(branch);
-        workspaceSrv.removePublicStatusForUsers(process);
 
         replayAll();
 

Apromore-Custom-Plugins/Access-Control-Portal-Plugin/src/main/java/org/apromore/plugin/portal/accesscontrol/controllers/AccessController.java

@@ -573,9 +573,9 @@ private void applyChanges() {
       String rowGuid = group.getRowGuid();
       String name = group.getName();
       if (selectedItem instanceof FolderType) {
-        authorizationService.deleteFolderAccess(selectedItemId, rowGuid);
+        authorizationService.deleteFolderAccess(selectedItemId, rowGuid, accessType);
       } else if (selectedItem instanceof ProcessSummaryType) {
-        authorizationService.deleteProcessAccess(selectedItemId, rowGuid);
+        authorizationService.deleteProcessAccess(selectedItemId, rowGuid, accessType);
       } else if (selectedItem instanceof LogSummaryType) {
         authorizationService.deleteLogAccess(selectedItemId, rowGuid, name, accessType);
       } else if (selectedItem instanceof UserMetadataSummaryType) {

Apromore-Database/src/main/java/org/apromore/dao/model/Folder.java

@@ -311,7 +311,7 @@ public void setParentFolderChain(String parentFolderChain) {
         this.parentFolderChain = parentFolderChain;
     }
 
-    @OneToMany(fetch = FetchType.EAGER, mappedBy = "folder", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "folder", cascade = CascadeType.ALL, orphanRemoval = true)
     public Set<GroupFolder> getGroupFolders() {
         return this.groupFolders;
     }