From 0744ca63319fdad59389ad0c037af80f072e2b6f Mon Sep 17 00:00:00 2001
From: "adel.kalimullin" <a.kalimullin@micord.ru>
Date: Wed, 11 Dec 2024 13:45:59 +0300
Subject: [PATCH 1/3] SUPPORT-8725: refactor trowing raw exception

---
 .../java/ru/micord/ervu/av/service/FileUploadService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
index 0764c90..d8df0d3 100644
--- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
+++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
@@ -83,7 +83,7 @@ public class FileUploadService {
         Files.createDirectories(Paths.get(fileSavingPath));
       }
       catch (IOException e) {
-        throw new RuntimeException("Failed to create directory " + fileSavingPath, e);
+        throw new FileUploadException("Failed to create directory " + fileSavingPath, e);
       }
       LOGGER.info("working in {}", System.getProperty("user.home"));
       Path filePath = Paths.get(fileSavingPath, fileUrl.fileName());
@@ -131,7 +131,7 @@ public class FileUploadService {
         Files.delete(filePath);
       }
       catch (IOException e) {
-        throw new RuntimeException("Failed to delete file " + filePath.getFileName());
+        throw new FileUploadException("Failed to delete file " + filePath.getFileName());
       }
       finally {
         acknowledgment.acknowledge();

From c3ccfc958768d8c87701f869b774d74fadd6ec7b Mon Sep 17 00:00:00 2001
From: "adel.kalimullin" <a.kalimullin@micord.ru>
Date: Fri, 13 Dec 2024 14:31:51 +0300
Subject: [PATCH 2/3] SUPPORT-8725:fix

---
 .../ru/micord/ervu/av/service/FileUploadService.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
index d8df0d3..e7afe33 100644
--- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
+++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
@@ -78,13 +78,7 @@ public class FileUploadService {
 
     try {
       FileUrl fileUrl = parseFileUrl(downloadRequest.fileInfo().getFileUrl());
-
-      try {
-        Files.createDirectories(Paths.get(fileSavingPath));
-      }
-      catch (IOException e) {
-        throw new FileUploadException("Failed to create directory " + fileSavingPath, e);
-      }
+      Files.createDirectories(Paths.get(fileSavingPath));
       LOGGER.info("working in {}", System.getProperty("user.home"));
       Path filePath = Paths.get(fileSavingPath, fileUrl.fileName());
       String downloadUrl = fileUrl.fileUrl();
@@ -131,7 +125,7 @@ public class FileUploadService {
         Files.delete(filePath);
       }
       catch (IOException e) {
-        throw new FileUploadException("Failed to delete file " + filePath.getFileName());
+        LOGGER.error("Failed to delete file " + filePath.getFileName(),e);
       }
       finally {
         acknowledgment.acknowledge();
@@ -146,7 +140,7 @@ public class FileUploadService {
       sendMessage(inStatusTopic.name(), downloadRequest, messageId, inKafkaTemplate);
       acknowledgment.acknowledge();
     }
-    catch (FileUploadException e) {
+    catch (FileUploadException | IOException e) {
       // считаем, что нужно повторное считывание сообщения
       // ошибку логируем, сообщение оставляем непрочитанным
       LOGGER.error(e.getMessage(), e);

From 6bc2720244244da4c4f7e2cb9a9ac2818965a16e Mon Sep 17 00:00:00 2001
From: "adel.kalimullin" <a.kalimullin@micord.ru>
Date: Fri, 13 Dec 2024 14:42:10 +0300
Subject: [PATCH 3/3] SUPPORT-8725:fix

---
 src/main/java/ru/micord/ervu/av/service/FileUploadService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
index e7afe33..52afb22 100644
--- a/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
+++ b/src/main/java/ru/micord/ervu/av/service/FileUploadService.java
@@ -125,7 +125,7 @@ public class FileUploadService {
         Files.delete(filePath);
       }
       catch (IOException e) {
-        LOGGER.error("Failed to delete file " + filePath.getFileName(),e);
+        LOGGER.error("Failed to delete file " + filePath, e);
       }
       finally {
         acknowledgment.acknowledge();