From ed89158f698bfd617adcc9bf14f9ef0d0ac6da3e Mon Sep 17 00:00:00 2001
From: Jorge Ortiz <jorge.ortiz@europeana.eu>
Date: Mon, 4 Nov 2024 18:01:35 +0100
Subject: [PATCH] MET-6199 add new transaction every time status is saved and
 clean up queries update

---
 .../repository/debias/DatasetDeBiasRepository.java        | 8 ++++++++
 .../repository/debias/RecordDeBiasDetailRepository.java   | 4 ++++
 .../repository/debias/RecordDeBiasMainRepository.java     | 3 +++
 .../service/workflow/DeBiasProcessServiceImpl.java        | 3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/europeana/metis/sandbox/repository/debias/DatasetDeBiasRepository.java b/src/main/java/eu/europeana/metis/sandbox/repository/debias/DatasetDeBiasRepository.java
index 3d48cc63..d5159e7f 100644
--- a/src/main/java/eu/europeana/metis/sandbox/repository/debias/DatasetDeBiasRepository.java
+++ b/src/main/java/eu/europeana/metis/sandbox/repository/debias/DatasetDeBiasRepository.java
@@ -29,4 +29,12 @@ public interface DatasetDeBiasRepository extends JpaRepository<DatasetDeBiasEnti
   @Query("UPDATE DatasetDeBiasEntity dec SET dec.state = ?2 WHERE dec.datasetId.datasetId = ?1")
   void updateState(Integer datasetId, String state);
 
+  /**
+   * Delete by dataset id.
+   *
+   * @param datasetId the dataset id
+   */
+  @Modifying
+  @Query("DELETE FROM DatasetDeBiasEntity dec WHERE dec.datasetId.datasetId = ?1")
+  void deleteByDatasetId(String datasetId);
 }
diff --git a/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasDetailRepository.java b/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasDetailRepository.java
index f9b9c67d..510dacad 100644
--- a/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasDetailRepository.java
+++ b/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasDetailRepository.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 /**
  * The interface Record DeBias detail repository.
@@ -25,5 +26,8 @@ public interface RecordDeBiasDetailRepository extends JpaRepository<RecordDeBias
    * @param datasetId the dataset id
    */
   @Modifying
+  @Query("DELETE FROM RecordDeBiasDetailEntity rdd WHERE EXISTS "
+      + "(SELECT 1 FROM RecordDeBiasMainEntity rdm INNER JOIN RecordEntity rec ON rec.id=rdm.recordId.id AND rec.datasetId = ?1 "
+      + "WHERE rdd.debiasId.id = rdm.id)")
   void deleteByDebiasIdRecordIdDatasetId(String datasetId);
 }
diff --git a/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasMainRepository.java b/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasMainRepository.java
index 20ace8c8..227e2ee2 100644
--- a/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasMainRepository.java
+++ b/src/main/java/eu/europeana/metis/sandbox/repository/debias/RecordDeBiasMainRepository.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
 
 /**
  * The interface Record DeBias main repository.
@@ -26,5 +27,7 @@ public interface RecordDeBiasMainRepository extends JpaRepository<RecordDeBiasMa
    * @param datasetId the dataset id
    */
   @Modifying
+  @Query("DELETE FROM RecordDeBiasMainEntity rdm WHERE EXISTS "
+      + "(SELECT 1 FROM RecordEntity rec WHERE rec.id=rdm.recordId.id AND rec.datasetId = ?1)")
   void deleteByRecordIdDatasetId(String datasetId);
 }
diff --git a/src/main/java/eu/europeana/metis/sandbox/service/workflow/DeBiasProcessServiceImpl.java b/src/main/java/eu/europeana/metis/sandbox/service/workflow/DeBiasProcessServiceImpl.java
index 6be8af46..b841ce2c 100644
--- a/src/main/java/eu/europeana/metis/sandbox/service/workflow/DeBiasProcessServiceImpl.java
+++ b/src/main/java/eu/europeana/metis/sandbox/service/workflow/DeBiasProcessServiceImpl.java
@@ -36,6 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -89,7 +90,7 @@ public DeBiasProcessServiceImpl(DeBiasClient deBiasClient,
    *
    * @param recordList the records to process
    */
-  @Transactional
+  @Transactional(propagation = Propagation.REQUIRES_NEW)
   @Override
   public void process(List<Record> recordList) {
     Objects.requireNonNull(recordList, "List of records is required");