From 14f04fdc34f876f71d2d68fe96b5e327878efcb6 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@knecon.com>
Date: Thu, 1 Jun 2023 09:22:00 +0200
Subject: [PATCH] RED-6860: Fixed transaction timeout and changed s3 upload to
 multipart to be able to handle downloads > 5 gb

---
 .../v1/processor/entity/download/DownloadStatusEntity.java  | 6 +++---
 .../service/persistence/NotificationPersistenceService.java | 1 +
 .../persistence-service-server-v1/pom.xml                   | 1 +
 .../server/service/download/DownloadPreparationService.java | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
index 1966cf8b7..c13e2b71c 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/download/DownloadStatusEntity.java
@@ -61,10 +61,10 @@ public class DownloadStatusEntity {
     @Column
     long fileSize;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.EAGER)
     DossierEntity dossier;
 
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER)
     @Fetch(FetchMode.SUBSELECT)
     List<FileEntity> files = new ArrayList<>();
 
@@ -73,7 +73,7 @@ public class DownloadStatusEntity {
     @Convert(converter = JSONDownloadFileTypeConverter.class)
     Set<DownloadFileType> downloadFileTypes = new HashSet<>();
 
-    @ManyToMany(fetch = FetchType.LAZY)
+    @ManyToMany(fetch = FetchType.EAGER)
     @Fetch(FetchMode.SUBSELECT)
     List<ReportTemplateEntity> reports = new ArrayList<>();
 
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
index a6473be89..644d71745 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPersistenceService.java
@@ -37,6 +37,7 @@ public class NotificationPersistenceService {
 
 
     @SneakyThrows
+    @Transactional
     public void insertNotification(AddNotificationRequest addNotificationRequest) {
 
         var notification = new NotificationEntity();
diff --git a/persistence-service-v1/persistence-service-server-v1/pom.xml b/persistence-service-v1/persistence-service-server-v1/pom.xml
index 6da55d426..7c0eba40a 100644
--- a/persistence-service-v1/persistence-service-server-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-server-v1/pom.xml
@@ -72,6 +72,7 @@
         <dependency>
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>storage-commons</artifactId>
+            <version>1.8.1</version>
         </dependency>
         <dependency>
             <groupId>com.iqser.red.service</groupId>
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
index 24bdad268..2b8e25a74 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/download/DownloadPreparationService.java
@@ -128,7 +128,6 @@ public class DownloadPreparationService {
     }
 
 
-    @Transactional
     public void createDownload(RedactionResultMessage reportResultMessage) {
 
         DownloadStatusEntity downloadStatus = downloadStatusPersistenceService.getStatus(reportResultMessage.getDownloadId());