tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into frontend/robin

Browse Source
This commit is contained in:
rchrist 2019-05-09 18:03:30 +02:00
commit 8d3fe823a9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
View File

@ -9,7 +9,7 @@ import java.util.List;
public interface UserRepository extends CrudRepository<User, Integer> { public interface UserRepository extends CrudRepository<User, Integer> {
User findByEmail(String email); 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" + "FROM user u,\n" +
" user_info ui,\n" + " user_info ui,\n" +
" user_roles ur\n" + " user_roles ur\n" +

4
src/main/java/hhn/labsw/bugageocaching/util/FinderUtil.java
View File

@ -1,5 +1,6 @@
package hhn.labsw.bugageocaching.util; package hhn.labsw.bugageocaching.util;
import com.google.gson.Gson;
import hhn.labsw.bugageocaching.entities.*; import hhn.labsw.bugageocaching.entities.*;
import hhn.labsw.bugageocaching.repositories.*; import hhn.labsw.bugageocaching.repositories.*;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
@ -181,11 +182,12 @@ public class FinderUtil {
list) { list) {
User tmp = new User(); User tmp = new User();
tmp.setUsername((String) obj[3]); tmp.setUsername((String) obj[3]);
tmp.setEmail((String) obj[1]);
sendBack.add(tmp); sendBack.add(tmp);
} }
return ResponseEntity.status(200).body(list); return ResponseEntity.status(200).body(new Gson().toJson(sendBack));
} else { } else {
return ResponseEntity.status(404).body("Couldnt find Team member of Team " + name); return ResponseEntity.status(404).body("Couldnt find Team member of Team " + name);
} }