3 files changed, 88 insertions, 82 deletions
diff --git a/src/job/dag.rs b/src/job/dag.rs
new file mode 100644
index 0000000..ebc49e2
--- /dev/null
+++ b/src/job/dag.rs
@@ -0,0 +1,86 @@
+//
+// Copyright (c) 2020-2021 science+computing ag and other contributors
+//
+// This program and the accompanying materials are made
+// available under the terms of the Eclipse Public License 2.0
+// which is available at https://www.eclipse.org/legal/epl-2.0/
+//
+// SPDX-License-Identifier: EPL-2.0
+//
+
+use daggy::Dag as DaggyDag;
+use daggy::NodeIndex;
+use daggy::Walker;
+use getset::Getters;
+use uuid::Uuid;
+
+use crate::job::Job;
+use crate::job::JobResource;
+use crate::package::Package;
+use crate::package::PhaseName;
+use crate::package::Shebang;
+use crate::util::docker::ImageName;
+
+#[derive(Debug, Getters)]
+pub struct Dag {
+    #[getset(get = "pub")]
+    dag: DaggyDag<Job, i8>,
+
+    #[getset(get = "pub")]
+    root_idx: NodeIndex,
+}
+
+impl Dag {
+    pub fn from_package_dag(
+        dag: crate::package::Dag,
+        script_shebang: Shebang,
+        image: ImageName,
+        phases: Vec<PhaseName>,
+        resources: Vec<JobResource>,
+    ) -> Self {
+        let build_job = |_, p: &Package| {
+            Job::new(
+                p.clone(),
+                script_shebang.clone(),
+                image.clone(),
+                phases.clone(),
+                resources.clone(),
+            )
+        };
+
+        Dag {
+            dag: dag.dag().map(build_job, |_, e| *e),
+            root_idx: *dag.root_idx(),
+        }
+    }
+
+    pub fn iter<'a>(&'a self) -> impl Iterator<Item = JobDefinition> + 'a {
+        self.dag
+            .graph()
+            .node_indices()
+            .map(move |idx| {
+                let job = self.dag.graph().node_weight(idx).unwrap(); // TODO
+                let children = self.dag.children(idx);
+                let children_uuids = children.iter(&self.dag)
+                    .filter_map(|(_, node_idx)| {
+                        self.dag.graph().node_weight(node_idx)
+                    })
+                    .map(Job::uuid)
+                    .cloned()
+                    .collect();
+
+                JobDefinition {
+                    job,
+                    dependencies: children_uuids
+                }
+            })
+    }
+
+}
+
+#[derive(Debug)]
+pub struct JobDefinition<'a> {
+    pub job: &'a Job,
+    pub dependencies: Vec<Uuid>,
+}
+
diff --git a/src/job/mod.rs b/src/job/mod.rs
index e684935..666f42e 100644
--- a/src/job/mod.rs
+++ b/src/job/mod.rs
@@ -12,8 +12,8 @@
 mod job;
 pub use job::*;
 
-mod tree;
-pub use tree::*;
+mod dag;
+pub use dag::*;
 
 mod resource;
 pub use resource::*;
diff --git a/src/job/tree.rs b/src/job/tree.rs
deleted file mode 100644
index d7c0751..0000000
--- a/src/job/tree.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Copyright (c) 2020-2021 science+computing ag and other contributors
-//
-// This program and the accompanying materials are made
-// available under the terms of the Eclipse Public License 2.0
-// which is available at https://www.eclipse.org/legal/epl-2.0/
-//
-// SPDX-License-Identifier: EPL-2.0
-//
-
-use std::collections::BTreeMap;
-
-use uuid::Uuid;
-use getset::Getters;
-
-use crate::job::Job;
-use crate::job::JobResource;
-use crate::package::PhaseName;
-use crate::package::Shebang;
-use crate::util::docker::ImageName;
-
-#[derive(Debug, Getters)]
-pub struct Tree {
-    #[getset(get = "pub")]
-    inner: BTreeMap<Uuid, JobDefinition>,
-}
-
-impl Tree {
-    pub fn from_package_tree(pt: crate::package::Tree,
-        script_shebang: Shebang,
-        image: ImageName,
-        phases: Vec<PhaseName>,
-        resources: Vec<JobResource>,
-    ) -> Self {
-        Tree { inner: Self::build_tree(pt, script_shebang, image, phases, resources) }
-    }
-
-    fn build_tree(pt: crate::package::Tree,
-        script_shebang: Shebang,
-        image: ImageName,
-        phases: Vec<PhaseName>,
-        resources: Vec<JobResource>,
-    ) -> BTreeMap<Uuid, JobDefinition> {
-        let mut tree = BTreeMap::new();
-
-        for (package, dependencies) in pt.into_iter() {
-            let mut deps = Self::build_tree(dependencies,
-                script_shebang.clone(),
-                image.clone(),
-                phases.clone(),
-                resources.clone());
-
-            let deps_uuids = deps.keys().cloned().collect();
-            tree.append(&mut deps);
-
-            let job = Job::new(package,
-                script_shebang.clone(),
-                image.clone(),
-                phases.clone(),
-                resources.clone());
-
-            let job_uuid = *job.uuid();
-            let jdef = JobDefinition { job, dependencies: deps_uuids };
-
-            tree.insert(job_uuid, jdef);
-        }
-
-        tree
-    }
-
-}
-
-/// A job definition is the job itself and all UUIDs from jobs this job depends on.
-#[derive(Debug)]
-pub struct JobDefinition {
-    pub job: Job,
-
-    /// Uuids of the jobs where this job depends on the outputs
-    pub dependencies: Vec<Uuid>,
-}