diff --git a/src/main/java/de/thm/arsnova/services/StatisticsService.java b/src/main/java/de/thm/arsnova/services/StatisticsService.java index 6f96824bf07c33077b802dc9f0a16dce40d0faec..d94a917d5112c65304afc03dfa091aeab0d86c57 100644 --- a/src/main/java/de/thm/arsnova/services/StatisticsService.java +++ b/src/main/java/de/thm/arsnova/services/StatisticsService.java @@ -10,18 +10,18 @@ import de.thm.arsnova.entities.Statistics; @Service public class StatisticsService implements IStatisticsService { - private static final int DURATION_IN_MILLIS = 3 * 60 * 1000; - @Autowired private IDatabaseDao databaseDao; + @Autowired + private IUserService userService; + @Autowired private SessionRegistry sessionRegistry; @Override public final int countActiveUsers() { - long since = System.currentTimeMillis() - DURATION_IN_MILLIS; - return databaseDao.countActiveUsers(since); + return userService.loggedInUsers(); } @Override @@ -31,14 +31,13 @@ public class StatisticsService implements IStatisticsService { @Override public final Statistics getStatistics() { - long since = System.currentTimeMillis() - DURATION_IN_MILLIS; - Statistics statistics = new Statistics(); statistics.setOpenSessions(databaseDao.countOpenSessions()); statistics.setClosedSessions(databaseDao.countClosedSessions()); statistics.setAnswers(databaseDao.countAnswers()); statistics.setQuestions(databaseDao.countQuestions()); - statistics.setActiveUsers(databaseDao.countActiveUsers(since)); + statistics.setActiveUsers(userService.loggedInUsers()); + return statistics; } }