Commit bc2ff294 by Juho Juopperi

cascades

1 parent 6d882242
......@@ -6,6 +6,7 @@ import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
......@@ -42,7 +43,7 @@ public class Poll extends GenericEventChild implements Serializable {
@Column(name = "description", nullable = true)
private String description;
@OneToMany(mappedBy = "poll", fetch = FetchType.EAGER)
@OneToMany(mappedBy = "poll", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
private List<PollQuestion> questions;
public Poll() {
......
......@@ -2,6 +2,7 @@ package fi.insomnia.bortal.model;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
......@@ -26,7 +27,7 @@ public class PollQuestion extends GenericEventChild {
@ManyToOne
private Poll poll;
@OneToMany(mappedBy = "question")
@OneToMany(mappedBy = "question", cascade = CascadeType.ALL)
private List<PossibleAnswer> answers;
@Lob
......@@ -41,10 +42,11 @@ public class PollQuestion extends GenericEventChild {
public String getQuestion() {
return question;
}
public boolean isFreeText()
{
public boolean isFreeText() {
return (answers.size() == 1 && answers.get(0).isText());
}
public void setQuestion(String question) {
this.question = question;
}
......
......@@ -2,6 +2,7 @@ package fi.insomnia.bortal.model;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
......@@ -34,7 +35,7 @@ public class PossibleAnswer extends GenericEventChild {
@ManyToOne
private PollQuestion question;
@OneToMany(mappedBy="choice")
@OneToMany(mappedBy = "choice", cascade = CascadeType.ALL)
private List<PollAnswer> answers;
public String getAnswer() {
......@@ -85,5 +86,4 @@ public class PossibleAnswer extends GenericEventChild {
this.answers = answers;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!