Don't return error if get_progress errors

DolceTriade · Mar 10, 2024 · ff18eb3 · ff18eb3
1 parent cd59b55
commit ff18eb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/blade/db/postgres/mod.rs b/blade/db/postgres/mod.rs
@@ -227,12 +227,17 @@ impl state::DB for Postgres {
     }
 
     fn get_progress(&mut self, invocation_id: &str) -> anyhow::Result<String> {
-        schema::invocations::table
+        match schema::invocations::table
             .select(models::Invocation::as_select())
             .filter(schema::invocations::id.eq(invocation_id))
             .get_result(&mut self.conn)
-            .map(|res: models::Invocation| res.output)
-            .context("failed to get progress")
+        {
+            Ok(res) => Ok(res.output),
+            Err(e) => match e {
+                diesel::result::Error::NotFound => Ok("".to_string()),
+                _ => Err(e).context("failed to get progress"),
+            },
+        }
     }
 
     fn get_shallow_invocation(

diff --git a/blade/db/sqlite/mod.rs b/blade/db/sqlite/mod.rs
@@ -236,12 +236,17 @@ impl state::DB for Sqlite {
     }
 
     fn get_progress(&mut self, invocation_id: &str) -> anyhow::Result<String> {
-        schema::Invocations::table
+        match schema::Invocations::table
             .select(models::Invocation::as_select())
             .filter(schema::Invocations::id.eq(invocation_id))
             .get_result(&mut self.conn)
-            .map(|res: models::Invocation| res.output)
-            .context("failed to get progress")
+        {
+            Ok(res) => Ok(res.output),
+            Err(e) => match e {
+                diesel::result::Error::NotFound => Ok("".to_string()),
+                _ => Err(e).context("failed to get progress"),
+            },
+        }
     }
 
     fn get_shallow_invocation(