diff --git a/src/main/java/de/thm/arsnova/controller/SessionController.java b/src/main/java/de/thm/arsnova/controller/SessionController.java index 528bcde253765c07a5bf913786e9cab146f645d5..91ed95fcd4411cf9d04e593e08ffce47bf04c181 100644 --- a/src/main/java/de/thm/arsnova/controller/SessionController.java +++ b/src/main/java/de/thm/arsnova/controller/SessionController.java @@ -18,12 +18,15 @@ */ package de.thm.arsnova.controller; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletResponse; +import net.sf.json.JSONObject; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -170,11 +173,15 @@ public class SessionController extends AbstractController { } @RequestMapping(value = "/{sessionkey}/mylearningprogress", method = RequestMethod.GET) - public final int myLearningProgress( + public final JSONObject myLearningProgress( @PathVariable final String sessionkey, final HttpServletResponse response ) { - return sessionService.getMyLearningProgress(sessionkey); + SimpleEntry<Integer, Integer> result = sessionService.getMyLearningProgress(sessionkey); + JSONObject json = new JSONObject(); + json.put("myprogress", result.getKey()); + json.put("courseprogress", result.getValue()); + return json; } /* internal redirections */ diff --git a/src/main/java/de/thm/arsnova/services/ISessionService.java b/src/main/java/de/thm/arsnova/services/ISessionService.java index e9b4c543204dc82da2d1f41d1d392237199f3038..20e40d828d1b5958df5b0ed50935b496f5853fd3 100644 --- a/src/main/java/de/thm/arsnova/services/ISessionService.java +++ b/src/main/java/de/thm/arsnova/services/ISessionService.java @@ -19,6 +19,7 @@ package de.thm.arsnova.services; +import java.util.AbstractMap.SimpleEntry; import java.util.List; import java.util.UUID; @@ -55,5 +56,5 @@ public interface ISessionService { int getLearningProgress(String sessionkey); - int getMyLearningProgress(String sessionkey); + SimpleEntry<Integer, Integer> getMyLearningProgress(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 81cee4ce86ea7002db21d31c2dd090fa10b7fdee..595c0567a9e7b27320fafc439ab3ffe7b891c309 100644 --- a/src/main/java/de/thm/arsnova/services/SessionService.java +++ b/src/main/java/de/thm/arsnova/services/SessionService.java @@ -20,6 +20,7 @@ package de.thm.arsnova.services; import java.io.Serializable; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -262,7 +263,7 @@ public class SessionService implements ISessionService { @Override @PreAuthorize("isAuthenticated()") - public int getMyLearningProgress(final String sessionkey) { + public SimpleEntry<Integer,Integer> getMyLearningProgress(final String sessionkey) { final Session session = databaseDao.getSession(sessionkey); final User user = userService.getCurrentUser(); return databaseDao.getMyLearningProgress(session, user); diff --git a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java index 20a6e9f35b3d7363a41a5ed34d3e2bf17f4085d0..c73b88f96c0560c885ed9865c881c3a530cd54eb 100644 --- a/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java +++ b/src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java @@ -18,6 +18,7 @@ */ package de.thm.arsnova.dao; +import java.util.AbstractMap.SimpleEntry; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -506,8 +507,8 @@ public class StubDatabaseDao implements IDatabaseDao { } @Override - public int getMyLearningProgress(Session session, User user) { + public SimpleEntry<Integer, Integer> getMyLearningProgress(Session session, User user) { // TODO Auto-generated method stub - return 0; + return null; } }