From 39d59b3760a9aca625d6e450cca902c8101e8ff9 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Wed, 10 Feb 2021 05:59:44 +0100
Subject: [PATCH] Move @Transactional from repository to service, annotate all
repositories with @Repository
---
.../repository/AbstractPhaseRepository.java | 2 ++
.../adaptive/repository/InfoPhaseRepository.java | 2 ++
.../repository/QuestionPhaseRelationRepository.java | 2 ++
.../adaptive/repository/QuestionRepository.java | 2 ++
.../repository/QuestionnairePhaseRepository.java | 2 ++
.../adaptive/repository/TaskRepository.java | 13 ++++++-------
.../repository/TrainingPhaseRepository.java | 2 ++
.../kypo/training/adaptive/service/TaskService.java | 1 +
8 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
index ed48d393..b3613abb 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/AbstractPhaseRepository.java
@@ -5,9 +5,11 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
import java.util.List;
+@Repository
public interface AbstractPhaseRepository extends JpaRepository<AbstractPhase, Long> {
List<AbstractPhase> findAllByTrainingDefinitionIdOrderByOrder(long trainingDefinitionId);
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
index 37ab685f..bafec1c8 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/InfoPhaseRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
import cz.muni.ics.kypo.training.adaptive.domain.InfoPhase;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
public interface InfoPhaseRepository extends JpaRepository<InfoPhase, Long> {
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
index c5f3cf6a..a79d1229 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionPhaseRelationRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
import cz.muni.ics.kypo.training.adaptive.domain.QuestionPhaseRelation;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
public interface QuestionPhaseRelationRepository extends JpaRepository<QuestionPhaseRelation, Long> {
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
index 9261b373..f20e7080 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
import cz.muni.ics.kypo.training.adaptive.domain.Question;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
public interface QuestionRepository extends JpaRepository<Question, Long> {
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
index 26cf52a4..9a0362d4 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/QuestionnairePhaseRepository.java
@@ -2,6 +2,8 @@ package cz.muni.ics.kypo.training.adaptive.repository;
import cz.muni.ics.kypo.training.adaptive.domain.QuestionnairePhase;
import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+@Repository
public interface QuestionnairePhaseRepository extends JpaRepository<QuestionnairePhase, Long> {
}
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
index 25d9484e..a5bf4e24 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TaskRepository.java
@@ -5,8 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Repository;
+@Repository
public interface TaskRepository extends JpaRepository<Task, Long> {
@Query("SELECT COALESCE(MAX(g.order), -1) FROM Task g WHERE g.trainingPhase.id = :phaseId")
@@ -18,8 +19,8 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
"AND t.order > :lowerBound " +
"AND t.order <= :upperBound ")
void decreaseOrderOfTasksOnInterval(@Param("trainingPhaseId") Long trainingPhaseId,
- @Param("lowerBound") int lowerBound,
- @Param("upperBound") int upperBound);
+ @Param("lowerBound") int lowerBound,
+ @Param("upperBound") int upperBound);
@Modifying
@@ -28,11 +29,9 @@ public interface TaskRepository extends JpaRepository<Task, Long> {
"AND t.order >= :lowerBound " +
"AND t.order < :upperBound ")
void increaseOrderOfTasksOnInterval(@Param("trainingPhaseId") Long trainingPhaseId,
- @Param("lowerBound") int lowerBound,
- @Param("upperBound") int upperBound);
+ @Param("lowerBound") int lowerBound,
+ @Param("upperBound") int upperBound);
-
- @Transactional
@Modifying
@Query("UPDATE Task t SET t.order = t.order - 1 " +
"WHERE t.trainingPhase.id = :trainingPhaseId " +
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
index 50903da8..d0967754 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/repository/TrainingPhaseRepository.java
@@ -4,9 +4,11 @@ import cz.muni.ics.kypo.training.adaptive.domain.TrainingPhase;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
import java.util.List;
+@Repository
public interface TrainingPhaseRepository extends JpaRepository<TrainingPhase, Long> {
@Query("SELECT COUNT(p.id) FROM TrainingPhase p WHERE p.trainingDefinitionId = :trainingDefinitionId")
diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
index 69cf07d9..42f47ec9 100644
--- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
+++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/TaskService.java
@@ -99,6 +99,7 @@ public class TaskService {
return BeanMapper.INSTANCE.toDto(savedEntity);
}
+ @Transactional
public void removeTask(Long trainingDefinitionId, Long phaseId, Long taskId) {
Task task = taskRepository.findById(taskId)
.orElseThrow(() -> new RuntimeException("Task was not found"));
--
GitLab