From f3939d9f13db36670abf51570ce31c62af4c77d4 Mon Sep 17 00:00:00 2001
From: Max <walzen665@web.de>
Date: Sun, 4 Feb 2024 22:55:11 +0100
Subject: [PATCH] Update FileService.java

- Refactored code
- Added simple getFileById()
---
 .../w665/sharepulse/service/FileService.java  | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/main/java/de/w665/sharepulse/service/FileService.java b/src/main/java/de/w665/sharepulse/service/FileService.java
index c8b487d..1a008a8 100644
--- a/src/main/java/de/w665/sharepulse/service/FileService.java
+++ b/src/main/java/de/w665/sharepulse/service/FileService.java
@@ -35,7 +35,25 @@ public class FileService {
         this.fileUploadRepository = fileUploadRepository;
     }
 
-    public void processUploadedFile(MultipartFile file, String uploaderIp) {
+    @PostConstruct
+    public void createFolder() {
+        Path path = Paths.get(getTempDirPath());
+        log.debug("Checking temp file directory " + path.getFileName());
+        try {
+            if (!Files.exists(path)) {
+                Files.createDirectory(path);
+                log.debug("Directory created");
+            } else {
+                log.debug("Directory already exists. Clearing content.");
+                FileUtils.cleanDirectory(new File(getTempDirPath()));
+                log.debug("Directory content cleared.");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String processUploadedFile(MultipartFile file, String uploaderIp) {
 
         String fileId = fileIdService.generateNewUniqueId();
 
@@ -58,30 +76,18 @@ public class FileService {
         try {
             Files.write(path, file.getBytes());
             log.debug("File " + file.getOriginalFilename() + " written to " + path.getFileName());
+            return fileId;
         } catch (IOException e) {
             e.printStackTrace();
+            return null;
         }
     }
 
-    // create a folder
-    @PostConstruct
-    public void createFolder() {
-        Path path = Paths.get(getTempDirPath());
-        log.debug("Checking temp file directory " + path.getFileName());
-        try {
-            if (!Files.exists(path)) {
-                Files.createDirectory(path);
-                log.debug("Directory created");
-            } else {
-                log.debug("Directory already exists. Clearing content.");
-                FileUtils.cleanDirectory(new File(getTempDirPath()));
-                log.debug("Directory content cleared.");
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    public File getFileById(String fileId) {
+        return new File(getTempDirPath() + File.separator + fileId);
     }
 
+
     private String getTempDirPath() {
         return System.getProperty("user.dir") + tempDirPath;
     }