diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java index 1e3354dc9..cb125312b 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationPreferencesPersistenceService.java @@ -79,6 +79,7 @@ public class NotificationPreferencesPersistenceService { } + @Transactional public void initializePreferencesIfNotExists(String userId) { if (!notificationPreferencesRepository.existsByUserId(userId)) { diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java index 9d4b02cb6..4581594e7 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/ViewedPagesPersistenceService.java @@ -1,14 +1,17 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persistence; +import java.time.OffsetDateTime; +import java.util.List; + +import javax.transaction.Transactional; + +import org.springframework.stereotype.Service; + import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ViewedPageEntity; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ViewedPagesRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import javax.transaction.Transactional; -import java.time.OffsetDateTime; -import java.util.List; +import lombok.RequiredArgsConstructor; @Service @RequiredArgsConstructor @@ -43,7 +46,7 @@ public class ViewedPagesPersistenceService { } - @Transactional + @Transactional(Transactional.TxType.REQUIRES_NEW) public void deleteForFile(String fileId) { viewedPagesRepository.deleteByFileId(fileId); } diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index 8dec27124..a79ecdbe9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -420,6 +420,7 @@ public class FileStatusService { } + @Transactional public void overwriteFile(String dossierId, String fileId, String uploader, String filename, boolean keepManualRedactions) { fileManagementStorageService.deleteObject(dossierId, fileId, FileType.ORIGIN); diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java index 34dfbd6eb..aadcdf8ba 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java @@ -178,7 +178,7 @@ public class FileTest extends AbstractPersistenceServerServiceTest { viewedPagesClient.addPage(file.getId(), "1", 1); var viewedPages = viewedPagesClient.getViewedPages(file.getId(), "1"); - assertThat(viewedPages.size()).isEqualTo(1); + assertThat(viewedPages).hasSize(1); AddFileRequest upload = new AddFileRequest(filename, file.getId(), dossier.getId(), "1"); JSONPrimitive uploadResult = uploadClient.upload(upload, true); @@ -187,9 +187,9 @@ public class FileTest extends AbstractPersistenceServerServiceTest { assertThat(loadedFile.isExcludedFromAutomaticAnalysis()).isTrue(); viewedPages = viewedPagesClient.getViewedPages(file.getId(), "1"); - assertThat(viewedPages.size()).isEqualTo(0); - - assertThat(loadedFile.getAssignee().equals("1")); + assertThat(viewedPages).isEmpty(); + assertThat(loadedFile.getAssignee()).isEqualTo("1"); + // FIXME assertThat(loadedFile.getWorkflowStatus().equals(file.getWorkflowStatus())); assertThat(loadedFile.getExcludedPages().equals(file.getExcludedPages()));