create flow with group id

Author: gy2006

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

@@ -102,9 +102,6 @@ public MongoMappingContext mongoMappingContext(MongoCustomConversions customConv
         context.setAutoIndexCreation(true);
 
         // add addPersistentEntity for subtypes since not registered if called within same thread
-        context.addEntity(Flow.class);
-        context.addEntity(FlowGroup.class);
-
         context.addEntity(SmtpConfig.class);
         context.addEntity(TextConfig.class);
 

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

@@ -75,7 +75,11 @@ public Boolean exist(@PathVariable String name) {
 
     @PostMapping(value = "/{name}")
     @Action(FlowAction.CREATE)
-    public Flow create(@PathVariable String name) {
+    public Flow create(@PathVariable String name,
+                       @RequestParam(required = false) String groupId) {
+        if (groupId != null) {
+            return flowService.create(name, groupId);
+        }
         return flowService.create(name);
     }
 

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

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.core.common.domain.Variables;
 import com.flowci.domain.StringVars;
-import com.flowci.domain.TypedVars;
 import com.flowci.domain.VarValue;
 import com.flowci.domain.Vars;
 import com.flowci.exception.ArgumentException;
@@ -61,6 +60,8 @@ public enum Status {
         CONFIRMED
     }
 
+    private String groupId;
+
     private Status status = Status.PENDING;
 
     private boolean isYamlFromRepo;

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

@@ -5,13 +5,9 @@
 import lombok.Setter;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.util.LinkedList;
-import java.util.List;
-
 @Setter
 @Getter
-@Document(collection = "flow")
+@Document(collection = "flow_group")
 public class FlowGroup extends FlowItem {
 
-    private List<String> flows = new LinkedList<>();
 }

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

@@ -49,6 +49,8 @@ public interface FlowService {
      */
     Flow create(String name);
 
+    Flow create(String name, String groupId);
+
     /**
      * Confirm flow
      *

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

@@ -22,6 +22,7 @@
 import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.flow.dao.FlowDao;
+import com.flowci.core.flow.dao.FlowGroupDao;
 import com.flowci.core.flow.dao.FlowUserDao;
 import com.flowci.core.flow.domain.*;
 import com.flowci.core.flow.domain.Flow.Status;
@@ -67,6 +68,9 @@ public class FlowServiceImpl implements FlowService {
     @Autowired
     private FlowDao flowDao;
 
+    @Autowired
+    private FlowGroupDao flowGroupDao;
+
     @Autowired
     private FlowUserDao flowUserDao;
 
@@ -132,7 +136,6 @@ public List<Flow> listByCredential(String secretName) {
             if (Objects.equals(flow.getCredentialName(), secret.getName())) {
                 continue;
             }
-
             iter.remove();
         }
 
@@ -150,19 +153,31 @@ public Boolean exist(String name) {
 
     @Override
     public Flow create(String name) {
+        return create(name, null);
+    }
+
+    @Override
+    public Flow create(String name, String groupId) {
         Flow.validateName(name);
         String email = sessionManager.getUserEmail();
 
         if (exist(name)) {
             throw new DuplicateException("Flow {0} already exists", name);
         }
 
+        if (groupId != null) {
+            if (!flowGroupDao.existsById(groupId)) {
+                throw new NotFoundException("The group id {0} not found", groupId);
+            }
+        }
+
         // reuse from pending list
         List<Flow> pending = flowDao.findAllByStatusAndCreatedBy(Status.PENDING, email);
         var flow = pending.size() > 0 ? pending.get(0) : new Flow();
 
         // set properties
         flow.setName(name);
+        flow.setGroupId(groupId);
         setupDefaultVars(flow);
 
         try {

core/src/test/java/com/flowci/core/test/api/OpenRestServiceTest.java

@@ -79,7 +79,7 @@ public void should_list_all_flow_users() {
     @Test
     public void should_save_job_report() {
         // given:
-        Flow flow = flowService.create("user-test");
+        Flow flow = flowService.create("user-test", null);
 
         Job job = new Job();
         job.setId("12345");