diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index f5000c84a901174ec2cc30bce7bcbde5026ee40b..d1330598181123fe437fc950caf136c715f4584c 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -188,6 +188,22 @@ public class SessionController extends AbstractController { } return sessions; } + + + @RequestMapping(value = "/public_pool", method = RequestMethod.GET) + public final List<Session> getPublicPoolSessions( + final HttpServletResponse response + ) { + List<Session> sessions; + sessions = sessionService.getPublicPoolSessions(); + + if (sessions == null || sessions.isEmpty()) { + response.setStatus(HttpServletResponse.SC_NO_CONTENT); + return null; + } + + return sessions; + } @RequestMapping(value = "/{sessionkey}/lock", method = RequestMethod.POST) public final Session lockSession( diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index c08929b15c852d414fa503e3c1b4b85363c98f6f..d3666f3db95565eec890e1e1d7501dc5e7d20cd0 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -126,7 +126,26 @@ public class CouchDBDao implements IDatabaseDao { } return result; } + + @Override + public final List<Session> getPublicPoolSessions() { + final NovaView view = new NovaView("session/public_pool_by_id"); + + final ViewResults sessions = getDatabase().view(view); + final List<Session> result = new ArrayList<Session>(); + + for (final Document d : sessions.getResults()) { + final Session session = (Session) JSONObject.toBean( + d.getJSONObject().getJSONObject("value"), + Session.class + ); + //session.set_id(d.getId()); + result.add(session); + } + return result; + } + @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 adcba92181decdd9280e13970ca52eebfe1697f2..e0814aba8905d1f5e378f1e4aebb278abdad1bbf 100644 --- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java +++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java @@ -37,6 +37,8 @@ public interface IDatabaseDao { Session getSession(String keyword); List<Session> getMySessions(User user); + + List<Session> getPublicPoolSessions(); Session saveSession(User user, 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 3a08662ebc6e994489973ba5d0f3cc879322db2d..a98f0504828d31b3d0f336e8f0241a2b841c9b65 100644 --- a/src/main/java/de/thm/arsnova/services/ISessionService.java +++ b/src/main/java/de/thm/arsnova/services/ISessionService.java @@ -35,6 +35,8 @@ public interface ISessionService { String generateKeyword(); List<Session> getMySessions(); + + List<Session> getPublicPoolSessions(); List<Session> getMyVisitedSessions(); diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java index d2f1d356438a7de7fa23a4b2ab5b32bdc6fbcc6d..5f38b6756a699ee0543e4f0578802788afffff79 100644 --- a/src/main/java/de/thm/arsnova/services/SessionService.java +++ b/src/main/java/de/thm/arsnova/services/SessionService.java @@ -151,6 +151,12 @@ public class SessionService implements ISessionService { public final List<Session> getMySessions() { return databaseDao.getMySessions(userService.getCurrentUser()); } + + @Override + @PreAuthorize("isAuthenticated()") + public final List<Session> getPublicPoolSessions() { + return databaseDao.getPublicPoolSessions(); + } @Override @PreAuthorize("isAuthenticated()") diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java index 9dddd811e229e475e91a537aac96cbb64c64cace..2b152a5e585193eee0f7bea62bee8e5a929f713f 100644 --- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java +++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java @@ -193,6 +193,12 @@ public class StubDatabaseDao implements IDatabaseDao { // TODO Auto-generated method stub return null; } + + @Override + public List<Session> getPublicPoolSessions() { + // TODO Auto-generated method stub + return null; + } @Override public LoggedIn registerAsOnlineUser(User u, Session s) {