From 67995a813fd859d943c005f42fe2687e11f276f9 Mon Sep 17 00:00:00 2001
From: Enola Knezevic <enola.knezevic@dkfz-heidelberg.com>
Date: Wed, 22 May 2024 14:53:48 +0200
Subject: [PATCH 1/2] style changest @Threated requested

---
 src/exporter.rs | 16 +++-------------
 src/main.rs     |  8 ++++----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/exporter.rs b/src/exporter.rs
index b6ebfb7..558c16d 100644
--- a/src/exporter.rs
+++ b/src/exporter.rs
@@ -54,27 +54,17 @@ pub async fn post_exporter_query(body: &String, task_type: TaskType) -> Result<S
     }
 
     if task_type == TaskType::Status {
-        let value: Value = serde_json::from_str(
-            String::from_utf8(util::base64_decode(&body)?)
-                .map_err(|e| {
-                    FocusError::DeserializationError(format!(
-                        r#"Task body is not a valid string {}"#,
-                        e
-                    ))
-                })?
-                .as_str(),
-        )
+        let value: Value = serde_json::from_slice(&(util::base64_decode(&body))?)
         .map_err(|e| {
             FocusError::DeserializationError(format!(r#"Task body is not a valid JSON: {}"#, e))
         })?;
         let id = value["query-execution-id"].as_str();
-        if id.is_none() {
+        let Some(id) = id else {
             return Err(FocusError::ParsingError(format!(
                 r#"Body does not contain the id of the query to check the status of: {}"#,
                 value
             )));
-        }
-        let id: &str = id.unwrap(); //we already made sure that it is not None
+        };
 
         let resp = CONFIG
             .client
diff --git a/src/main.rs b/src/main.rs
index 9092b1f..da8eb2a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -160,11 +160,11 @@ async fn process_task(
         ));
     }
     if metadata.project == "exporter" {
-        if metadata.task_type.is_none() {
-            return Err(FocusError::MissingExporterTaskType)
-        }
+        let Some(task_type) = metadata.task_type else {
+            return Err(FocusError::MissingExporterTaskType);
+        };
         let body = &task.body;
-        return Ok(run_exporter_query(task, body, metadata.task_type.unwrap()).await)?; //we already made sure that it is not None
+        return Ok(run_exporter_query(task, body, task_type).await)?; //we already made sure that it is not None
     }
 
     if CONFIG.endpoint_type == EndpointType::Blaze {

From d2f7e51f00a0ee6ecfe439476e30ebad27fba445 Mon Sep 17 00:00:00 2001
From: Enola Knezevic <enola.knezevic@dkfz-heidelberg.com>
Date: Wed, 22 May 2024 14:58:15 +0200
Subject: [PATCH 2/2] style change Clippy requested

---
 src/exporter.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/exporter.rs b/src/exporter.rs
index 558c16d..fb18e68 100644
--- a/src/exporter.rs
+++ b/src/exporter.rs
@@ -54,7 +54,7 @@ pub async fn post_exporter_query(body: &String, task_type: TaskType) -> Result<S
     }
 
     if task_type == TaskType::Status {
-        let value: Value = serde_json::from_slice(&(util::base64_decode(&body))?)
+        let value: Value = serde_json::from_slice(&(util::base64_decode(body))?)
         .map_err(|e| {
             FocusError::DeserializationError(format!(r#"Task body is not a valid JSON: {}"#, e))
         })?;