From eaafad3741ee05e4511c9559cf015f709c2a36c5 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 9 May 2019 14:07:49 +0200 Subject: [PATCH 1/3] Changed rankinglist call --- .../hhn/labsw/bugageocaching/repositories/UserRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java index af74433..8573416 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java @@ -9,7 +9,7 @@ import java.util.List; public interface UserRepository extends CrudRepository { User findByEmail(String email); - @Query(value = "SELECT DISTINCT u.id AS ID, SUBSTRING_INDEX(u.email, '@', 1) AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" + + @Query(value = "SELECT DISTINCT u.id AS ID, username AS Name, ui.ranking_points_sum AS Ranglistenpunkte\n" + "FROM user u,\n" + " user_info ui,\n" + " user_roles ur\n" + From 157beb458385ffde565bb5894a9dace6a5719d8d Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 9 May 2019 15:23:57 +0200 Subject: [PATCH 2/3] Json in Teammember api call --- src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java index 55cbf2c..3d5fc50 100644 --- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java +++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java @@ -1,5 +1,6 @@ package hhn.labsw.bugageocaching.util; +import com.google.gson.Gson; import hhn.labsw.bugageocaching.entities.*; import hhn.labsw.bugageocaching.repositories.*; import io.jsonwebtoken.Claims; @@ -185,7 +186,7 @@ public class FinderUtil { } - return ResponseEntity.status(200).body(list); + return ResponseEntity.status(200).body(new Gson().toJson(sendBack)); } else { return ResponseEntity.status(404).body("Couldnt find Team member of Team " + name); } From a124b96ae27b5d2918bc9824cc0bc9f4ba6a67e6 Mon Sep 17 00:00:00 2001 From: Maximilian Leopold Date: Thu, 9 May 2019 15:26:53 +0200 Subject: [PATCH 3/3] Added email to Teammeber api call --- src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java index 3d5fc50..c42e4d0 100644 --- a/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java +++ b/src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java @@ -182,6 +182,7 @@ public class FinderUtil { list) { User tmp = new User(); tmp.setUsername((String) obj[3]); + tmp.setEmail((String) obj[1]); sendBack.add(tmp); }