#2314 fix the count of workbook dashboard in workspace

metatron-app · Jul 5, 2019 · eafc04b · eafc04b
1 parent 14dd245
commit eafc04b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/discovery-server/src/main/java/app/metatron/discovery/domain/workbook/WorkBook.java b/discovery-server/src/main/java/app/metatron/discovery/domain/workbook/WorkBook.java
@@ -90,15 +90,16 @@ public Map<String, Object> listViewProjection() {
     projection.put("type", "workbook");
 
     Map<String, Object> contents = Maps.newLinkedHashMap();
-    contents.put("dashboard", dashBoards.size());
 
     // TODO: 기획쪽과 논의해볼 필요가 있음.
+    int dashboardSize = 0;
     final Map<String, DataSource> dataSourceMap = Maps.newHashMap();
     final Map<String, DataSource> inactiveDataSourceMap = Maps.newHashMap();
     for (DashBoard dashBoard : dashBoards) {
-      if(dashBoard.getDataSources() == null) {
+      if(dashBoard.getDataSources() == null || dashBoard.getDataSources().isEmpty()) {
         continue;
       }
+      dashboardSize++;
       dashBoard.getDataSources().forEach(dataSource -> {
         if(!dataSourceMap.containsKey(dataSource.getId())) {
           dataSourceMap.put(dataSource.getId(), dataSource);
@@ -109,6 +110,7 @@ public Map<String, Object> listViewProjection() {
         }
       });
     }
+    contents.put("dashboard", dashboardSize);
     contents.put("dataSource", dataSourceMap.values().size());
     contents.put("inactiveDataSource", inactiveDataSourceMap.values().size());
     contents.put("connValid", dataSourceMap.values().size() == 0 || dataSourceMap.values().size() != inactiveDataSourceMap.values().size());