From 3ab78b0601b6c7f773beebedc28cdc5a674f8974 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Mon, 1 Feb 2021 13:48:46 +0100
Subject: [PATCH] Rename GAME phase type to TRAINING, add two distinct
questionnaire types
---
src/main/java/com/example/demo/enums/PhaseType.java | 5 +++--
.../com/example/demo/facade/TrainingPhaseFacade.java | 10 +++++-----
src/main/java/com/example/demo/mapper/BeanMapper.java | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/example/demo/enums/PhaseType.java b/src/main/java/com/example/demo/enums/PhaseType.java
index af52293c..03298dbd 100644
--- a/src/main/java/com/example/demo/enums/PhaseType.java
+++ b/src/main/java/com/example/demo/enums/PhaseType.java
@@ -1,7 +1,8 @@
package com.example.demo.enums;
public enum PhaseType {
- QUESTIONNAIRE,
+ QUESTIONNAIRE_ADAPTIVE,
+ QUESTIONNAIRE_GENERAL,
INFO,
- GAME,
+ TRAINING,
}
diff --git a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
index 76e20447..a96e7602 100644
--- a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
+++ b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
@@ -5,14 +5,14 @@ import com.example.demo.dto.InfoPhaseDto;
import com.example.demo.dto.InfoPhaseUpdateDto;
import com.example.demo.dto.PhaseCreateDTO;
import com.example.demo.dto.QuestionnairePhaseDto;
+import com.example.demo.dto.QuestionnaireUpdateDto;
import com.example.demo.dto.TrainingPhaseDto;
import com.example.demo.dto.TrainingPhaseUpdateDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
import com.example.demo.enums.PhaseType;
import com.example.demo.service.InfoPhaseService;
-import com.example.demo.service.TrainingPhaseService;
import com.example.demo.service.PhaseService;
import com.example.demo.service.QuestionnairePhaseService;
+import com.example.demo.service.TrainingPhaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -38,10 +38,10 @@ public class TrainingPhaseFacade {
AbstractPhaseDto abstractPhaseDto;
if (PhaseType.INFO.equals(phaseCreateDTO.getPhaseType())) {
abstractPhaseDto = infoPhaseService.createDefaultInfoPhase(trainingDefinitionId);
- } else if (PhaseType.QUESTIONNAIRE.equals(phaseCreateDTO.getPhaseType())) {
- abstractPhaseDto = questionnairePhaseService.createDefaultQuestionnairePhase(trainingDefinitionId);
- } else {
+ } else if (PhaseType.TRAINING.equals(phaseCreateDTO.getPhaseType())) {
abstractPhaseDto = trainingPhaseService.createDefaultTrainingPhase(trainingDefinitionId);
+ } else {
+ abstractPhaseDto = questionnairePhaseService.createDefaultQuestionnairePhase(trainingDefinitionId);
}
abstractPhaseDto.setPhaseType(phaseCreateDTO.getPhaseType());
diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 6d480775..37bfe3c5 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/com/example/demo/mapper/BeanMapper.java
@@ -67,7 +67,7 @@ public interface BeanMapper {
InfoPhase toEntity(InfoPhaseUpdateDto infoPhaseUpdateDto);
- @Mapping(target = "phaseType", constant = "GAME")
+ @Mapping(target = "phaseType", constant = "TRAINING")
TrainingPhaseDto toDto(TrainingPhase trainingPhase);
TrainingPhase toEntity(TrainingPhaseDto trainingPhaseDto);
--
GitLab