From 68cddcad2e7edc1adf44ceeb95cf9c9f3ca8514b Mon Sep 17 00:00:00 2001
From: Maverick Studer <maverick.studer@knecon.com>
Date: Fri, 27 Sep 2024 13:50:50 +0200
Subject: [PATCH] RED-10117: 500 Error in Dossier Template Admin Page

---
 .../management/v1/processor/entity/dossier/FileEntity.java    | 4 ++--
 .../management/v1/processor/service/FileStatusService.java    | 2 --
 2 files changed, 2 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/dossier/FileEntity.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
index efd910639..76a1a2945 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/entity/dossier/FileEntity.java
@@ -181,7 +181,7 @@ public class FileEntity {
 
     @JoinColumn(name = "file_id")
     @Fetch(FetchMode.SUBSELECT)
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
     private List<FileAttributeEntity> fileAttributes = new ArrayList<>();
 
     @Column(name = "dossier_id")
@@ -198,7 +198,7 @@ public class FileEntity {
     @Column
     private OffsetDateTime errorTimestamp;
 
-    @ElementCollection
+    @ElementCollection(fetch = FetchType.EAGER)
     private List<FileEntityComponentMappingVersionEntity> componentMappingVersions;
 
     @Column
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
index 24103d872..a09065336 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/FileStatusService.java
@@ -107,7 +107,6 @@ public class FileStatusService {
     WebsocketService websocketService;
 
 
-    @Transactional
     public List<FileModel> getAllRelevantStatusesForReanalysisScheduler() {
 
         var fileEntities = fileStatusPersistenceService.getAllRelevantStatusesForReanalysisScheduler(fileManagementServiceSettings.getMaxErrorRetries());
@@ -211,7 +210,6 @@ public class FileStatusService {
     }
 
 
-    @Transactional
     protected void addToAnalysisQueue(String dossierId, String fileId, boolean priority, Set<Integer> sectionsToReanalyse, boolean manualRedactionReanalyse) {
 
         var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);