From f90ab11730a484e881c6048fbf2c1addeff75185 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Thu, 21 Jan 2021 05:50:19 +0100
Subject: [PATCH] Set questionType to MCQ when a new Question is created
Resolves #9
---
src/main/java/com/example/demo/domain/Question.java | 3 +++
src/main/java/com/example/demo/dto/QuestionDto.java | 1 -
src/main/java/com/example/demo/enums/QuestionType.java | 3 +++
src/main/java/com/example/demo/service/QuestionService.java | 5 ++---
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/example/demo/domain/Question.java b/src/main/java/com/example/demo/domain/Question.java
index 31cc7972..b6e967f8 100644
--- a/src/main/java/com/example/demo/domain/Question.java
+++ b/src/main/java/com/example/demo/domain/Question.java
@@ -5,6 +5,8 @@ import com.example.demo.enums.QuestionType;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
@@ -21,6 +23,7 @@ public class Question {
@GeneratedValue
private Long id;
+ @Enumerated(EnumType.STRING)
private QuestionType questionType;
private String text;
private Integer points;
diff --git a/src/main/java/com/example/demo/dto/QuestionDto.java b/src/main/java/com/example/demo/dto/QuestionDto.java
index 03044ee1..40f136f8 100644
--- a/src/main/java/com/example/demo/dto/QuestionDto.java
+++ b/src/main/java/com/example/demo/dto/QuestionDto.java
@@ -1,6 +1,5 @@
package com.example.demo.dto;
-import com.example.demo.domain.QuestionnaireLevel;
import com.example.demo.enums.QuestionType;
import java.io.Serializable;
diff --git a/src/main/java/com/example/demo/enums/QuestionType.java b/src/main/java/com/example/demo/enums/QuestionType.java
index a040769c..78adce7d 100644
--- a/src/main/java/com/example/demo/enums/QuestionType.java
+++ b/src/main/java/com/example/demo/enums/QuestionType.java
@@ -1,4 +1,7 @@
package com.example.demo.enums;
public enum QuestionType {
+ FFQ,
+ MCQ,
+ EMI
}
diff --git a/src/main/java/com/example/demo/service/QuestionService.java b/src/main/java/com/example/demo/service/QuestionService.java
index faed7120..443a8cae 100644
--- a/src/main/java/com/example/demo/service/QuestionService.java
+++ b/src/main/java/com/example/demo/service/QuestionService.java
@@ -1,11 +1,9 @@
package com.example.demo.service;
-import com.example.demo.domain.PhaseLevel;
import com.example.demo.domain.Question;
import com.example.demo.domain.QuestionnaireLevel;
-import com.example.demo.domain.Task;
import com.example.demo.dto.QuestionDto;
-import com.example.demo.dto.TaskDto;
+import com.example.demo.enums.QuestionType;
import com.example.demo.mapper.BeanMapper;
import com.example.demo.repository.QuestionRepository;
import com.example.demo.repository.QuestionnaireLevelRepository;
@@ -32,6 +30,7 @@ public class QuestionService {
Question question = new Question();
question.setText("Title of question");
+ question.setQuestionType(QuestionType.MCQ);
question.setQuestionnaireLevel(questionnaireLevel.get());
question.setOrder(questionRepository.getCurrentMaxOrder(questionnaireId) + 1);
--
GitLab