rename stats to matrix and fix ut

Author: gy2006

core/src/main/java/com/flowci/core/api/OpenRestController.java

@@ -22,7 +22,7 @@
 import com.flowci.core.api.domain.CreateJobReport;
 import com.flowci.core.api.service.OpenRestService;
 import com.flowci.core.config.domain.Config;
-import com.flowci.core.flow.domain.StatsCounter;
+import com.flowci.core.flow.domain.MatrixCounter;
 import com.flowci.core.job.domain.JobCache;
 import com.flowci.core.job.service.CacheService;
 import com.flowci.core.job.service.LoggingService;
@@ -92,7 +92,7 @@ public List<User> listFlowUserEmail(@PathVariable String name) {
     @PostMapping("/flow/{name}/stats")
     public void addStatsItem(@PathVariable String name,
                              @Validated @RequestBody AddStatsItem body) {
-        openRestService.saveStatsForFlow(name, body.getType(), StatsCounter.from(body.getData()));
+        openRestService.saveStatsForFlow(name, body.getType(), MatrixCounter.from(body.getData()));
     }
 
     @PostMapping("/flow/{name}/job/{number}/context")

core/src/main/java/com/flowci/core/api/service/OpenRestService.java

@@ -20,7 +20,7 @@
 import com.flowci.core.api.domain.CreateJobArtifact;
 import com.flowci.core.api.domain.CreateJobReport;
 import com.flowci.core.config.domain.Config;
-import com.flowci.core.flow.domain.StatsCounter;
+import com.flowci.core.flow.domain.MatrixCounter;
 import com.flowci.core.secret.domain.Secret;
 import com.flowci.core.user.domain.User;
 import org.springframework.core.io.Resource;
@@ -51,7 +51,7 @@ public interface OpenRestService {
     /**
      * Save statistic data for flow
      */
-    void saveStatsForFlow(String flowName, String statsType, StatsCounter counter);
+    void saveStatsForFlow(String flowName, String statsType, MatrixCounter counter);
 
     /**
      * Save uploaded job report with file

core/src/main/java/com/flowci/core/api/service/OpenRestServiceImpl.java

@@ -24,9 +24,9 @@
 import com.flowci.core.config.service.ConfigService;
 import com.flowci.core.flow.dao.FlowUserDao;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.StatsCounter;
+import com.flowci.core.flow.domain.MatrixCounter;
 import com.flowci.core.flow.service.FlowService;
-import com.flowci.core.flow.service.StatsService;
+import com.flowci.core.flow.service.MatrixService;
 import com.flowci.core.job.dao.JobDao;
 import com.flowci.core.job.domain.Job;
 import com.flowci.core.job.domain.JobKey;
@@ -69,7 +69,7 @@ public class OpenRestServiceImpl implements OpenRestService {
     private SecretService credentialService;
 
     @Autowired
-    private StatsService statsService;
+    private MatrixService matrixService;
 
     @Autowired
     private ReportService reportService;
@@ -115,10 +115,10 @@ public Resource getResource(Secret secret, String file) {
     }
 
     @Override
-    public void saveStatsForFlow(String flowName, String statsType, StatsCounter counter) {
+    public void saveStatsForFlow(String flowName, String statsType, MatrixCounter counter) {
         Flow flow = flowService.get(flowName);
         int today = DateHelper.toIntDay(new Date());
-        statsService.add(flow.getId(), today, statsType, counter);
+        matrixService.add(flow.getId(), today, statsType, counter);
     }
 
     @Override

core/src/main/java/com/flowci/core/common/domain/Mongoable.java

@@ -16,6 +16,7 @@
 
 package com.flowci.core.common.domain;
 
+import com.flowci.core.flow.domain.Flow;
 import com.flowci.util.StringHelper;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -26,6 +27,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * @author yang

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

@@ -101,21 +101,6 @@ public Flow delete(@PathVariable String name) {
         return flow;
     }
 
-    /**
-     * Create credential for flow only
-     */
-    @PostMapping("/{name}/secret/rsa")
-    @Action(FlowAction.SETUP_CREDENTIAL)
-    public String setupRSACredential(@PathVariable String name, @RequestBody SimpleKeyPair pair) {
-        return flowService.setSshRsaCredential(name, pair);
-    }
-
-    @PostMapping("/{name}/secret/auth")
-    @Action(FlowAction.SETUP_CREDENTIAL)
-    public String setupAuthCredential(@PathVariable String name, @RequestBody SimpleAuthPair pair) {
-        return flowService.setAuthCredential(name, pair);
-    }
-
     @PostMapping("/{name}/users")
     @Action(FlowAction.ADD_USER)
     public List<User> addUsers(@PathVariable String name, @RequestBody String[] emails) {

core/src/main/java/com/flowci/core/flow/controller/StatsController.java renamed to core/src/main/java/com/flowci/core/flow/controller/MatrixController.java

@@ -18,10 +18,10 @@
 
 import com.flowci.core.common.helper.DateHelper;
 import com.flowci.core.flow.domain.Flow;
-import com.flowci.core.flow.domain.StatsItem;
-import com.flowci.core.flow.domain.StatsType;
+import com.flowci.core.flow.domain.MatrixItem;
+import com.flowci.core.flow.domain.MatrixType;
 import com.flowci.core.flow.service.FlowService;
-import com.flowci.core.flow.service.StatsService;
+import com.flowci.core.flow.service.MatrixService;
 import com.flowci.exception.ArgumentException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -35,40 +35,40 @@
  */
 @RestController
 @RequestMapping("/flows")
-public class StatsController {
+public class MatrixController {
 
     private static final int MaxDays = 31;
 
     @Autowired
     private FlowService flowService;
 
     @Autowired
-    private StatsService statsService;
+    private MatrixService matrixService;
 
-    @GetMapping("/{name}/stats/types")
-    public List<StatsType> types(@PathVariable String name) {
+    @GetMapping("/{name}/matrix/types")
+    public List<MatrixType> types(@PathVariable String name) {
         Flow flow = flowService.get(name);
-        return statsService.getStatsType(flow);
+        return matrixService.getStatsType(flow);
     }
 
-    @GetMapping("/{name}/stats/total")
-    public StatsItem total(@PathVariable String name, @RequestParam String t) {
+    @GetMapping("/{name}/matrix/total")
+    public MatrixItem total(@PathVariable String name, @RequestParam String t) {
         Flow flow = flowService.get(name);
-        return statsService.get(flow.getId(), t, StatsItem.ZERO_DAY);
+        return matrixService.get(flow.getId(), t, MatrixItem.ZERO_DAY);
     }
 
-    @GetMapping("/{name}/stats")
-    public List<StatsItem> list(@PathVariable String name,
-                                @RequestParam(required = false) String t,
-                                @RequestParam int from,
-                                @RequestParam int to) {
+    @GetMapping("/{name}/matrix")
+    public List<MatrixItem> list(@PathVariable String name,
+                                 @RequestParam(required = false) String t,
+                                 @RequestParam int from,
+                                 @RequestParam int to) {
 
         if (isValidDuration(from, to)) {
             throw new ArgumentException("Illegal query argument");
         }
 
         Flow flow = flowService.get(name);
-        return statsService.list(flow.getId(), t, from, to);
+        return matrixService.list(flow.getId(), t, from, to);
     }
 
     private boolean isValidDuration(int from, int to) {
@@ -79,11 +79,6 @@ private boolean isValidDuration(int from, int to) {
             return false;
         }
 
-        if (f.plus(MaxDays, ChronoUnit.DAYS).isAfter(t)) {
-            return false;
-        }
-
-        return true;
+        return !f.plus(MaxDays, ChronoUnit.DAYS).isAfter(t);
     }
-
 }

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

@@ -16,7 +16,7 @@
 
 package com.flowci.core.flow.dao;
 
-import com.flowci.core.flow.domain.StatsItem;
+import com.flowci.core.flow.domain.MatrixItem;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.Query;
@@ -29,15 +29,15 @@
  * @author yang
  */
 @Repository
-public interface StatsItemDao extends MongoRepository<StatsItem, String> {
+public interface StatsItemDao extends MongoRepository<MatrixItem, String> {
 
     @Query("{'flowId':?0, 'type': ?1, 'day' : {$gte : ?2, $lte : ?3}}")
-    List<StatsItem> findByFlowIdAndTypeDayBetween(String flowId, String type, int dayGT, int dayLT, Sort sort);
+    List<MatrixItem> findByFlowIdAndTypeDayBetween(String flowId, String type, int dayGT, int dayLT, Sort sort);
 
     @Query("{'flowId':?0, 'day' : {$gte : ?1, $lte : ?2}}")
-    List<StatsItem> findByFlowIdDayBetween(String flowId, int dayGT, int dayLT, Sort sort);
+    List<MatrixItem> findByFlowIdDayBetween(String flowId, int dayGT, int dayLT, Sort sort);
 
-    Optional<StatsItem> findByFlowIdAndDayAndType(String flowId, int day, String type);
+    Optional<MatrixItem> findByFlowIdAndDayAndType(String flowId, int day, String type);
 
     void deleteByFlowId(String flowId);
 }

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

@@ -17,6 +17,7 @@
 package com.flowci.core.flow.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.flowci.util.StringHelper;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -33,11 +34,21 @@ public class CreateOption {
     @JsonProperty("title")
     private String templateTitle;
 
+    /**
+     * Yaml in base64 format
+     */
+    @JsonProperty("yml")
+    private String rawYaml;
+
     public boolean hasGroupName() {
         return StringHelper.hasValue(groupName);
     }
 
     public boolean hasTemplateTitle() {
         return StringHelper.hasValue(templateTitle);
     }
+
+    public boolean hasRawYaml() {
+        return StringHelper.hasValue(rawYaml);
+    }
 }

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

@@ -5,15 +5,16 @@
 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;
 import org.springframework.data.mongodb.core.mapping.Document;
 
+import java.util.Objects;
+
+
 @Getter
 @Setter
-@EqualsAndHashCode(callSuper = true)
 @Document("flow")
 public class FlowItem extends Mongoable {
 
@@ -46,4 +47,17 @@ public boolean hasParentId() {
     public boolean hasRootParent() {
         return hasParentId() && parentId.equals(ROOT_ID);
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(getId());
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof Flow) {
+            return getId().equals(((Flow) o).getId());
+        }
+        return false;
+    }
 }

core/src/main/java/com/flowci/core/flow/domain/StatsCounter.java renamed to core/src/main/java/com/flowci/core/flow/domain/MatrixCounter.java

@@ -22,15 +22,15 @@
 /**
  * @author yang
  */
-public class StatsCounter extends HashMap<String, Float> {
+public class MatrixCounter extends HashMap<String, Float> {
 
-    public static StatsCounter from(Map<String, Float> data) {
-        StatsCounter counter = new StatsCounter();
+    public static MatrixCounter from(Map<String, Float> data) {
+        MatrixCounter counter = new MatrixCounter();
         counter.putAll(data);
         return counter;
     }
 
-    public void add(StatsCounter another) {
+    public void add(MatrixCounter another) {
         for (Map.Entry<String, Float> entry : another.entrySet()) {
             String key = entry.getKey();
             Float localValue = this.getOrDefault(key, 0.0F);