From ffc4e9bd0e14d25f4d35f3aa5d71123d3dbd54de Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Mon, 3 Apr 2023 16:56:34 +0200 Subject: [PATCH] RED-6501: Corrected manual-redaction deletion. Removed manual delete-query implementation because it was redundant and also contained an incorrect destination entity. --- .../annotations/AddRedactionPersistenceService.java | 2 +- .../repository/ManualRedactionRepository.java | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/AddRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/AddRedactionPersistenceService.java index 36d54e4de..ba5b91164 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/AddRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/AddRedactionPersistenceService.java @@ -91,7 +91,7 @@ public class AddRedactionPersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - manualRedactionRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + manualRedactionRepository.deleteById(new AnnotationEntityId(annotationId, fileId)); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java index be0cc7bf0..86168b2a9 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ManualRedactionRepository.java @@ -8,20 +8,13 @@ import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -import org.springframework.transaction.annotation.Transactional; import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.AnnotationEntityId; import com.iqser.red.service.persistence.management.v1.processor.entity.annotations.ManualRedactionEntryEntity; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.AnnotationStatus; public interface ManualRedactionRepository extends JpaRepository { - - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from ManualForceRedactionEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - + @Modifying @Query("update ManualRedactionEntryEntity m set m.softDeletedTime = :softDeleteTime where m.id = :id") void updateSoftDelete(AnnotationEntityId id, OffsetDateTime softDeleteTime);