From fc2cec669848782c15c5c80916178b47857f09f4 Mon Sep 17 00:00:00 2001
From: Jan Tymel <410388@mail.muni.cz>
Date: Thu, 21 Jan 2021 21:37:04 +0100
Subject: [PATCH] Add missing relatedPhasesId attribute to questions
---
src/main/java/com/example/demo/domain/Question.java | 13 +++++++++++++
src/main/java/com/example/demo/dto/QuestionDto.java | 9 +++++++++
.../com/example/demo/dto/QuestionUpdateDto.java | 12 ++++++++++++
3 files changed, 34 insertions(+)
diff --git a/src/main/java/com/example/demo/domain/Question.java b/src/main/java/com/example/demo/domain/Question.java
index b6e967f8..d15c6056 100644
--- a/src/main/java/com/example/demo/domain/Question.java
+++ b/src/main/java/com/example/demo/domain/Question.java
@@ -4,6 +4,7 @@ import com.example.demo.enums.QuestionType;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
@@ -30,6 +31,10 @@ public class Question {
private Integer penalty;
private boolean required;
+ // TODO this is a Potemkin village before the consultation. Proper ManyToMany relation should be used here
+ @ElementCollection
+ private List<Long> relatedPhasesId;
+
@Column(name = "order_in_questionnaire", nullable = false)
private Integer order;
@@ -111,4 +116,12 @@ public class Question {
public void setChoices(List<QuestionChoice> choices) {
this.choices = choices;
}
+
+ public List<Long> getRelatedPhasesId() {
+ return relatedPhasesId;
+ }
+
+ public void setRelatedPhasesId(List<Long> relatedPhasesId) {
+ this.relatedPhasesId = relatedPhasesId;
+ }
}
diff --git a/src/main/java/com/example/demo/dto/QuestionDto.java b/src/main/java/com/example/demo/dto/QuestionDto.java
index 40f136f8..eb057861 100644
--- a/src/main/java/com/example/demo/dto/QuestionDto.java
+++ b/src/main/java/com/example/demo/dto/QuestionDto.java
@@ -16,6 +16,7 @@ public class QuestionDto implements Serializable {
private boolean required;
private Integer order;
private List<QuestionChoiceDto> choices;
+ private List<Long> relatedPhasesId;
public Long getId() {
return id;
@@ -80,4 +81,12 @@ public class QuestionDto implements Serializable {
public void setChoices(List<QuestionChoiceDto> choices) {
this.choices = choices;
}
+
+ public List<Long> getRelatedPhasesId() {
+ return relatedPhasesId;
+ }
+
+ public void setRelatedPhasesId(List<Long> relatedPhasesId) {
+ this.relatedPhasesId = relatedPhasesId;
+ }
}
diff --git a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java b/src/main/java/com/example/demo/dto/QuestionUpdateDto.java
index c81e9fd3..bc66c10a 100644
--- a/src/main/java/com/example/demo/dto/QuestionUpdateDto.java
+++ b/src/main/java/com/example/demo/dto/QuestionUpdateDto.java
@@ -2,6 +2,8 @@ package com.example.demo.dto;
import com.example.demo.enums.QuestionType;
+import java.util.List;
+
public class QuestionUpdateDto {
private Long id;
@@ -10,6 +12,7 @@ public class QuestionUpdateDto {
private Integer points;
private Integer penalty;
private boolean required;
+ private List<Long> relatedPhasesId;
public Long getId() {
return id;
@@ -59,6 +62,14 @@ public class QuestionUpdateDto {
this.required = required;
}
+ public List<Long> getRelatedPhasesId() {
+ return relatedPhasesId;
+ }
+
+ public void setRelatedPhasesId(List<Long> relatedPhasesId) {
+ this.relatedPhasesId = relatedPhasesId;
+ }
+
@Override
public String toString() {
return "QuestionUpdateDto{" +
@@ -68,6 +79,7 @@ public class QuestionUpdateDto {
", points=" + points +
", penalty=" + penalty +
", required=" + required +
+ ", relatedPhasesId=" + relatedPhasesId +
'}';
}
}
--
GitLab