Modifying schema

Author: NicholasLYang

crates/turborepo-api-client/src/spaces.rs

@@ -1,3 +1,5 @@
+use std::collections::HashSet;
+
 use async_graphql::{Enum, SimpleObject};
 use chrono::{DateTime, Local};
 use reqwest::Method;
@@ -53,6 +55,30 @@ pub enum CacheSource {
     Remote,
 }
 
+#[derive(Debug, Serialize, SimpleObject, PartialEq, Eq, Hash)]
+pub struct TaskId {
+    pub package: String,
+    pub task: String,
+}
+
+impl PartialOrd for TaskId {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(
+            self.package
+                .cmp(&other.package)
+                .then_with(|| self.task.cmp(&other.task)),
+        )
+    }
+}
+
+impl Ord for TaskId {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.package
+            .cmp(&other.package)
+            .then_with(|| self.task.cmp(&other.task))
+    }
+}
+
 #[derive(Default, Debug, Serialize, SimpleObject)]
 #[serde(rename_all = "camelCase")]
 pub struct SpaceTaskSummary {
@@ -64,8 +90,8 @@ pub struct SpaceTaskSummary {
     pub end_time: i64,
     pub cache: SpacesCacheStatus,
     pub exit_code: Option<i32>,
-    pub dependencies: Vec<String>,
-    pub dependents: Vec<String>,
+    pub dependencies: Option<HashSet<TaskId>>,
+    pub dependents: Option<HashSet<TaskId>>,
     #[serde(rename = "log")]
     pub logs: String,
 }

crates/turborepo-db/migrations/20240828183512_initial_tables.sql

@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS runs (
-    id TEXT PRIMARY KEY, -- primary key should be uuid
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
     start_time BIGINT NOT NULL,
     end_time BIGINT,
     exit_code INTEGER,
@@ -13,23 +13,56 @@ CREATE TABLE IF NOT EXISTS runs (
     client_id TEXT NOT NULL,
     client_name TEXT NOT NULL,
     client_version TEXT NOT NULL
+    full_turbo BOOLEAN NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS config (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    api_url TEXT NOT NULL,
+    login_url TEXT NOT NULL,
+    team_slug TEXT NOT NULL,
+    team_id TEXT NOT NULL,
+    signature BOOLEAN NOT NULL,
+    preflight BOOLEAN NOT NULL,
+    timeout INTEGER NOT NULL,
+    upload_timeout INTEGER NOT NULL,
+    enabled BOOLEAN NOT NULL,
+    spaces_id TEXT NOT NULL,
+    global_dependencies TEXT NOT NULL,
+    global_env TEXT NOT NULL,
+    global_pass_through_env TEXT NOT NULL,
+    tasks TEXT NOT NULL,
+    cache_dir TEXT NOT NULL,
+    root_turbo_json TEXT NOT NULL
+)
+
+CREATE TABLE IF NOT EXISTS packages (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    name TEXT NOT NULL,
+    path TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS package_dependencies (
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    dependent_id INTEGER NOT NULL,
+    dependency_id INTEGER NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS tasks (
-    id TEXT PRIMARY KEY,
+    id INTEGER PRIMARY KEY AUTOINCREMENT,
     run_id TEXT NOT NULL,
     name TEXT NOT NULL,
-    package TEXT NOT NULL,
     hash TEXT NOT NULL,
+    package_id INTEGER NOT NULL,
     start_time INTEGER NOT NULL,
     end_time INTEGER NOT NULL,
-    cache_status TEXT NOT NULL,
+    cache_status TEXT NOT NULL
     exit_code INTEGER,
     logs TEXT NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS task_dependencies (
     id INTEGER PRIMARY KEY AUTOINCREMENT,
-    task_id TEXT NOT NULL,
-    dependency_id TEXT NOT NULL
+    dependent_id INTEGER NOT NULL,
+    dependency_id INTEGER NOT NULL
 );

crates/turborepo-db/migrations/20240906152408_create_graph_tables.sql

@@ -0,0 +1 @@
+-- Add migration script here

crates/turborepo-db/src/lib.rs

@@ -258,8 +258,8 @@ mod test {
                     time_saved: 0,
                 },
                 exit_code: Some(0),
-                dependencies: vec![],
-                dependents: vec![],
+                dependencies: None,
+                dependents: None,
                 logs: "".to_string(),
             },
         )

crates/turborepo-lib/src/run/summary/spaces.rs

@@ -316,18 +316,23 @@ impl<'a> From<SpacesTaskInformation<'a>> for SpaceTaskSummary {
             exit_code,
             ..
         } = execution_summary;
-        fn stringify_nodes(deps: Option<HashSet<&crate::engine::TaskNode>>) -> Vec<String> {
-            deps.into_iter()
-                .flatten()
-                .filter_map(|node| match node {
-                    crate::engine::TaskNode::Root => None,
-                    crate::engine::TaskNode::Task(dependency) => Some(dependency.to_string()),
-                })
-                .sorted()
-                .collect()
+        fn convert_nodes(
+            deps: Option<HashSet<&crate::engine::TaskNode>>,
+        ) -> Option<HashSet<turborepo_api_client::spaces::TaskId>> {
+            let deps = deps?;
+            Some(
+                deps.into_iter()
+                    .filter_map(|node| match node {
+                        TaskNode::Root => None,
+                        TaskNode::Task(dependency) => Some(turborepo_api_client::spaces::TaskId {
+                            package: dependency.package().to_string(),
+                            task: dependency.task().to_string(),
+                        }),
+                    })
+                    .sorted()
+                    .collect(),
+            )
         }
-        let dependencies = stringify_nodes(dependencies);
-        let dependents = stringify_nodes(dependents);
 
         let cache = cache_status.map_or_else(
             SpacesCacheStatus::default,
@@ -356,8 +361,8 @@ impl<'a> From<SpacesTaskInformation<'a>> for SpaceTaskSummary {
             start_time,
             end_time,
             exit_code,
-            dependencies,
-            dependents,
+            dependencies: convert_nodes(dependencies),
+            dependents: convert_nodes(dependents),
             logs,
         }
     }