refactor local task

Author: gy2006

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

@@ -22,6 +22,7 @@
 import com.flowci.core.flow.service.FlowService;
 import com.flowci.core.flow.service.YmlService;
 import com.flowci.domain.http.RequestMessage;
+import com.flowci.tree.FlowNode;
 import com.flowci.tree.StepNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -43,10 +44,10 @@ public class YmlController {
     @Autowired
     private YmlService ymlService;
 
-    @GetMapping("/{name}/yml/steps")
-    public List<StepNode> listSteps(@PathVariable String name) {
+    @GetMapping("/{name}/yml/obj")
+    public FlowNode listSteps(@PathVariable String name) {
         Flow flow = flowService.get(name);
-        return ymlService.ListChildren(flow);
+        return ymlService.getRaw(flow);
     }
 
     @PostMapping("/{name}/yml")

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

@@ -19,7 +19,10 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.core.common.domain.Mongoable;
 import com.flowci.core.common.domain.Variables;
-import com.flowci.domain.*;
+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;
@@ -28,8 +31,6 @@
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -82,8 +83,6 @@ public enum Status {
 
     private WebhookStatus webhookStatus;
 
-    private List<Notification> notifications = new LinkedList<>();
-
     public Flow(String name) {
         this.name = name;
     }

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

@@ -18,6 +18,7 @@
 
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.Yml;
+import com.flowci.tree.FlowNode;
 import com.flowci.tree.Node;
 import com.flowci.tree.StepNode;
 
@@ -29,9 +30,9 @@
 public interface YmlService {
 
     /**
-     * List all children node from YAML
+     * Get FlowNode that represent yaml in obj
      */
-    List<StepNode> ListChildren(Flow flow);
+    FlowNode getRaw(Flow flow);
 
     /**
      * Get yml by flow

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

@@ -17,7 +17,6 @@
 package com.flowci.core.flow.service;
 
 import com.flowci.core.common.manager.SpringEventManager;
-import com.flowci.core.flow.dao.FlowDao;
 import com.flowci.core.flow.dao.YmlDao;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.flow.domain.Yml;
@@ -40,7 +39,9 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.*;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
 
 /**
  * @author yang
@@ -54,9 +55,6 @@ public class YmlServiceImpl implements YmlService {
     @Autowired
     private YmlDao ymlDao;
 
-    @Autowired
-    private FlowDao flowDao;
-
     @Autowired
     private SpringEventManager eventManager;
 
@@ -68,14 +66,12 @@ public class YmlServiceImpl implements YmlService {
     //====================================================================
 
     @Override
-    public List<StepNode> ListChildren(Flow flow) {
+    public FlowNode getRaw(Flow flow) {
         Optional<Yml> optional = ymlDao.findById(flow.getId());
-        if (!optional.isPresent()) {
-            return Collections.emptyList();
+        if (optional.isPresent()) {
+            return YmlParser.load(flow.getName(), optional.get().getRaw());
         }
-
-        FlowNode root = YmlParser.load(flow.getName(), optional.get().getRaw());
-        return root.getChildren();
+        throw new NotFoundException("No yml defined for flow {0}", flow.getName());
     }
 
     @Override
@@ -107,10 +103,6 @@ public Yml saveYml(Flow flow, String yml) {
         vars.clear();
         vars.merge(root.getEnvironments());
 
-        // set notifications from yml
-        flow.setNotifications(root.getNotifications());
-        flowDao.save(flow);
-
         // update cron task
         cronService.update(flow, root, ymlObj);
         return ymlObj;

core/src/main/java/com/flowci/core/job/JobController.java

@@ -75,6 +75,9 @@ public class JobController {
     @Autowired
     private StepService stepService;
 
+    @Autowired
+    private LocalTaskService localTaskService;
+
     @Autowired
     private LoggingService loggingService;
 
@@ -135,7 +138,7 @@ public List<ExecutedCmd> listSteps(@PathVariable String flow,
     public List<ExecutedLocalTask> listTasks(@PathVariable String flow,
                                              @PathVariable String buildNumberOrLatest) {
         Job job = get(flow, buildNumberOrLatest);
-        return stepService.listTasks(job);
+        return localTaskService.list(job);
     }
 
     @GetMapping("/logs/{executedCmdId}")

core/src/main/java/com/flowci/core/job/dao/ExecutedLocalTaskDao.java

@@ -5,9 +5,12 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface ExecutedLocalTaskDao extends MongoRepository<ExecutedLocalTask, String> {
 
     List<ExecutedLocalTask> findAllByJobId(String jobId);
+
+    Optional<ExecutedLocalTask> findByJobIdAndAndName(String jobId, String name);
 }

core/src/main/java/com/flowci/core/job/domain/Executed.java

@@ -0,0 +1,57 @@
+package com.flowci.core.job.domain;
+
+import com.google.common.collect.ImmutableSet;
+import lombok.Getter;
+
+import java.util.Date;
+import java.util.Set;
+
+public interface Executed {
+
+    Set<Status> FailureStatus = ImmutableSet.of(
+            Status.EXCEPTION,
+            Status.KILLED,
+            Status.TIMEOUT
+    );
+
+    Set<Status> SuccessStatus = ImmutableSet.of(
+            Status.SUCCESS,
+            Status.SKIPPED
+    );
+
+    enum Status {
+
+        PENDING(-1),
+
+        RUNNING(1),
+
+        SUCCESS(2),
+
+        SKIPPED(2),
+
+        EXCEPTION(3),
+
+        KILLED(3),
+
+        TIMEOUT(4);
+
+        @Getter
+        private final Integer level;
+
+        Status(Integer level) {
+            this.level = level;
+        }
+    }
+
+    Integer getCode();
+
+    Status getStatus();
+
+    String getContainerId();
+
+    Date getStartAt();
+
+    Date getFinishAt();
+
+    String getError();
+}

core/src/main/java/com/flowci/core/job/domain/ExecutedCmd.java

@@ -20,18 +20,14 @@
 import com.flowci.domain.CmdBase;
 import com.flowci.domain.StringVars;
 import com.flowci.domain.Vars;
-import com.google.common.collect.ImmutableSet;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.springframework.data.mongodb.core.index.CompoundIndex;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.util.Date;
-import java.util.Set;
 
-import static com.flowci.core.job.domain.ExecutedCmd.Status.*;
 
 /**
  * ExecutedCmd == Step node with executed status and data
@@ -47,46 +43,7 @@
         def = "{'jobId': 1, 'nodePath': 1}",
         unique = true
 )
-public class ExecutedCmd extends CmdBase {
-
-    public final static Integer CODE_TIMEOUT = -100;
-
-    public final static Integer CODE_SUCCESS = 0;
-
-    private final static Set<Status> FailureStatus = ImmutableSet.of(
-            EXCEPTION,
-            KILLED,
-            TIMEOUT
-    );
-
-    private final static Set<Status> SuccessStatus = ImmutableSet.of(
-            SUCCESS,
-            SKIPPED
-    );
-
-    public enum Status {
-
-        PENDING(-1),
-
-        RUNNING(1),
-
-        SUCCESS(2),
-
-        SKIPPED(2),
-
-        EXCEPTION(3),
-
-        KILLED(3),
-
-        TIMEOUT(4);
-
-        @Getter
-        private Integer level;
-
-        Status(Integer level) {
-            this.level = level;
-        }
-    }
+public class ExecutedCmd extends CmdBase implements Executed {
 
     /**
      * Process id
@@ -142,11 +99,11 @@ public boolean isSuccess() {
 
     @JsonIgnore
     public boolean isRunning() {
-        return status == RUNNING;
+        return status == Status.RUNNING;
     }
 
     @JsonIgnore
     public boolean isPending() {
-        return status == PENDING;
+        return status == Status.PENDING;
     }
 }

core/src/main/java/com/flowci/core/job/domain/ExecutedLocalTask.java

@@ -1,32 +1,48 @@
 package com.flowci.core.job.domain;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.util.StringHelper;
 import lombok.Getter;
 import lombok.NonNull;
 import lombok.Setter;
+import org.springframework.data.mongodb.core.index.CompoundIndex;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.Date;
+
 @Setter
 @Getter
-@Document("local_task_result")
-public final class ExecutedLocalTask {
+@Document("executed_local_task")
+@CompoundIndex(
+        name = "index_job_id_and_name",
+        def = "{'jobId': 1, 'name': 1}",
+        unique = true
+)
+public final class ExecutedLocalTask implements Executed {
 
     private String id;
 
-    @NonNull
-    private String name;
-
     @NonNull
     @Indexed(name = "index_task_job_id")
     private String jobId;
 
-    private int code = -1;
+    @NonNull
+    private String name;
+
+    private Status status = Status.PENDING;
+
+    private Integer code;
 
     private String containerId;
 
-    private String err;
+    private String error;
+
+    private Date startAt;
+
+    private Date finishAt;
 
+    @JsonIgnore
     public boolean hasContainerId() {
         return StringHelper.hasValue(containerId);
     }

core/src/main/java/com/flowci/core/job/domain/Job.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.flowci.core.common.domain.Mongoable;
 import com.flowci.core.common.domain.Variables;
-import com.flowci.domain.Notification;
 import com.flowci.domain.Agent;
 import com.flowci.domain.StringVars;
 import com.flowci.domain.Vars;
@@ -34,7 +33,9 @@
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
-import java.util.*;
+import java.util.Date;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * @author yang
@@ -243,11 +244,6 @@ public static Pathable path(Long buildNumber) {
      */
     private Date finishAt;
 
-    /**
-     * Executed as local task
-     */
-    private List<Notification> notifications = new LinkedList<>();
-
     @JsonIgnore
     public boolean isCancelled() {
         return status == Status.CANCELLED;