From 50831dabfabe89d268bf432f8cea3329d7d8b6a3 Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Fri, 27 Sep 2024 13:26:51 +0200 Subject: [PATCH] RED-10117: 500 Error in Dossier Template Admin Page * remove transactional from getAllRelevantStatusesForReanalysisScheduler and addToAnalysisQueue --- .../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 3230217ee..49883c011 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 @@ -184,7 +184,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 fileAttributes = new ArrayList<>(); @Column(name = "dossier_id") @@ -201,7 +201,7 @@ public class FileEntity { @Column private OffsetDateTime errorTimestamp; - @ElementCollection + @ElementCollection(fetch = FetchType.EAGER) private List 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 233f49e56..6c2fd8649 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 @@ -116,7 +116,6 @@ public class FileStatusService { WebsocketService websocketService; - @Transactional public List getAllRelevantStatusesForReanalysisScheduler() { var fileEntities = fileStatusPersistenceService.getAllRelevantStatusesForReanalysisScheduler(fileManagementServiceSettings.getMaxErrorRetries()); @@ -245,7 +244,6 @@ public class FileStatusService { } - @Transactional protected void addToAnalysisQueue(String dossierId, String fileId, boolean priority, Set sectionsToReanalyse, AnalysisType analysisType) { var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);