From efe774b3c196365e1978db5addefa2d30ce9426b Mon Sep 17 00:00:00 2001
From: AndSDev <andsdev@gmail.com>
Date: Tue, 10 Jun 2025 07:55:59 +0000
Subject: [PATCH] refactor: improve error processing for S3

---
 src/service/media/mod.rs | 12 ++++++------
 src/utils/error.rs       |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/service/media/mod.rs b/src/service/media/mod.rs
index 71a7dd9f..17b232ec 100644
--- a/src/service/media/mod.rs
+++ b/src/service/media/mod.rs
@@ -643,8 +643,8 @@ impl Service {
                     ));
                 }
                 if !resp.status().is_success() {
-                    warn!("S3 request error ({}):\n{}", sha256_hex, resp.text().await?);
-                    return Err(Error::bad_s3_response("Cannot read media file"));
+                    error!("Failed to get file with sha256 hash of \"{}\" from S3 bucket: {}", sha256_hex, resp.text().await?);
+                    return Err(Error::BadS3Response("Failed to get media file from S3 bucket"));
                 }
 
                 resp.bytes().await?.to_vec()
@@ -702,8 +702,8 @@ pub async fn create_file(sha256_hex: &str, file: &[u8]) -> Result<()> {
             let resp = client.put(url).body(file.to_vec()).send().await?;
 
             if !resp.status().is_success() {
-                warn!("S3 request error ({}):\n{}", sha256_hex, resp.text().await?);
-                return Err(Error::bad_s3_response("Cannot write media file"));
+                error!("Failed to upload file with sha256 hash of \"{}\" to S3 bucket: {}", sha256_hex, resp.text().await?);
+                return Err(Error::BadS3Response("Failed to upload media file to S3 bucket"));
             }
         }
     }
@@ -795,8 +795,8 @@ async fn delete_file(sha256_hex: &str) -> Result<()> {
             let resp = client.delete(url).send().await?;
 
             if !resp.status().is_success() {
-                warn!("S3 request error ({}):\n{}", sha256_hex, resp.text().await?);
-                return Err(Error::bad_s3_response("Cannot delete media file"));
+                error!("Failed to delete file with sha256 hash of \"{}\" from S3 bucket: {}", sha256_hex, resp.text().await?);
+                return Err(Error::BadS3Response("Failed to delete media file from S3 bucket"));
             }
         }
     }
diff --git a/src/utils/error.rs b/src/utils/error.rs
index 1c1302e7..c9e83843 100644
--- a/src/utils/error.rs
+++ b/src/utils/error.rs
@@ -93,11 +93,6 @@ impl Error {
         error!("BadConfig: {}", message);
         Self::BadConfig(message)
     }
-
-    pub fn bad_s3_response(message: &'static str) -> Self {
-        info!("BadS3Response: {}", message);
-        Self::BadS3Response(message)
-    }
 }
 
 impl Error {