From 063196933d260c66022b460e7969d171ec1a2654 Mon Sep 17 00:00:00 2001
From: Theophilus <60826700+Extheoisah@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:19:20 +0100
Subject: [PATCH] feat: fix progress update bug (#50)

---
 src/app/progress/update_progress.rs |  9 +++------
 src/service/queue.rs                | 12 ++++++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/app/progress/update_progress.rs b/src/app/progress/update_progress.rs
index 38bc9f0..b35b8d5 100644
--- a/src/app/progress/update_progress.rs
+++ b/src/app/progress/update_progress.rs
@@ -32,21 +32,18 @@ pub async fn update_progress(soft_serve_url: &str, user_id: &Uuid) -> Result<Pro
     }
 
     // check progress.progress_details object for "current_step"
-    // if current_step is equal to module_count, then set status to completed
-    // else, set current_step to current_step + 1
+    // if new_current_step is equal to module_count, then set status to completed
     let current_step = progress
         .progress_details
         .as_ref()
         .and_then(|details| details["current_step"].as_i64())
         .unwrap_or(0);
     let mut new_status = Status::InProgress.to_str().to_string();
-    let mut new_current_step = current_step;
+    let new_current_step = current_step + 1;
     let module_count = challenge.module_count as i64;
 
-    if current_step == module_count {
+    if new_current_step == module_count {
         new_status = Status::Completed.to_str().to_string();
-    } else {
-        new_current_step = current_step + 1;
     }
 
     let updated_progress = Progress::update_progress(
diff --git a/src/service/queue.rs b/src/service/queue.rs
index 36c341d..ba7c386 100644
--- a/src/service/queue.rs
+++ b/src/service/queue.rs
@@ -4,6 +4,7 @@ use futures_util::StreamExt;
 use lapin::{options::*, types::FieldTable, Connection, ConnectionProperties};
 use log::error;
 use serde::{Deserialize, Serialize};
+use serde_json::json;
 
 use crate::app::{
     progress::update_progress::update_progress, repo::match_repo::match_repo_for_webhook,
@@ -173,8 +174,15 @@ async fn consume_test_queue(
                             return Err(anyhow::anyhow!("Failed to update progress"));
                         }
                     };
-                let combined_message =
-                    serde_json::to_string(&(test_runner_payload, updated_progress))?;
+                let combined_payload = json!({
+                    "event_type": test_runner_payload.event_type,
+                    "repoUrl": test_runner_payload.repo_url,
+                    "commitSha": test_runner_payload.commit_sha,
+                    "success": test_runner_payload.success,
+                    "output": test_runner_payload.output,
+                    "progress": updated_progress
+                });
+                let combined_message = serde_json::to_string(&combined_payload)?;
                 if let Err(e) = manager_handle
                     .broadcast_to_session(&session.token, Message::Text(combined_message.into()))
                     .await