add flow group service

Author: gy2006

core/src/main/java/com/flowci/core/common/config/WebConfig.java

@@ -71,6 +71,7 @@ public void addInterceptors(InterceptorRegistry registry) {
                         .addPathPatterns("/users/**")
                         .excludePathPatterns("/users/default")
                         .addPathPatterns("/flows/**")
+                        .addPathPatterns("/flow_groups/**")
                         .addPathPatterns("/jobs/**")
                         .addPathPatterns("/agents/**")
                         .addPathPatterns("/hosts/**")

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

@@ -92,7 +92,9 @@ public Flow confirm(@PathVariable String name, @RequestBody ConfirmOption option
     @DeleteMapping("/{name}")
     @Action(FlowAction.DELETE)
     public Flow delete(@PathVariable String name) {
-        return flowService.delete(name);
+        var flow = flowService.get(name);
+        flowService.delete(flow);
+        return flow;
     }
 
     /**

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

@@ -0,0 +1,65 @@
+package com.flowci.core.flow.controller;
+
+import com.flowci.core.auth.annotation.Action;
+import com.flowci.core.flow.domain.FlowAction;
+import com.flowci.core.flow.domain.FlowGroup;
+import com.flowci.core.flow.service.FlowGroupService;
+import com.flowci.core.flow.service.FlowService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Set;
+
+@RestController
+@RequestMapping("/flow_groups")
+public class FlowGroupController {
+
+    private final FlowService flowService;
+    private final FlowGroupService flowGroupService;
+
+    @Autowired
+    public FlowGroupController(FlowService flowService, FlowGroupService flowGroupService) {
+        this.flowService = flowService;
+        this.flowGroupService = flowGroupService;
+    }
+
+    @PostMapping("/{name}")
+    @Action(FlowAction.GROUP_UPDATE)
+    public FlowGroup create(@PathVariable String name) {
+        return flowGroupService.create(name);
+    }
+
+    @PostMapping
+    @Action(FlowAction.GROUP_READ)
+    public List<FlowGroup> list(@RequestBody Set<String> ids) {
+        return flowGroupService.list(ids);
+    }
+
+    @PostMapping("/{groupName}/{flowName}")
+    @Action(FlowAction.GROUP_UPDATE)
+    public void addToGroup(@PathVariable String groupName, @PathVariable String flowName) {
+        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) {
+        var group = flowGroupService.get(name);
+
+        if (deleteFlow) {
+            var flowList = flowGroupService.flows(group.getId());
+            for (var flow : flowList) {
+                flowService.delete(flow);
+            }
+        }
+
+        flowGroupService.delete(group.getName());
+    }
+}

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

@@ -35,6 +35,8 @@ public interface FlowDao extends MongoRepository<Flow, String> {
 
     List<Flow> findAllByStatus(Status status);
 
+    List<Flow> findAllByGroupId(String groupId);
+
     List<Flow> findAllByStatusAndCreatedBy(Status status, String createdBy);
 
     List<Flow> findAllByIdInAndStatus(Collection<String> id, Status status);

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

@@ -57,6 +57,9 @@ public abstract class FlowAction {
 
     public static final String LIST_PLUGINS = "list_plugins";
 
+    public static final String GROUP_READ = "group_read";
+    public static final String GROUP_UPDATE = "group_operation";
+
     public static final List<String> ALL = ImmutableList.of(
             CREATE,
             CHECK_NAME,
@@ -74,7 +77,8 @@ public abstract class FlowAction {
             ADD_USER,
             REMOVE_USER,
             LIST_USER,
-            LIST_PLUGINS
+            LIST_PLUGINS,
+            GROUP_READ,
+            GROUP_UPDATE
     );
-
 }

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

@@ -1,5 +1,6 @@
 package com.flowci.core.flow.service;
 
+import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.FlowGroup;
 
 import java.util.Collection;
@@ -11,7 +12,19 @@ public interface FlowGroupService {
 
     List<FlowGroup> list(Collection<String> ids);
 
+    List<Flow> flows(String id);
+
     FlowGroup create(String name);
 
+    /**
+     * Add flow to a group
+     */
+    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

@@ -1,6 +1,8 @@
 package com.flowci.core.flow.service;
 
+import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.FlowGroupDao;
+import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.FlowGroup;
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
@@ -15,9 +17,13 @@
 @Service
 public class FlowGroupServiceImpl implements FlowGroupService {
 
+    private final FlowDao flowDao;
+
     private final FlowGroupDao flowGroupDao;
 
-    public FlowGroupServiceImpl(FlowGroupDao flowGroupDao) {
+    @Autowired
+    public FlowGroupServiceImpl(FlowDao flowDao, FlowGroupDao flowGroupDao) {
+        this.flowDao = flowDao;
         this.flowGroupDao = flowGroupDao;
     }
 
@@ -46,8 +52,36 @@ public FlowGroup create(String name) {
         }
     }
 
+    @Override
+    public void addToGroup(String flowName, String groupName) {
+        var group = get(groupName);
+        var flow = getFlow(flowName);
+        flow.setGroupId(group.getId());
+        flowDao.save(flow);
+    }
+
+    @Override
+    public void removeFromGroup(String flowName) {
+        var flow = getFlow(flowName);
+        flow.setGroupId(null);
+        flowDao.save(flow);
+    }
+
     @Override
     public void delete(String name) {
         flowGroupDao.deleteByName(name);
     }
+
+    @Override
+    public List<Flow> flows(String id) {
+        return flowDao.findAllByGroupId(id);
+    }
+
+    private Flow getFlow(String flowName) {
+        var flow = flowDao.findByName(flowName);
+        if (flow.isEmpty()) {
+            throw new NotFoundException("the flow {0} not found", flowName);
+        }
+        return flow.get();
+    }
 }

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

@@ -72,7 +72,7 @@ public interface FlowService {
     /**
      * Delete flow and yml
      */
-    Flow delete(String name);
+    void delete(Flow flow);
 
     /**
      * Create ssh-rsa credential

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

@@ -157,14 +157,17 @@ public Flow create(String name) {
     }
 
     @Override
-    public Flow create(String name, String groupId) {
+    public Flow create(String name, String groupName) {
         Flow.validateName(name);
         String email = sessionManager.getUserEmail();
 
-        if (groupId != null) {
-            if (!flowGroupDao.existsById(groupId)) {
-                throw new NotFoundException("The group id {0} not found", groupId);
+        String groupId = null;
+        if (groupName != null) {
+            var optional = flowGroupDao.findByName(groupName);
+            if (optional.isEmpty()) {
+                throw new NotFoundException("group {0} not found", groupName);
             }
+            groupId = optional.get().getId();
         }
 
         // reuse from pending list
@@ -260,16 +263,14 @@ public Flow getById(String id) {
     }
 
     @Override
-    public Flow delete(String name) {
-        Flow flow = get(name);
+    public void delete(Flow flow) {
         flowDao.delete(flow);
         flowUserDao.delete(flow.getId());
 
         ymlService.delete(flow.getId());
         cronService.cancel(flow);
 
         eventManager.publish(new FlowDeletedEvent(this, flow));
-        return flow;
     }
 
     @Override