Use @Modifying(...) to handle persistence context clearing/flushing

This makes calling `wipeQualityEvaluationAverages` slightly safer i think 😄
NDLANO · Jan 21, 2025 · d89c1ed · d89c1ed
1 parent 540f2e4
commit d89c1ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/main/java/no/ndla/taxonomy/repositories/NodeRepository.java b/src/main/java/no/ndla/taxonomy/repositories/NodeRepository.java
@@ -47,7 +47,7 @@ public interface NodeRepository extends TaxonomyRepository<Node> {
             """)
     Stream<Node> findNodesWithQualityEvaluation();
 
-    @Modifying
+    @Modifying(flushAutomatically = true, clearAutomatically = true)
     @Query(
             """
             UPDATE Node n

diff --git a/src/main/java/no/ndla/taxonomy/service/QualityEvaluationService.java b/src/main/java/no/ndla/taxonomy/service/QualityEvaluationService.java
@@ -7,8 +7,6 @@
 
 package no.ndla.taxonomy.service;
 
-import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import java.net.URI;
 import java.util.Collection;
 import java.util.Optional;
@@ -29,9 +27,6 @@ public class QualityEvaluationService {
 
     private final NodeRepository nodeRepository;
 
-    @PersistenceContext
-    private EntityManager entityManager;
-
     public QualityEvaluationService(NodeRepository nodeRepository) {
         this.nodeRepository = nodeRepository;
     }
@@ -127,15 +122,9 @@ public void updateEntireAverageTreeForNode(URI publicId) {
         nodeRepository.save(node);
     }
 
-    public void wipeQualityEvaluationAverages() {
-        nodeRepository.wipeQualityEvaluationAverages();
-        nodeRepository.flush();
-        entityManager.clear();
-    }
-
     @Transactional
     public void updateQualityEvaluationOfAllNodes() {
-        wipeQualityEvaluationAverages();
+        nodeRepository.wipeQualityEvaluationAverages();
         var nodeStream = nodeRepository.findNodesWithQualityEvaluation();
         nodeStream.forEach(
                 node -> updateQualityEvaluationOfParents(node, Optional.empty(), node.getQualityEvaluationGrade()));