diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 5efcbde1502a955106433060e3381c7eacae8f34..e97af7f22a582074f75b712c827ac832acd6d19e 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -1068,6 +1068,23 @@ public class CouchDBDao implements IDatabaseDao { } return null; } + + public Question getInterposedQuestion(String sessionKey, String documentId) { + try { + + Document document = this.getDatabase().getDocument(documentId); + LOGGER.error("bla test" + document.toString()); + if(document != null) { + Question question = (Question) JSONObject.toBean(document.getJSONObject(), Question.class); + question.setQuestionType("interposed_question"); + + return question; + } + } catch (IOException e) { + LOGGER.error("Error while retrieving interposed question", e); + } + return null; + } @Override public void vote(String menu) { diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java index a3592cfc0864210cc72fcb5e1ec06ce874318e7d..140b408369b5e54d452acb9f3ec0f27757767def 100644 --- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java +++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java @@ -49,7 +49,7 @@ public interface IDatabaseDao { boolean sessionKeyAvailable(String keyword); boolean saveQuestion(Session session, Question question); - + boolean saveQuestion(Session session, InterposedQuestion question); Question getQuestion(String id, String sessionKey); @@ -109,5 +109,4 @@ public interface IDatabaseDao { InterposedQuestion getInterposedQuestion(String questionId) throws IOException; void markInterposedQuestionAsRead(InterposedQuestion question) throws IOException; - } diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java index 6962b1cd13db69530a53813d20a479e20117c8fa..618ba0188c9a3a5c770cb789b7003d5462b44276 100644 --- a/src/main/java/de/thm/arsnova/services/IQuestionService.java +++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java @@ -19,8 +19,6 @@ package de.thm.arsnova.services; -import java.io.FileNotFoundException; -import java.io.IOException; import java.util.List; import de.thm.arsnova.entities.Answer; diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java index 0fa208dfa0aed89ec6902bd0c8bcd0adc6ef8d02..ee50c77927b61e527c9e1b36978bd0d1f1788da1 100644 --- a/src/main/java/de/thm/arsnova/services/QuestionService.java +++ b/src/main/java/de/thm/arsnova/services/QuestionService.java @@ -151,6 +151,7 @@ public class QuestionService implements IQuestionService { } @Override + @Authenticated public InterposedQuestion readInterposedQuestion(String sessionKey, String questionId) { try { InterposedQuestion question = databaseDao.getInterposedQuestion(questionId);