suport load matrix by flow id list

Author: gy2006

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

@@ -28,6 +28,7 @@
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -57,6 +58,11 @@ public MatrixItem total(@PathVariable String name, @RequestParam String t) {
         return matrixService.get(flow.getId(), t, MatrixItem.ZERO_DAY);
     }
 
+    @PostMapping("/matrix/batch/total")
+    public List<MatrixItem> batchTotal(@RequestParam String t, @RequestBody Collection<String> flowIdList) {
+        return matrixService.list(flowIdList, t, MatrixItem.ZERO_DAY);
+    }
+
     @GetMapping("/{name}/matrix")
     public List<MatrixItem> list(@PathVariable String name,
                                  @RequestParam(required = false) String t,

core/src/main/java/com/flowci/core/flow/dao/StatsItemDao.java renamed to core/src/main/java/com/flowci/core/flow/dao/MatrixItemDao.java

@@ -22,14 +22,15 @@
 import org.springframework.data.mongodb.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
 
 /**
  * @author yang
  */
 @Repository
-public interface StatsItemDao extends MongoRepository<MatrixItem, String> {
+public interface MatrixItemDao extends MongoRepository<MatrixItem, String> {
 
     @Query("{'flowId':?0, 'type': ?1, 'day' : {$gte : ?2, $lte : ?3}}")
     List<MatrixItem> findByFlowIdAndTypeDayBetween(String flowId, String type, int dayGT, int dayLT, Sort sort);
@@ -39,5 +40,7 @@ public interface StatsItemDao extends MongoRepository<MatrixItem, String> {
 
     Optional<MatrixItem> findByFlowIdAndDayAndType(String flowId, int day, String type);
 
+    List<MatrixItem> findAllByFlowIdInAndDayAndType(Collection<String> flowIds, int day, String type);
+
     void deleteByFlowId(String flowId);
 }

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

@@ -20,6 +20,8 @@
 import com.flowci.core.flow.domain.MatrixCounter;
 import com.flowci.core.flow.domain.MatrixItem;
 import com.flowci.core.flow.domain.MatrixType;
+
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +47,11 @@ public interface MatrixService {
          */
     List<MatrixItem> list(String flowId, String type, int fromDay, int toDay);
 
+    /**
+     * List matrix items on specific day by flow id list
+     */
+    List<MatrixItem> list(Collection<String> flowIdList, String type, int day);
+
     /**
      * Get statistic item
      */

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

@@ -19,7 +19,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flowci.core.common.helper.DateHelper;
-import com.flowci.core.flow.dao.StatsItemDao;
+import com.flowci.core.flow.dao.MatrixItemDao;
 import com.flowci.core.flow.domain.*;
 import com.flowci.core.flow.event.FlowDeletedEvent;
 import com.flowci.core.job.domain.Job;
@@ -58,7 +58,7 @@ public class MatrixServiceImpl implements MatrixService {
     private ObjectMapper objectMapper;
 
     @Autowired
-    private StatsItemDao statsItemDao;
+    private MatrixItemDao matrixItemDao;
 
     @Autowired
     private YmlService ymlService;
@@ -102,7 +102,7 @@ public void onJobStatusChange(JobStatusChangeEvent event) {
 
     @EventListener
     public void onFlowDelete(FlowDeletedEvent event) {
-        statsItemDao.deleteByFlowId(event.getFlow().getId());
+        matrixItemDao.deleteByFlowId(event.getFlow().getId());
     }
 
     @Override
@@ -139,15 +139,20 @@ public List<MatrixItem> list(String flowId, String type, int fromDay, int toDay)
         Sort sort = Sort.by(Sort.Direction.ASC, "day");
 
         if (StringHelper.hasValue(type)) {
-            return statsItemDao.findByFlowIdAndTypeDayBetween(flowId, type, fromDay, toDay, sort);
+            return matrixItemDao.findByFlowIdAndTypeDayBetween(flowId, type, fromDay, toDay, sort);
         }
 
-        return statsItemDao.findByFlowIdDayBetween(flowId, fromDay, toDay, sort);
+        return matrixItemDao.findByFlowIdDayBetween(flowId, fromDay, toDay, sort);
+    }
+
+    @Override
+    public List<MatrixItem> list(Collection<String> flowIdList, String type, int day) {
+        return matrixItemDao.findAllByFlowIdInAndDayAndType(flowIdList, day, type);
     }
 
     @Override
     public MatrixItem get(String flowId, String type, int day) {
-        Optional<MatrixItem> item = statsItemDao.findByFlowIdAndDayAndType(flowId, day, type);
+        Optional<MatrixItem> item = matrixItemDao.findByFlowIdAndDayAndType(flowId, day, type);
         if (item.isPresent()) {
             return item.get();
         }
@@ -168,13 +173,13 @@ public MatrixItem add(String flowId, int day, String type, MatrixCounter counter
             dayItem.setTotal(totalItem.getCounter());
             dayItem.setNumOfTotal(totalItem.getNumOfToday());
 
-            statsItemDao.saveAll(Arrays.asList(dayItem, totalItem));
+            matrixItemDao.saveAll(Arrays.asList(dayItem, totalItem));
             return dayItem;
         }
     }
 
     private MatrixItem getItem(String flowId, int day, String type) {
-        Optional<MatrixItem> optional = statsItemDao.findByFlowIdAndDayAndType(flowId, day, type);
+        Optional<MatrixItem> optional = matrixItemDao.findByFlowIdAndDayAndType(flowId, day, type);
 
         return optional.orElseGet(() -> new MatrixItem()
                 .setDay(day)