From 30471e49dd41a8c257fb5c5225284cd4d9415eea Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Wed, 17 Oct 2012 17:06:09 +0200
Subject: [PATCH] Added another missing method; removed ignored properties
The properties are needed by the client and must not be ignored.
---
.../thm/arsnova/controller/SessionController.java | 13 +++++++++++++
.../de/thm/arsnova/socket/message/Question.java | 3 ---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java
index 4ce7e275..16e808de 100644
--- a/src/main/java/de/thm/arsnova/controller/SessionController.java
+++ b/src/main/java/de/thm/arsnova/controller/SessionController.java
@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import de.thm.arsnova.entities.Feedback;
@@ -171,4 +172,16 @@ public class SessionController extends AbstractController {
}
return sessions;
}
+
+ @RequestMapping(value="/getSkillQuestions/{sessionkey}", method=RequestMethod.GET)
+ @ResponseBody
+ public List<Question> getSkillQuestions(@PathVariable String sessionkey, @RequestParam(value="sort", required=false) String sort, HttpServletResponse response) {
+ List<Question> questions = sessionService.getSkillQuestions(sessionkey, sort);
+ if(questions == null || questions.isEmpty()) {
+ response.setStatus(HttpStatus.NOT_FOUND.value());
+ return null;
+ }
+ logger.info(questions.toString());
+ return questions;
+ }
}
diff --git a/src/main/java/de/thm/arsnova/socket/message/Question.java b/src/main/java/de/thm/arsnova/socket/message/Question.java
index 4e810b66..a5b10ee5 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Question.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Question.java
@@ -20,9 +20,6 @@ package de.thm.arsnova.socket.message;
import java.util.List;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties({"_id", "_rev"})
public class Question {
private String type;
--
GitLab