diff --git a/src/main/java/de/thm/arsnova/controller/FeedbackController.java b/src/main/java/de/thm/arsnova/controller/FeedbackController.java index f816e93f4a06aa9e129a2b2b5186394241020e8d..6778032811485f99e50fcbd7c41432a5239a170a 100644 --- a/src/main/java/de/thm/arsnova/controller/FeedbackController.java +++ b/src/main/java/de/thm/arsnova/controller/FeedbackController.java @@ -57,6 +57,12 @@ public class FeedbackController extends AbstractController { return sessionService.getFeedback(sessionkey); } + @RequestMapping(value="/session/{sessionkey}/feedback/count", method=RequestMethod.GET) + @ResponseBody + public int getFeedbackCount(@PathVariable String sessionkey) { + return sessionService.getFeedbackCount(sessionkey); + } + @RequestMapping(value="/session/{sessionkey}/feedback", method=RequestMethod.POST) @ResponseBody public Feedback postFeedback(@PathVariable String sessionkey, @RequestBody int value, HttpServletResponse response) { diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index b4a71cf4ea6baebf9a4d098da31559c9a82c93f7..8c7169405bc7c2d01a2446f7df111fce448b0f8f 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -34,11 +34,8 @@ 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; -import de.thm.arsnova.entities.Question; import de.thm.arsnova.entities.LoggedIn; import de.thm.arsnova.entities.Session; import de.thm.arsnova.entities.User; diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java index e2f058b1ee15bdbb3423f52609d9b51451e1d8d0..cb50769c19014e7684da952617f7aece1efd3def 100644 --- a/src/main/java/de/thm/arsnova/services/ISessionService.java +++ b/src/main/java/de/thm/arsnova/services/ISessionService.java @@ -36,6 +36,7 @@ public interface ISessionService { public Session joinSession(String keyword); public Session saveSession(Session session); public Feedback getFeedback(String keyword); + public int getFeedbackCount(String keyword); public boolean saveFeedback(String keyword, int value, User user); public boolean sessionKeyAvailable(String keyword); public String generateKeyword(); diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java index 2aae2b2241d5195ee6d7b1e995202c491d56893d..bf7e2475f04f0a5172aebe052b5e051c38f1067b 100644 --- a/src/main/java/de/thm/arsnova/services/SessionService.java +++ b/src/main/java/de/thm/arsnova/services/SessionService.java @@ -98,6 +98,14 @@ public class SessionService implements ISessionService { public Feedback getFeedback(String keyword) { return databaseDao.getFeedback(keyword); } + + @Override + @Authenticated + public int getFeedbackCount(String keyword) { + Feedback feedback = databaseDao.getFeedback(keyword); + List<Integer> values = feedback.getValues(); + return values.get(0) + values.get(1) + values.get(2) + values.get(3); + } @Override @Authenticated