From e496d7b19984cdd786d2a63b788cd18c6d3cba49 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Mon, 20 Jan 2025 12:17:35 +0530
Subject: [PATCH] Fixed error while moving file to deleted folder

---
 .../service/impl/AmazonS3ServiceImpl.java                 | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
index 8221117a..9909f732 100644
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/AmazonS3ServiceImpl.java
@@ -153,11 +153,17 @@ public class AmazonS3ServiceImpl implements AmazonS3Service {
 		}
 	}
 
+    private String decodeS3Key(String key) {
+        return URLDecoder.decode(key, StandardCharsets.UTF_8);
+    }
+
     @Override
     public UploadFileOnAmazonS3Response moveFile(String fileName, String oldPath, String newPath) {
         try {
+            log.info("Original Paths - oldPath: {}, newPath: {}", oldPath, newPath);
+
+            oldPath = decodeS3Key(cleanOldPath(oldPath));
             newPath = cleanNewPath(oldPath, newPath);
-            oldPath = cleanOldPath(oldPath);
             log.info("Moving file from {} to {} in bucket {}", oldPath, newPath, bucketName);
 
             CopyObjectRequest copyRequest = new CopyObjectRequest(bucketName, oldPath, bucketName, newPath);