diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java index 9d5dc1b15dbc0d06ec2be6f87e74353e5f39b782..3d4a645b6db2d314d84d914bcf0bf64e7ac255ad 100644 --- a/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/dto/QuestionnaireUpdateDTO.java @@ -1,11 +1,9 @@ package cz.muni.ics.kypo.training.adaptive.dto; -import cz.muni.ics.kypo.training.adaptive.enums.QuestionnaireType; import io.swagger.annotations.ApiModelProperty; import javax.validation.Valid; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; import java.util.List; public class QuestionnaireUpdateDTO { @@ -14,10 +12,6 @@ public class QuestionnaireUpdateDTO { @NotEmpty(message = "Questionnaire title must not be blank") private String title; - @ApiModelProperty(value = "Type of questionnaire", required = true, allowableValues = "ADAPTIVE, GENERAL", example = "ADAPTIVE") - @NotNull(message = "Questionnaire type must be specified") - private QuestionnaireType questionnaireType; - @Valid @ApiModelProperty(value = "Questions in the questionnaire", required = true) private List<QuestionDTO> questions; @@ -34,14 +28,6 @@ public class QuestionnaireUpdateDTO { this.title = title; } - public QuestionnaireType getQuestionnaireType() { - return questionnaireType; - } - - public void setQuestionnaireType(QuestionnaireType questionnaireType) { - this.questionnaireType = questionnaireType; - } - public List<QuestionDTO> getQuestions() { return questions; } @@ -62,7 +48,6 @@ public class QuestionnaireUpdateDTO { public String toString() { return "QuestionnaireUpdateDto{" + "title='" + title + '\'' + - ", questionnaireType=" + questionnaireType + ", questions=" + questions + ", phaseRelations=" + phaseRelations + '}'; diff --git a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java index 92809b11e4b420da6507f9e6d9272fa3005bb3e6..b90968bf4553d6f36497a39704f7b3cb87e97589 100644 --- a/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java +++ b/src/main/java/cz/muni/ics/kypo/training/adaptive/service/QuestionnairePhaseService.java @@ -77,6 +77,7 @@ public class QuestionnairePhaseService { questionnairePhase.setTrainingDefinitionId(persistedQuestionnairePhase.getTrainingDefinitionId()); questionnairePhase.setOrder(persistedQuestionnairePhase.getOrder()); + questionnairePhase.setQuestionnaireType(persistedQuestionnairePhase.getQuestionnaireType()); questionnairePhase.getQuestionPhaseRelations().clear(); questionnairePhase.getQuestionPhaseRelations().addAll(resolveQuestionnairePhaseRelationsUpdate(questionnairePhase, questionnaireUpdateDto));