diff --git a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java index fce693731bd880d0814b4c194ab332e558f0a60a..aeabcb51069bdc7ad85fb615d709f09c12ca070f 100644 --- a/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java +++ b/src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java @@ -428,6 +428,14 @@ public class LecturerQuestionController extends AbstractController { return questionService.getAnswerCount(questionId); } + @RequestMapping(value = "/{questionId}/allroundanswercount", method = RequestMethod.GET) + public List<Integer> getAllAnswerCount(@PathVariable final String questionId) { + return Arrays.asList( + questionService.getAnswerCount(questionId, 1), + questionService.getAnswerCount(questionId, 2) + ); + } + @RequestMapping(value = "/{questionId}/totalanswercount", method = RequestMethod.GET) public int getTotalAnswerCountByQuestion(@PathVariable final String questionId) { return questionService.getTotalAnswerCountByQuestion(questionId); diff --git a/src/main/java/de/thm/arsnova/services/IQuestionService.java b/src/main/java/de/thm/arsnova/services/IQuestionService.java index fdd78b3ba05eebe05fab286ec75f58665196c1a5..c6fe40ef67a64f1fb77251d8b50f9a28a958f5ea 100644 --- a/src/main/java/de/thm/arsnova/services/IQuestionService.java +++ b/src/main/java/de/thm/arsnova/services/IQuestionService.java @@ -64,6 +64,8 @@ public interface IQuestionService { int getAnswerCount(String questionId); + int getAnswerCount(String questionId, int piRound); + List<Answer> getFreetextAnswers(String questionId); List<Answer> getMyAnswers(String sessionKey); diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java index c7eb08517cc6a0e4146e9404d9cfd1094d502de2..6c5dca9d8a47b91052facd5f3fb9b533679258b2 100644 --- a/src/main/java/de/thm/arsnova/services/QuestionService.java +++ b/src/main/java/de/thm/arsnova/services/QuestionService.java @@ -466,6 +466,17 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis return databaseDao.getAnswerCount(question, question.getPiRound()); } + @Override + @PreAuthorize("isAuthenticated()") + public int getAnswerCount(final String questionId, final int piRound) { + final Question question = getQuestion(questionId); + if (question == null) { + return 0; + } + + return databaseDao.getAnswerCount(question, piRound); + } + @Override @PreAuthorize("isAuthenticated()") public int getAbstentionAnswerCount(final String questionId) {