#18 WIP

code-kontor · Feb 15, 2020 · 247055b · 247055b
1 parent c4e74ef
commit 247055b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/...main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/FilteredDependencies.java b/...main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/FilteredDependencies.java
@@ -28,6 +28,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -112,8 +113,14 @@ public List<String> getNodeIds(NodeType nodeType, boolean includedPredecessors)
         if (filteredDependencies == null || filteredDependencies.getCoreDependencies().isEmpty()) {
             return Collections.emptyList();
         }
-// TODO: includePredecessors
-        List<HGNode> nodeIds = filteredDependencies.getCoreDependencies().stream().map(dep -> NodeType.SOURCE.equals(nodeType) ? dep.getFrom() : dep.getTo()).distinct().collect(Collectors.toList());
-        return NodeUtils.toNodeIds(nodeIds);
+
+        Stream<HGNode> nodeIdStream = filteredDependencies.getCoreDependencies().stream().
+                map(dep -> NodeType.SOURCE.equals(nodeType) ? dep.getFrom() : dep.getTo());
+
+        if (includedPredecessors) {
+            nodeIdStream = nodeIdStream.flatMap(node -> Stream.concat(Stream.of(node), node.getPredecessors().stream()));
+        }
+
+        return NodeUtils.toNodeIds(nodeIdStream.distinct().collect(Collectors.toList()));
     }
 }
diff --git a/...ql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/NodeSelection.java b/...ql/src/main/java/io/codekontor/slizaa/server/graphql/hierarchicalgraph/NodeSelection.java
@@ -21,27 +21,19 @@
 
 public class NodeSelection {
 
-    private List<String> _selectedNodeIds;
+    private List<String> selectedNodeIds;
 
-    private NodeType _selectedNodesType;
+    private NodeType selectedNodesType;
 
     public NodeSelection() {
         // default constructor for graphql
     }
 
     public List<String> getSelectedNodeIds() {
-        return _selectedNodeIds;
+        return selectedNodeIds;
     }
 
     public NodeType getSelectedNodesType() {
-        return _selectedNodesType;
-    }
-
-    public void setSelectedNodeIds(List<String> _selectedNodeIds) {
-        this._selectedNodeIds = _selectedNodeIds;
-    }
-
-    public void setSelectedNodesType(NodeType _selectedNodesType) {
-        this._selectedNodesType = _selectedNodesType;
+        return selectedNodesType;
     }
 }
diff --git a/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls b/slizaa-server/slizaa-server-graphql/src/main/resources/slizaa-hierachicalgraph.graphqls
@@ -149,10 +149,10 @@ type FilteredDependencies {
     dependencyPage(pageNumber: Int!, pageSize: Int!): DependencyPage
 
     #
-    nodes(nodeType: NodeType, includedPredecessors: Boolean): [Node!]!
+    nodes(nodeType: NodeType!, includedPredecessors: Boolean!): [Node!]!
 
     #
-    nodeIds(nodeType: NodeType, includedPredecessors: Boolean): [ID!]!
+    nodeIds(nodeType: NodeType!, includedPredecessors: Boolean!): [ID!]!
 }
 
 input NodeSelection {