attempted fix on rework page login

osuAkatsuki · Jun 30, 2024 · fae9feb · fae9feb
1 parent c089b05
commit fae9feb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/k8s-deploy.yml b/.github/workflows/k8s-deploy.yml
@@ -1,9 +1,10 @@
-name: k8s-deploy
+name: production-deploy
 
 on:
   push:
     branches:
       - main
+      - fix-rework-login
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/src/api/routes/reworks/user.rs b/src/api/routes/reworks/user.rs
@@ -55,12 +55,15 @@ async fn get_rework_user(
 
     let mut reworks: Vec<Rework> = Vec::new();
     for rework_id in rework_ids {
-        let rework: Rework = sqlx::query_as("SELECT * FROM reworks WHERE rework_id = ?")
+        let rework: Option<Rework> = sqlx::query_as("SELECT * FROM reworks WHERE rework_id = ?")
             .bind(rework_id)
-            .fetch_one(ctx.database.get().await?.deref_mut())
+            .fetch_optional(ctx.database.get().await?.deref_mut())
             .await?;
-
-        reworks.push(rework);
+        if let Some(rework) = rework {
+            reworks.push(rework);
+        } else {
+            continue;
+        }
     }
 
     Ok(Json(Some(ReworkUser {