From b81aaedeab115555e13f6eaa6481059ee2c72566 Mon Sep 17 00:00:00 2001 From: Viktor Seifert Date: Tue, 4 Apr 2023 16:13:07 +0200 Subject: [PATCH] RED-6501: Removed unneeded manually implemented delete queries --- .../annotations/ForceRedactionPersistenceService.java | 2 +- .../ImageRecategorizationPersistenceService.java | 2 +- .../annotations/LegalBasisChangePersistenceService.java | 2 +- .../annotations/RemoveRedactionPersistenceService.java | 2 +- .../annotations/ResizeRedactionPersistenceService.java | 2 +- .../persistence/repository/ForceRedactionRepository.java | 7 ------- .../repository/ImageRecategorizationRepository.java | 7 ------- .../persistence/repository/LegalBasisChangeRepository.java | 7 ------- .../persistence/repository/RemoveRedactionRepository.java | 7 ------- .../persistence/repository/ResizeRedactionRepository.java | 7 ------- 10 files changed, 5 insertions(+), 40 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/ForceRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java index e0304ea4e..2c2809f7a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ForceRedactionPersistenceService.java @@ -47,7 +47,7 @@ public class ForceRedactionPersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - forceRedactionRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + forceRedactionRepository.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/annotations/ImageRecategorizationPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java index 763449661..7e61e2afb 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ImageRecategorizationPersistenceService.java @@ -47,7 +47,7 @@ public class ImageRecategorizationPersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - imageRecategorizationRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + imageRecategorizationRepository.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/annotations/LegalBasisChangePersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/LegalBasisChangePersistenceService.java index 676642fee..4b93600dc 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/LegalBasisChangePersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/LegalBasisChangePersistenceService.java @@ -46,7 +46,7 @@ public class LegalBasisChangePersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - legalBasisChangeRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + legalBasisChangeRepository.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/annotations/RemoveRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/RemoveRedactionPersistenceService.java index 7db40573e..f49cd354e 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/RemoveRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/RemoveRedactionPersistenceService.java @@ -62,7 +62,7 @@ public class RemoveRedactionPersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - removeRedactionRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + removeRedactionRepository.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/annotations/ResizeRedactionPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java index cf3ca5bf7..a6cd4a673 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/annotations/ResizeRedactionPersistenceService.java @@ -63,7 +63,7 @@ public class ResizeRedactionPersistenceService { @Transactional public void hardDelete(String fileId, String annotationId) { - resizeRedactionRepository.hardDelete(new AnnotationEntityId(annotationId, fileId)); + resizeRedactionRepository.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/ForceRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java index 3eeb9613a..338fc0e22 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ForceRedactionRepository.java @@ -7,7 +7,6 @@ import java.util.Optional; 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.ManualForceRedactionEntity; @@ -15,12 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations public interface ForceRedactionRepository extends JpaRepository { - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from ManualForceRedactionEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - @Modifying(clearAutomatically = true) @Query("update ManualForceRedactionEntity mfr set mfr.status = :annotationStatus " + "where mfr.id = :annotationEntityId") void updateStatus(AnnotationEntityId annotationEntityId, AnnotationStatus annotationStatus); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java index f6c111220..8352e9416 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ImageRecategorizationRepository.java @@ -7,7 +7,6 @@ import java.util.Optional; 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.ManualImageRecategorizationEntity; @@ -15,12 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations public interface ImageRecategorizationRepository extends JpaRepository { - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from ManualImageRecategorizationEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - @Modifying(clearAutomatically = true) @Query("update ManualImageRecategorizationEntity mir set mir.status = :annotationStatus " + "where mir.id = :annotationEntityId") void updateStatus(AnnotationEntityId annotationEntityId, AnnotationStatus annotationStatus); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java index 4bf9ebecc..db4a2bca2 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/LegalBasisChangeRepository.java @@ -7,7 +7,6 @@ import java.util.Optional; 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.ManualLegalBasisChangeEntity; @@ -15,12 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations public interface LegalBasisChangeRepository extends JpaRepository { - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from ManualLegalBasisChangeEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - @Modifying(clearAutomatically = true) @Query("update ManualLegalBasisChangeEntity mlbc set mlbc.status = :annotationStatus, mlbc.processedDate = :processedDate " + "where mlbc.id = :annotationEntityId") void updateStatus(AnnotationEntityId annotationEntityId, AnnotationStatus annotationStatus, OffsetDateTime processedDate); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java index 120b32f70..17444e82f 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/RemoveRedactionRepository.java @@ -7,7 +7,6 @@ import java.util.Optional; 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.IdRemovalEntity; @@ -15,12 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations public interface RemoveRedactionRepository extends JpaRepository { - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from IdRemovalEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - @Modifying @Query("update IdRemovalEntity idr set idr.softDeletedTime = :softDeletedTime where idr.id = :annotationEntityId") void updateSoftDelete(AnnotationEntityId annotationEntityId, OffsetDateTime softDeletedTime); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java index 15c3c009b..4676f2f9f 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/ResizeRedactionRepository.java @@ -7,7 +7,6 @@ import java.util.Optional; 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.ManualResizeRedactionEntity; @@ -15,12 +14,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations public interface ResizeRedactionRepository extends JpaRepository { - @Transactional - @Modifying(flushAutomatically = true, clearAutomatically = true) - @Query("delete from ManualResizeRedactionEntity e where e.id = :id") - void hardDelete(AnnotationEntityId id); - - @Modifying(clearAutomatically = true) @Query("update ManualResizeRedactionEntity mrd set mrd.status = :annotationStatus, mrd.processedDate = :processedDate " + "where mrd.id = :annotationEntityId") void updateStatus(AnnotationEntityId annotationEntityId, AnnotationStatus annotationStatus, OffsetDateTime processedDate);