apply flow item and group

Author: gy2006

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

@@ -24,6 +24,8 @@
 import com.flowci.core.common.mongo.VariableMapConverter;
 import com.flowci.core.config.domain.SmtpConfig;
 import com.flowci.core.config.domain.TextConfig;
+import com.flowci.core.flow.domain.Flow;
+import com.flowci.core.flow.domain.FlowGroup;
 import com.flowci.core.git.domain.GitConfig;
 import com.flowci.core.git.domain.GitConfigWithHost;
 import com.flowci.core.job.domain.JobItem;
@@ -58,14 +60,17 @@
 @EnableMongoAuditing(auditorAwareRef = "sessionManager")
 public class MongoConfig extends AbstractMongoClientConfiguration {
 
-    @Autowired
-    private AppProperties appProperties;
+    private final AppProperties appProperties;
 
-    @Autowired
-    private MongoProperties mongoProperties;
+    private final MongoProperties mongoProperties;
 
-    @Autowired
-    private ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
+
+    public MongoConfig(AppProperties appProperties, MongoProperties mongoProperties, ObjectMapper objectMapper) {
+        this.appProperties = appProperties;
+        this.mongoProperties = mongoProperties;
+        this.objectMapper = objectMapper;
+    }
 
     @NonNull
     @Override
@@ -97,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/FlowGroupDao.java

@@ -0,0 +1,9 @@
+package com.flowci.core.flow.dao;
+
+import com.flowci.core.flow.domain.FlowGroup;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FlowGroupDao extends MongoRepository<FlowGroup, String> {
+}

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

@@ -0,0 +1,9 @@
+package com.flowci.core.flow.dao;
+
+import com.flowci.core.flow.domain.FlowItem;
+import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FlowItemDao extends MongoRepository<FlowItem, String> {
+}

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

@@ -17,7 +17,6 @@
 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;
@@ -30,21 +29,18 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import lombok.ToString;
-import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Objects;
 
 /**
  * @author yang
  */
-@Document(collection = "flow")
 @Getter
 @Setter
 @NoArgsConstructor
-@ToString(of = {"name"}, callSuper = true)
-public final class Flow extends Mongoable implements Pathable {
+@Document(collection = "flow")
+public final class Flow extends FlowItem implements Pathable {
 
     public static Pathable path(String id) {
         Flow flow = new Flow();
@@ -65,9 +61,6 @@ public enum Status {
         CONFIRMED
     }
 
-    @Indexed(name = "index_flow_name")
-    private String name;
-
     private Status status = Status.PENDING;
 
     private boolean isYamlFromRepo;
@@ -81,10 +74,7 @@ public enum Status {
     private String cron;
 
     // variables from yml
-    private Vars<String> variables = new StringVars();
-
-    // variables for flow obj only
-    private Vars<VarValue> locally = new TypedVars();
+    private Vars<String> readOnlyVars = new StringVars();
 
     private WebhookStatus webhookStatus;
 
@@ -120,16 +110,17 @@ public String getGitUrl() {
      * Get credential name from vars, local var has top priority
      */
     private String findVar(String name) {
-        VarValue cnVal = locally.get(name);
+        VarValue cnVal = vars.get(name);
         if (!Objects.isNull(cnVal)) {
             return cnVal.getData();
         }
 
-        String cn = variables.get(name);
+        String cn = readOnlyVars.get(name);
         if (StringHelper.hasValue(cn)) {
             return cn;
         }
 
         return StringHelper.EMPTY;
     }
 }
+

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

@@ -0,0 +1,17 @@
+package com.flowci.core.flow.domain;
+
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.LinkedList;
+import java.util.List;
+
+@Setter
+@Getter
+@Document(collection = "flow")
+public class FlowGroup extends FlowItem {
+
+    private List<String> flows = new LinkedList<>();
+}

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

@@ -0,0 +1,22 @@
+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.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+@Setter
+@Getter
+@ToString(of = {"name"})
+public abstract class FlowItem extends Mongoable {
+
+    @Indexed(name = "index_flow_name")
+    protected String name;
+
+    protected Vars<VarValue> vars = new TypedVars();
+
+}

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

@@ -195,7 +195,7 @@ public Flow confirm(String name, ConfirmOption option) {
             throw new DuplicateException("Flow {0} has created", name);
         }
 
-        Vars<VarValue> localVars = flow.getLocally();
+        Vars<VarValue> localVars = flow.getVars();
 
         if (option.hasGitUrl()) {
             localVars.put(Variables.Git.URL, VarValue.of(option.getGitUrl(), VarType.GIT_URL, true));
@@ -357,7 +357,7 @@ public void onGitHookEvent(GitHookEvent event) {
     // ====================================================================
 
     private void setupDefaultVars(Flow flow) {
-        Vars<VarValue> localVars = flow.getLocally();
+        Vars<VarValue> localVars = flow.getVars();
         localVars.put(Variables.Flow.Name, VarValue.of(flow.getName(), VarType.STRING, false));
     }
 

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

@@ -87,7 +87,7 @@ public void add(Flow flow, Map<String, VarValue> vars) {
             boolean isVerified = varManager.verify(value.getType(), value.getData());
 
             if (isVerified) {
-                flow.getLocally().put(name, value);
+                flow.getVars().put(name, value);
                 continue;
             }
 
@@ -100,7 +100,7 @@ public void add(Flow flow, Map<String, VarValue> vars) {
     @Override
     public void remove(Flow flow, List<String> vars) {
         for (String key : vars) {
-            flow.getLocally().remove(key);
+            flow.getVars().remove(key);
         }
 
         flowDao.save(flow);

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

@@ -127,7 +127,7 @@ public Yml saveYml(Flow flow, String name, String yaml) {
         }
 
         // sync flow envs from yml root envs
-        Vars<String> vars = flow.getVariables();
+        Vars<String> vars = flow.getReadOnlyVars();
         vars.clear();
         vars.merge(root.getEnvironments());
         flowDao.save(flow);

core/src/main/java/com/flowci/core/job/service/JobServiceImpl.java

@@ -457,7 +457,7 @@ private void setTriggerBy(Job job) {
 
     private void initJobContext(Job job, Flow flow, Vars<String> inputs) {
         StringVars context = new StringVars();
-        context.mergeFromTypedVars(flow.getLocally());
+        context.mergeFromTypedVars(flow.getVars());
 
         Settings settings = settingService.get();
         JobContextHelper.setServerUrl(job, settings.getServerUrl());