Update build.gradle

Reviewed-on: https://git.walzen665.de/Walzen665/sharepulse/pulls/21

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = 'de.w665'
-version = '1.2.0'
+version = '1.2.1'
 
 java {
 	sourceCompatibility = '21'

src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 import java.lang.reflect.Type;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 
 @Repository
@@ -52,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) {
@@ -79,32 +86,24 @@ public class FileUploadRepository {
                 .run(connection);
     }
 
-    // This query filters all file uploads that are older than 24 hours from the file_uplaods table (not the expired_file_uploads table)
+    public List<FileUpload> getAllExpiredFileUploads() {
-    public List<FileUpload> findAllExpiredActiveFileUploads() {
+        long timestamp = getTimestamp24HoursAgo();
-
-        long timestamp = getOneMinuteAgoTimestamp();
-
         return r.db("sharepulse").table("file_uploads")
                 .filter(row -> row.g("uploadDate").lt(timestamp))
                 .run(connection, FileUpload.class)
                 .toList();
     }
 
-    public List<FileUpload> findAll() {
+    private long getTimestamp24HoursAgo() {
-        return r.db("sharepulse").table("file_uploads")
+        Instant now = Instant.now();
-                .run(connection, FileUpload.class)
+        Instant oneMinuteAgo = now.minus(24, ChronoUnit.HOURS);
-                .toList();
+        return oneMinuteAgo.toEpochMilli();
     }
 
-    private long get24HoursAgoTimestamp() {
+    // For testing only
-        Calendar calendar = Calendar.getInstance();
+    private long getTimestampOneMinuteAgo() {
-        calendar.add(Calendar.HOUR, -24);
+        Instant now = Instant.now();
-        return calendar.getTimeInMillis() / 1000;
+        Instant oneMinuteAgo = now.minus(1, ChronoUnit.MINUTES);
+        return oneMinuteAgo.toEpochMilli();
     }
-
+}
-    private long getOneMinuteAgoTimestamp() {
-        Calendar calendar = Calendar.getInstance();
-        calendar.add(Calendar.MINUTE, -1); // Subtract 1 minute
-        return calendar.getTimeInMillis() / 1000; // Convert milliseconds to seconds (Unix timestamp)
-    }
-}

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);