diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index c0bb0e8d07aa35f2759f3b39e9ec31edc2b1bfb1..5414992c7dedaa09eb056bdc36b9a3bb83137c73 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -190,19 +190,29 @@ public class SessionController extends AbstractController { } return sessions; } - + @RequestMapping(value = "/publicpool", method = RequestMethod.GET, params = "statusonly=true") + public final List<SessionInfo> getMyPublicPoolSessions( + final HttpServletResponse response + ) { + System.out.println("getMyPublicPoolSessions()"); + List<SessionInfo> sessions = sessionService.getMyPublicPoolSessionsInfo(); + + if (sessions == null || sessions.isEmpty()) { + response.setStatus(HttpServletResponse.SC_NO_CONTENT); + return null; + } + + return sessions; + } + @RequestMapping(value = "/publicpool", method = RequestMethod.GET) public final List<Session> getPublicPoolSessions( - @RequestParam(value = "myonly", defaultValue = "false") final boolean myOnly, final HttpServletResponse response ) { - List<Session> sessions; - if (!myOnly) - sessions = sessionService.getPublicPoolSessions(); - else - sessions = sessionService.getMyPublicPoolSessions(); - + System.out.println("getPublicPoolSessions()"); + List<Session> sessions = sessionService.getPublicPoolSessions(); + if (sessions == null || sessions.isEmpty()) { response.setStatus(HttpServletResponse.SC_NO_CONTENT); return null; diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 25e78b55bda58b5f1168cbcf2c1603b48f6952c4..136bb369c3d5e542335354c9398d3b5908d7a357 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -170,6 +170,12 @@ public class CouchDBDao implements IDatabaseDao { return result; } + @Override + public final List<SessionInfo> getMyPublicPoolSessionsInfo(final User user) { + final List<Session> sessions = this.getMyPublicPoolSessions(user); + return getInfosForSessions(sessions); + } + @Override public final List<SessionInfo> getMySessionsInfo(final User user) { final List<Session> sessions = this.getMySessions(user); diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java index 37081dc924cd65813a68f6a9b41afde99345111d..9ad912d459b9491a35f7eafd47ec3218457d0059 100644 --- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java +++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java @@ -178,6 +178,8 @@ public interface IDatabaseDao { List<SessionInfo> getMySessionsInfo(User user); + List<SessionInfo> getMyPublicPoolSessionsInfo(final User user); + List<SessionInfo> getMyVisitedSessionsInfo(User currentUser); void deleteAllPreparationAnswers(Session session); diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java index 108a8ff90ec45ba856e55335abcad4a6552a04a2..566c669a9d62d95236e86b50780377358d59b79e 100644 --- a/src/main/java/de/thm/arsnova/services/ISessionService.java +++ b/src/main/java/de/thm/arsnova/services/ISessionService.java @@ -41,8 +41,6 @@ public interface ISessionService { List<Session> getMySessions(); List<Session> getPublicPoolSessions(); - - List<Session> getMyPublicPoolSessions(); List<Session> getMyVisitedSessions(); @@ -63,6 +61,8 @@ public interface ISessionService { SimpleEntry<Integer, Integer> getMyLearningProgress(String sessionkey); List<SessionInfo> getMySessionsInfo(); + + List<SessionInfo> getMyPublicPoolSessionsInfo(); List<SessionInfo> getMyVisitedSessionsInfo(); } diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java index dd02f5303c55a54e5360bebd8d3d6c03a4551220..f69d718b6f4e89cedeb26db62064303eb48e240c 100644 --- a/src/main/java/de/thm/arsnova/services/SessionService.java +++ b/src/main/java/de/thm/arsnova/services/SessionService.java @@ -175,8 +175,8 @@ public class SessionService implements ISessionService { @Override @PreAuthorize("isAuthenticated()") - public final List<Session> getMyPublicPoolSessions() { - return databaseDao.getMyPublicPoolSessions(userService.getCurrentUser()); + public final List<SessionInfo> getMyPublicPoolSessionsInfo() { + return databaseDao.getMyPublicPoolSessionsInfo(userService.getCurrentUser()); } @Override diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java index cd89e6a55d651bbf535103eb5f7ade44dc8c2c96..34a833e2a5f64d9d41a03808058efb0ff9aafca7 100644 --- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java +++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java @@ -205,6 +205,12 @@ public class StubDatabaseDao implements IDatabaseDao { // TODO Auto-generated method stub return null; } + + @Override + public List<SessionInfo> getMyPublicPoolSessionsInfo(final User user) { + // TODO Auto-generated method stub + return null; + } @Override public LoggedIn registerAsOnlineUser(User u, Session s) {