Skip to content
Snippets Groups Projects
Commit 39d59b37 authored by Jan Tymel's avatar Jan Tymel
Browse files

Move @Transactional from repository to service, annotate all repositories with @Repository

parent f630bdee
No related branches found
No related tags found
No related merge requests found
Showing with 19 additions and 7 deletions
......@@ -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);
......
......@@ -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> {
}
......@@ -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> {
}
......@@ -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> {
}
......@@ -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> {
}
......@@ -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 " +
......
......@@ -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")
......
......@@ -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"));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment