From 41343673505d3c8c59ec240213eb27f010e90afe Mon Sep 17 00:00:00 2001
From: Max <walzen665@web.de>
Date: Sun, 9 Jun 2024 11:23:51 +0200
Subject: [PATCH] Fixed auto file cleanup not working

---
 .../sharepulse/db/repo/FileUploadRepository.java     | 12 ++++++++----
 .../w665/sharepulse/service/FileCleanupService.java  |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
index 2695cab..0cae4a0 100644
--- a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
+++ b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
@@ -38,7 +38,7 @@ public class FileUploadRepository {
         Type type = new TypeToken<Map<String, Object>>(){}.getType();
         Map<String, Object> map = gson.fromJson(json, type);
 
-        long uploadDateTimestamp = fileUpload.getUploadDate().getTime() / 1000;
+        long uploadDateTimestamp = fileUpload.getUploadDate().getTime();
         map.put("uploadDate", uploadDateTimestamp);
 
         r.db("sharepulse").table("file_uploads").insert(map).run(connection);
@@ -54,7 +54,12 @@ public class FileUploadRepository {
         } catch (NoSuchElementException e) {
             return Optional.empty();
         }
+    }
 
+    public List<FileUpload> findAll() {
+        return r.db("sharepulse").table("file_uploads")
+                .run(connection, FileUpload.class)
+                .toList();
     }
 
     public void updateFileUpload(FileUpload updatedFileUpload) {
@@ -63,7 +68,7 @@ public class FileUploadRepository {
         Type type = new TypeToken<Map<String, Object>>(){}.getType();
         Map<String, Object> map = gson.fromJson(json, type);
 
-        long uploadDateTimestamp = updatedFileUpload.getUploadDate().getTime() / 1000;
+        long uploadDateTimestamp = updatedFileUpload.getUploadDate().getTime();
         map.put("uploadDate", uploadDateTimestamp);
 
         String fileId = updatedFileUpload.getFileId();
@@ -83,11 +88,10 @@ public class FileUploadRepository {
 
     public List<FileUpload> getAllExpiredFileUploads() {
         long timestamp = getTimestamp24HoursAgo();
-        List<FileUpload> olderFiles = r.db("sharepulse").table("file_uploads")
+        return r.db("sharepulse").table("file_uploads")
                 .filter(row -> row.g("uploadDate").lt(timestamp))
                 .run(connection, FileUpload.class)
                 .toList();
-        return olderFiles;
     }
 
     private long getTimestamp24HoursAgo() {
diff --git a/src/main/java/de/w665/sharepulse/service/FileCleanupService.java b/src/main/java/de/w665/sharepulse/service/FileCleanupService.java
index 091da8c..4929b9c 100644
--- a/src/main/java/de/w665/sharepulse/service/FileCleanupService.java
+++ b/src/main/java/de/w665/sharepulse/service/FileCleanupService.java
@@ -23,10 +23,11 @@ public class FileCleanupService {
         this.fileService = fileService;
     }
 
+    //@Scheduled(cron = "*/10 * * * * *") // every 10 seconds
     @Scheduled(cron = "0 0 * * * *")
     public void cleanup() {
         log.debug("Running cleanup...");
-        List<FileUpload> expFileUploads = fileUploadRepository.findAllExpiredActiveFileUploads();
+        List<FileUpload> expFileUploads = fileUploadRepository.getAllExpiredFileUploads();
         for (FileUpload fileUpload : expFileUploads) {
             fileService.deleteFile(fileUpload);
             expiredFileUploadRepository.insertExpiredFileUpload(fileUpload);