diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index 00adecaca30c00940754079bc52678d80bf37474..95603e1c6f059f5e4d90cf685a9ec94b8356c1d6 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -142,4 +142,15 @@ public class SessionController extends AbstractController { } return sessions; } + + @RequestMapping(value = "/session/visitedsessions", method = RequestMethod.GET) + @ResponseBody + public final List<Session> getMyVisitedSession(final HttpServletResponse response) { + List<Session> sessions = sessionService.getMyVisitedSessions(userService.getCurrentUser()); + if (sessions == null || sessions.isEmpty()) { + response.setStatus(HttpStatus.NO_CONTENT.value()); + return null; + } + return sessions; + } } diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java index 2fcaf7846c2018bf259b7ca1d61af8fdd05ee348..c33c890a047cb4c2484fec2282d5ec626178dd77 100644 --- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java +++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java @@ -1237,4 +1237,33 @@ public class CouchDBDao implements IDatabaseDao { document.put("read", question.isRead()); this.getDatabase().saveDocument(document); } + + @Override + public List<Session> getMyVisitedSessions(User user) { + try { + View view = new View("logged_in/visited_sessions_by_user"); + view.setKey(URLEncoder.encode("\"" + user.getUsername() + "\"", "UTF-8")); + ViewResults sessions = this.getDatabase().view(view); + List<Session> allSessions = new ArrayList<Session>(); + for (Document d : sessions.getResults()) { + @SuppressWarnings("unchecked") + Collection<Session> visitedSessions = JSONArray.toCollection( + d.getJSONObject().getJSONArray("value"), + Session.class + ); + allSessions.addAll(visitedSessions); + } + // Do these sessions still exist? + List<Session> result = new ArrayList<Session>(); + for (Session s : allSessions) { + Session session = this.getSessionFromKeyword(s.getKeyword()); + if (session != null) { + result.add(session); + } + } + return result; + } catch (UnsupportedEncodingException e) { + return null; + } + } } diff --git a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java index b8837942e505cef3556d2607520afdbc05046b37..b8a16641ae5bba3b7f0cc0ee589040f367aa867a 100644 --- a/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java +++ b/src/main/java/de/thm/arsnova/dao/IDatabaseDao.java @@ -111,4 +111,6 @@ public interface IDatabaseDao { InterposedQuestion getInterposedQuestion(String questionId) throws IOException; void markInterposedQuestionAsRead(InterposedQuestion question) throws IOException; + + List<Session> getMyVisitedSessions(User user); } diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java index 865fc2fcba651a786505d545ae484e56a2f8ed3b..7175464fa71de1eba6b68481d45208f312562403 100644 --- a/src/main/java/de/thm/arsnova/services/ISessionService.java +++ b/src/main/java/de/thm/arsnova/services/ISessionService.java @@ -36,7 +36,10 @@ public interface ISessionService { List<Session> getMySessions(String username); + List<Session> getMyVisitedSessions(User currentUser); + LoggedIn registerAsOnlineUser(User user, String sessionkey); int countActiveUsers(String sessionkey); + } diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java index c99377734bd47ae2a6dadfd3812f839244d94075..23f6f881bcd2c8243018f22b327f1516f9772a2d 100644 --- a/src/main/java/de/thm/arsnova/services/SessionService.java +++ b/src/main/java/de/thm/arsnova/services/SessionService.java @@ -57,6 +57,11 @@ public class SessionService implements ISessionService { return databaseDao.getMySessions(username); } + @Override + public final List<Session> getMyVisitedSessions(final User user) { + return databaseDao.getMyVisitedSessions(user); + } + @Override @Authenticated public final Session saveSession(final Session session) { diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java index 79f2902018014f07f0794b457d9e7726fd7e2c71..cc967380414b97b51372ff7c68b04d782365569a 100644 --- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java +++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java @@ -363,4 +363,10 @@ public class StubDatabaseDao implements IDatabaseDao { public void markInterposedQuestionAsRead(InterposedQuestion question) throws IOException { this.interposedQuestion.setRead(true); } + + @Override + public List<Session> getMyVisitedSessions(User user) { + // TODO Auto-generated method stub + return null; + } }