add flow group to user list

Author: gy2006

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

@@ -102,6 +102,9 @@ 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/dao/FlowDao.java

@@ -35,7 +35,7 @@ public interface FlowDao extends MongoRepository<Flow, String> {
 
     List<Flow> findAllByStatus(Status status);
 
-    List<Flow> findAllByGroupId(String groupId);
+    List<Flow> findAllByParentId(String parentId);
 
     List<Flow> findAllByStatusAndCreatedBy(Status status, String createdBy);
 

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

@@ -17,8 +17,8 @@
 
 package com.flowci.core.flow.dao;
 
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 public interface FlowUserDao {
 
@@ -42,12 +42,12 @@ public interface FlowUserDao {
     /**
      * Batch insert users
      */
-    void insert(String flowId, Set<String> emails);
+    void insert(String flowId, Collection<String> emails);
 
     /**
      * Batch remove users
      */
-    void remove(String flowId, Set<String> emails);
+    void remove(String flowId, Collection<String> emails);
 
     /**
      * Check user is existed

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

@@ -71,14 +71,14 @@ public List<String> findAllUsers(String flowId) {
     }
 
     @Override
-    public void insert(String flowId, Set<String> emails) {
+    public void insert(String flowId, Collection<String> emails) {
         Query q = Query.query(Criteria.where("_id").is(flowId));
         Update u = new Update().addToSet("users").each(emails);
         mongoOps.upsert(q, u, FlowUsers.class);
     }
 
     @Override
-    public void remove(String flowId, Set<String> emails) {
+    public void remove(String flowId, Collection<String> emails) {
         Query q = Query.query(Criteria.where("_id").is(flowId));
 
         Update u = new Update();

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

@@ -17,21 +17,18 @@
 package com.flowci.core.flow.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.flowci.core.common.domain.Mongoable;
 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;
 import com.flowci.store.Pathable;
 import com.flowci.tree.NodePath;
 import com.flowci.util.StringHelper;
 import com.google.common.collect.ImmutableSet;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
-import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Objects;
@@ -42,9 +39,9 @@
  */
 @Getter
 @Setter
-@NoArgsConstructor
 @Document(collection = "flow")
-public final class Flow extends Mongoable implements Pathable {
+@EqualsAndHashCode(callSuper = true)
+public final class Flow extends FlowItem implements Pathable {
 
     private static final Set<String> reservedFlowNames = ImmutableSet.<String>builder()
             .add("flows")
@@ -73,13 +70,6 @@ public enum Status {
         CONFIRMED
     }
 
-    @Indexed(name = "index_flow_name")
-    private String name;
-
-    private Vars<VarValue> vars = new TypedVars();
-
-    private String groupId;
-
     private Status status = Status.PENDING;
 
     private boolean isYamlFromRepo;
@@ -97,7 +87,12 @@ public enum Status {
 
     private WebhookStatus webhookStatus;
 
+    public Flow() {
+        this.type = Type.Flow;
+    }
+
     public Flow(String name) {
+        this();
         this.name = name;
     }
 

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

@@ -1,22 +1,19 @@
 package com.flowci.core.flow.domain;
 
 
-import com.flowci.core.common.domain.Mongoable;
-import com.flowci.domain.TypedVars;
-import com.flowci.domain.VarValue;
-import com.flowci.domain.Vars;
+import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 @Setter
 @Getter
-@Document(collection = "flow_group")
-public class FlowGroup extends Mongoable {
+@Document(collection = "flow")
+@EqualsAndHashCode(callSuper = true)
+public class FlowGroup extends FlowItem {
 
-    @Indexed(name = "index_group_name")
-    protected String name;
+    public FlowGroup() {
+        super.type = Type.Group;
+    }
 
-    protected Vars<VarValue> vars = new TypedVars();
 }

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

@@ -0,0 +1,39 @@
+package com.flowci.core.flow.domain;
+
+import com.flowci.core.common.domain.Mongoable;
+import com.flowci.domain.TypedVars;
+import com.flowci.domain.VarValue;
+import com.flowci.domain.Vars;
+import com.flowci.util.StringHelper;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+@Getter
+@Setter
+@EqualsAndHashCode(callSuper = true)
+public abstract class FlowItem extends Mongoable {
+
+    public enum Type {
+        Flow,
+
+        Group
+    }
+
+    @Indexed(name = "index_flow_name")
+    protected String name;
+
+    protected Type type;
+
+    protected Vars<VarValue> vars = new TypedVars();
+
+    /**
+     * Parent flow item id
+     */
+    protected String parentId;
+
+    public boolean hasParentId() {
+        return StringHelper.hasValue(parentId);
+    }
+}

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

@@ -3,15 +3,12 @@
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.FlowGroup;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface FlowGroupService {
 
     FlowGroup get(String name);
 
-    List<FlowGroup> list(Collection<String> ids);
-
     List<Flow> flows(String id);
 
     FlowGroup create(String name);

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

@@ -1,16 +1,18 @@
 package com.flowci.core.flow.service;
 
+import com.flowci.core.common.manager.SessionManager;
 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.Flow;
 import com.flowci.core.flow.domain.FlowGroup;
 import com.flowci.exception.DuplicateException;
 import com.flowci.exception.NotFoundException;
+import com.google.common.collect.Sets;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
@@ -21,10 +23,19 @@ public class FlowGroupServiceImpl implements FlowGroupService {
 
     private final FlowGroupDao flowGroupDao;
 
+    private final FlowUserDao flowUserDao;
+
+    private final SessionManager sessionManager;
+
     @Autowired
-    public FlowGroupServiceImpl(FlowDao flowDao, FlowGroupDao flowGroupDao) {
+    public FlowGroupServiceImpl(FlowDao flowDao,
+                                FlowGroupDao flowGroupDao,
+                                FlowUserDao flowUserDao,
+                                SessionManager sessionManager) {
         this.flowDao = flowDao;
         this.flowGroupDao = flowGroupDao;
+        this.flowUserDao = flowUserDao;
+        this.sessionManager = sessionManager;
     }
 
     @Override
@@ -36,17 +47,17 @@ public FlowGroup get(String name) {
         return optional.get();
     }
 
-    @Override
-    public List<FlowGroup> list(Collection<String> ids) {
-        return flowGroupDao.findAllByIdIn(ids);
-    }
-
     @Override
     public FlowGroup create(String name) {
+        var email = sessionManager.getUserEmail();
+
+        var group = new FlowGroup();
+        group.setName(name);
+
         try {
-            var group = new FlowGroup();
-            group.setName(name);
-            return flowGroupDao.save(group);
+            flowGroupDao.save(group);
+            flowUserDao.insert(group.getId(), Sets.newHashSet(email));
+            return group;
         } catch (DuplicateKeyException e) {
             throw new DuplicateException("Group {0} already exists", name);
         }
@@ -56,14 +67,18 @@ public FlowGroup create(String name) {
     public void addToGroup(String flowName, String groupName) {
         var group = get(groupName);
         var flow = getFlow(flowName);
-        flow.setGroupId(group.getId());
+        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));
     }
 
     @Override
     public void removeFromGroup(String flowName) {
         var flow = getFlow(flowName);
-        flow.setGroupId(null);
+        flow.setParentId(null);
         flowDao.save(flow);
     }
 
@@ -74,7 +89,7 @@ public void delete(String name) {
 
     @Override
     public List<Flow> flows(String id) {
-        return flowDao.findAllByGroupId(id);
+        return flowDao.findAllByParentId(id);
     }
 
     private Flow getFlow(String flowName) {

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

@@ -176,20 +176,17 @@ public Flow create(String name, String groupName) {
 
         // set properties
         flow.setName(name);
-        flow.setGroupId(groupId);
+        flow.setParentId(groupId);
         setupDefaultVars(flow);
 
         try {
             flowDao.save(flow);
-            flowUserDao.create(flow.getId());
             fileManager.create(flow);
-            addUsers(flow, flow.getCreatedBy());
             eventManager.publish(new FlowCreatedEvent(this, flow));
         } catch (DuplicateKeyException e) {
             throw new DuplicateException("Flow {0} already exists", name);
         } catch (IOException e) {
             flowDao.delete(flow);
-            flowUserDao.delete(flow.getId());
             log.error(e);
             throw new StatusException("Cannot create flow workspace");
         }
@@ -218,7 +215,12 @@ public Flow confirm(String name, ConfirmOption option) {
         flow.setStatus(Status.CONFIRMED);
 
         if (option.hasBlankTemplate()) {
-            return flowDao.save(flow);
+            flowDao.save(flow);
+
+            flowUserDao.create(flow.getId());
+            addUsers(flow, flow.getUpdatedBy());
+
+            return flow;
         }
 
         // load YAML from template
@@ -238,7 +240,10 @@ public Flow confirm(String name, ConfirmOption option) {
             return flow;
         }
 
-        return flowDao.save(flow);
+        flowDao.save(flow);
+        flowUserDao.create(flow.getId());
+        addUsers(flow, flow.getUpdatedBy());
+        return flow;
     }
 
     @Override
@@ -297,7 +302,12 @@ public String setAuthCredential(String name, SimpleAuthPair keyPair) {
 
     @Override
     public void addUsers(Flow flow, String... emails) {
-        flowUserDao.insert(flow.getId(), Sets.newHashSet(emails));
+        var emailSet = Sets.newHashSet(emails);
+        flowUserDao.insert(flow.getId(), emailSet);
+
+        if (flow.hasParentId()) {
+            flowUserDao.insert(flow.getParentId(), emailSet);
+        }
     }
 
     @Override