From 30c490ec5978f081436fbac6c92b0f56384957cd Mon Sep 17 00:00:00 2001
From: Daniel Knapp <daniel.knapp@thm.de>
Date: Thu, 6 Dec 2012 11:46:31 +0100
Subject: [PATCH] get single interposed question
---
.../java/de/thm/arsnova/controller/QuestionController.java | 4 +---
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 5 +++--
src/main/java/de/thm/arsnova/services/IQuestionService.java | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/QuestionController.java b/src/main/java/de/thm/arsnova/controller/QuestionController.java
index 44deca320..5383ace00 100644
--- a/src/main/java/de/thm/arsnova/controller/QuestionController.java
+++ b/src/main/java/de/thm/arsnova/controller/QuestionController.java
@@ -269,7 +269,6 @@ public class QuestionController extends AbstractController {
return questionService.getInterposedQuestions(sessionKey);
}
-<<<<<<< HEAD
@RequestMapping(value = "/session/{sessionKey}/interposed/{documentId}", method = RequestMethod.GET)
@ResponseBody
public final Question getInterposedQuestion(
@@ -278,7 +277,7 @@ public class QuestionController extends AbstractController {
final HttpServletResponse response
) {
return questionService.getInterposedQuestion(sessionKey, documentId);
-=======
+ }
@RequestMapping(value = "/session/{sessionkey}/interposed", method = RequestMethod.POST)
@ResponseBody
@@ -299,7 +298,6 @@ public class QuestionController extends AbstractController {
response.setStatus(HttpStatus.BAD_REQUEST.value());
return;
->>>>>>> 83eba294f9a7f8a8250127f8b5673aff0fc04663
}
}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 9488fedb8..83fbb9d56 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1079,10 +1079,11 @@ public class CouchDBDao implements IDatabaseDao {
public Question getInterposedQuestion(String sessionKey, String documentId) {
try {
- Document document = this.getDatabase().getDocument(documentId);
+ Document document = this.getDatabase().getDocument(documentId);
+ LOGGER.error("bla test" + document.toString());
if(document != null) {
- Question question = (Question) JSONObject.toBean(document.getJSONObject().getJSONObject("value"), Question.class);
+ Question question = (Question) JSONObject.toBean(document.getJSONObject(), Question.class);
question.setQuestionType("interposed_question");
return question;
diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java
index c835a577a..4b8cd185d 100644
--- a/src/main/java/de/thm/arsnova/services/IQuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java
@@ -56,8 +56,6 @@ public interface IQuestionService {
int getInterposedCount(String sessionKey);
- List<Question> getInterposedQuestions(String sessionKey);
-
Question getInterposedQuestion(String sessionKey, String documentId);
List<InterposedQuestion> getInterposedQuestions(String sessionKey);
--
GitLab