delete remove group endpoint, refactor user list of group

Author: gy2006

core/src/main/java/com/flowci/core/flow/controller/FlowController.java

@@ -43,19 +43,15 @@ public class FlowController {
 
     private final FlowService flowService;
 
-    private final FlowGroupService flowGroupService;
-
     private final FlowItemService flowItemService;
 
     public FlowController(List<Template> templates,
                           UserService userService,
                           FlowService flowService,
-                          FlowGroupService flowGroupService,
                           FlowItemService flowItemService) {
         this.templates = templates;
         this.userService = userService;
         this.flowService = flowService;
-        this.flowGroupService = flowGroupService;
         this.flowItemService = flowItemService;
     }
 

core/src/main/java/com/flowci/core/flow/controller/FlowGroupController.java

@@ -33,12 +33,6 @@ public void addToGroup(@PathVariable String groupName, @PathVariable String flow
         flowGroupService.addToGroup(flowName, groupName);
     }
 
-    @DeleteMapping("/{groupName}/{flowName}")
-    @Action(FlowAction.GROUP_UPDATE)
-    public void removeFromGroup(@PathVariable("groupName") String ignore, @PathVariable String flowName) {
-        flowGroupService.removeFromGroup(flowName);
-    }
-
     @DeleteMapping("/{name}")
     @Action(FlowAction.GROUP_UPDATE)
     public void delete(@PathVariable String name, @RequestParam(required = false) boolean deleteFlow) {

core/src/main/java/com/flowci/core/flow/dao/FlowItemDao.java

@@ -6,11 +6,12 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 
 @Repository
 public interface FlowItemDao extends MongoRepository<FlowItem, String> {
 
-    List<FlowItem> findAllByIdInOrderByCreatedAt(Collection<String> ids);
+    Set<FlowItem> findAllByIdIn(Collection<String> ids);
 
     boolean existsByName(String name);
 }

core/src/main/java/com/flowci/core/flow/domain/FlowItem.java

@@ -17,7 +17,9 @@
 @Document("flow")
 public class FlowItem extends Mongoable {
 
-    private final static String DefaultRootId = "-1";
+    public final static String ROOT_ID = "-1";
+
+    public final static String ROOT_NAME = "flows";
 
     public enum Type {
         Flow,
@@ -35,9 +37,13 @@ public enum Type {
     /**
      * Parent flow item id
      */
-    protected String parentId = DefaultRootId;
+    protected String parentId = ROOT_ID;
 
     public boolean hasParentId() {
         return StringHelper.hasValue(parentId);
     }
+
+    public boolean hasRootParent() {
+        return hasParentId() && parentId.equals(ROOT_ID);
+    }
 }

core/src/main/java/com/flowci/core/flow/service/FlowGroupService.java

@@ -18,10 +18,5 @@ public interface FlowGroupService {
      */
     void addToGroup(String flowName, String groupName);
 
-    /**
-     * Remove flow from a group
-     */
-    void removeFromGroup(String flowName);
-
     void delete(String name);
 }

core/src/main/java/com/flowci/core/flow/service/FlowGroupServiceImpl.java

@@ -6,6 +6,7 @@
 import com.flowci.core.flow.dao.FlowUserDao;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.FlowGroup;
+import com.flowci.core.flow.domain.FlowItem;
 import com.flowci.exception.ArgumentException;
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
@@ -70,20 +71,14 @@ public void addToGroup(String flowName, String groupName) {
             throw new ArgumentException("Cannot add to same group");
         }
 
-        var group = get(groupName);
-        var flow = getFlow(flowName);
-        flow.setParentId(group.getId());
-        flowDao.save(flow);
-
-        // add all users from current flow to parent group
-        var users = flowUserDao.findAllUsers(flow.getId());
-        flowUserDao.insert(group.getId(), Sets.newHashSet(users));
-    }
+        var groupId = FlowItem.ROOT_ID;
+        if (!FlowItem.ROOT_NAME.equals(groupName)) {
+            var group = get(groupName);
+            groupId = group.getId();
+        }
 
-    @Override
-    public void removeFromGroup(String flowName) {
         var flow = getFlow(flowName);
-        flow.setParentId(null);
+        flow.setParentId(groupId);
         flowDao.save(flow);
     }
 

core/src/main/java/com/flowci/core/flow/service/FlowItemServiceImpl.java

@@ -4,9 +4,10 @@
 import com.flowci.core.flow.dao.FlowItemDao;
 import com.flowci.core.flow.dao.FlowUserDao;
 import com.flowci.core.flow.domain.FlowItem;
+import com.google.common.collect.ImmutableList;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.*;
 
 @Service
 public class FlowItemServiceImpl implements FlowItemService {
@@ -26,8 +27,27 @@ public FlowItemServiceImpl(FlowItemDao flowItemDao, FlowUserDao flowUserDao, Ses
     @Override
     public List<FlowItem> list() {
         var email = sessionManager.getUserEmail();
-        List<String> flows = flowUserDao.findAllFlowsByUserEmail(email);
-        return flowItemDao.findAllByIdInOrderByCreatedAt(flows);
+
+        List<String> itemIdList = flowUserDao.findAllFlowsByUserEmail(email);
+        Set<FlowItem> items = flowItemDao.findAllByIdIn(itemIdList);
+
+        // find all group id, since need to load group that user has permission for flow
+        Set<String> groupIdSet = new HashSet<>(items.size() / 2);
+        for (FlowItem item : items) {
+            if (item.hasRootParent()) {
+                continue;
+            }
+            groupIdSet.add(item.getParentId());
+        }
+
+        // load and remove duplicated groups, since some groups created by current user
+        Set<FlowItem> groups = flowItemDao.findAllByIdIn(groupIdSet);
+        items.removeAll(groups);
+
+        List<FlowItem> list = new ArrayList<>(items.size() + groups.size());
+        list.addAll(items);
+        list.addAll(groups);
+        return list;
     }
 
     @Override