more merge fixes...

src/main/java/hhn/labsw/bugageocaching/controller/Controller.java

@@ -792,7 +792,8 @@ public class Controller {
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/getCurrentStation")
   @ResponseBody
-  public ResponseEntity getStationFromUserAndCache(@RequestParam String token, @RequestParam String cacheID){
+  public ResponseEntity getStationFromUserAndCache(@RequestParam String token,
+                                                   @RequestParam String cacheID){
 
     // verify user
     ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
@@ -826,6 +827,31 @@ public class Controller {
     return ResponseEntity.status(200).body(bearbeitetRepository.findByUserAndCache(user, cache));
   }
 
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getRankingPlace")
+  public ResponseEntity getRankingPlace(@RequestParam String token){
+
+    // verify user
+    ResponseEntity verifyToken = VerificationUtil.verifyToken(token);
+
+    if (verifyToken.getStatusCodeValue() != 200) {
+      return verifyToken;
+    }
+
+    //get User
+    Claims claims = (Claims) verifyToken.getBody();
+
+    ResponseEntity getUser = FinderUtil.findUserFromClaim(claims);
+
+    if (getUser.getStatusCodeValue() != 200) {
+      return getUser;
+    }
+
+    User user = (User) getUser.getBody();
+
+    return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(user.getUsername()));
+  }
+
   @CrossOrigin(origins = "*", allowedHeaders = "*") // only for dev purpose
   @RequestMapping("/api/hello")
   public ResponseEntity hello(@RequestParam String name) {