From 35ad020c842ab6fdb8a6b0c8b2801cc57630f55f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 27 Apr 2019 19:48:14 +0200 Subject: [PATCH 01/17] added leaveTeam and added some comments --- .../bugageocaching/controller/Controller.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 493d66a..5c2d6e6 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -429,12 +429,14 @@ public class Controller { @ResponseBody public ResponseEntity createTeam(@RequestParam String token, @RequestParam String name) { + // 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); @@ -458,6 +460,7 @@ public class Controller { return ResponseEntity.status(400).body("You already have a team"); } + // checkt, ob der name bereits vorhanden ist for (Team team : teamRepository.findAll()) { if (team.getName().equals(name)) { return ResponseEntity.status(400).body("The teamname is already taken"); @@ -479,12 +482,14 @@ public class Controller { @ResponseBody public ResponseEntity joinTeam(@RequestParam String token, @RequestParam String teamID) { + // 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); @@ -519,16 +524,19 @@ public class Controller { int i = 0; + // zählt teammitglieder for (User_Info userInfo1 : user_infoRepository.findAll()) { if (userInfo1.getTeam().equals(team)) { i++; } } + // wenn maximalanzahl der teammitglieder erreicht... if (i >= 10) { return ResponseEntity.status(400).body("The team already has 10 members"); } + // tritt dem team bei user_info.setTeam(team); user_infoRepository.save(user_info); @@ -536,6 +544,72 @@ public class Controller { return ResponseEntity.status(200).body(team); } + @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose + @RequestMapping("/api/leaveTeam") + @ResponseBody + public ResponseEntity leaveTeam(@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(); + + //Get User_Info + ResponseEntity getUser_Info = FinderUtil.findUser_InfoByID(String.valueOf(user.getId())); + + if (getUser_Info.getStatusCodeValue() != 200) { + return getUser_Info; + } + + User_Info user_info = (User_Info) getUser_Info.getBody(); + //---------------------- + if (user_info.getTeam() == null) { + return ResponseEntity.status(400).body("You aren´t in any team"); + } + + //Get team + ResponseEntity getTeam = FinderUtil.findTeamById(String.valueOf(user_info.getTeam().getId())); + + if (getTeam.getStatusCodeValue() != 200) { + return getTeam; + } + + Team team = (Team) getTeam.getBody(); + + // verlässt team + user_info.setTeam(null); + + int i = 0; + // zählt teammitglieder + for (User_Info userInfo1 : user_infoRepository.findAll()) { + if (userInfo1.getTeam().equals(team)) { + i++; + } + } + + // löscht team, wenn keine teammitglieder mehr vorhanden + if (i == 0) { + teamRepository.delete(team); + } + + user_infoRepository.save(user_info); + + return ResponseEntity.status(200).body("Ok"); + } + @RequestMapping("/api/hello") public ResponseEntity hello(@RequestParam String name) { return ResponseEntity.status(200).body(userRepository.getRankingPlaceFromUser(name)); From c4b3c52fea71c9f1fbdf150c215072029c6e4b7f Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 27 Apr 2019 20:12:51 +0200 Subject: [PATCH 02/17] added getTeamRankingList sql query --- .../repositories/UserRepository.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java index 7820046..8d1bab7 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java @@ -35,4 +35,18 @@ public interface UserRepository extends CrudRepository { "WHERE Name = ?1", nativeQuery = true) int getRankingPlaceFromUser(String username); + @Query(value = "SELECT DISTINCT t.name AS teamname, SUM(ui.ranking_points_sum) AS Ranglistenpunkte\n" + + "FROM user u,\n" + + " user_info ui,\n" + + " user_roles ur,\n" + + " team t\n" + + "WHERE u.id = ui.user_id\n" + + " AND u.id = ur.user_id\n" + + " AND t.id = ui.team_id\n" + + " AND ui.team_id IS NOT NULL\n" + + "GROUP BY teamname\n" + + "ORDER by ranking_points_sum DESC" + + "LIMIT 10;", nativeQuery = true) + List getTeamRankingList(); + } From 50f7204cf54669a1a77080877c18a73117873cad Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 27 Apr 2019 20:15:18 +0200 Subject: [PATCH 03/17] added teamRankingListHelper --- .../helper/TeamRankingListHelper.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java b/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java new file mode 100644 index 0000000..9a81386 --- /dev/null +++ b/src/main/java/hhn/labsw/bugageocaching/helper/TeamRankingListHelper.java @@ -0,0 +1,34 @@ +package hhn.labsw.bugageocaching.helper; + +public class TeamRankingListHelper { + + private String teamname; + private int rankingPointsSum; + + public TeamRankingListHelper(String teamname, int ranking_Points) { + this.teamname = teamname; + this.rankingPointsSum = ranking_Points; + } + + public String getTeamname() { + return teamname; + } + + public void setTeamname(String teamname) { + this.teamname = teamname; + } + + public int getRanking_Points() { + return rankingPointsSum; + } + + public void setRanking_Points(int ranking_Points) { + this.rankingPointsSum = ranking_Points; + } + + @Override + public String toString() { + return "( " + teamname + " | " + rankingPointsSum + " )"; + } + +} From 1a6fb9d35ec8539af97f6cd117380c34fc90bc9e Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 27 Apr 2019 20:17:24 +0200 Subject: [PATCH 04/17] added a getTeamRankingList API method --- .../bugageocaching/controller/Controller.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 5c2d6e6..881f78c 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -3,6 +3,7 @@ package hhn.labsw.bugageocaching.controller; import com.google.gson.Gson; import hhn.labsw.bugageocaching.entities.*; import hhn.labsw.bugageocaching.helper.RankingListHelper; +import hhn.labsw.bugageocaching.helper.TeamRankingListHelper; import hhn.labsw.bugageocaching.repositories.*; import hhn.labsw.bugageocaching.util.FinderUtil; import hhn.labsw.bugageocaching.util.VerificationUtil; @@ -396,6 +397,21 @@ public class Controller { return ResponseEntity.status(200).body(new Gson().toJson(sendBackUsers)); } + @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose + @RequestMapping("/api/getTeamRankingList") + @ResponseBody + public ResponseEntity getTeamRankingList() { + + List sendBackTeams = new LinkedList<>(); + List rankingTeams = userRepository.getTeamRankingList(); + for (Object[] obj : rankingTeams) { + TeamRankingListHelper tmp = new TeamRankingListHelper((String) obj[0], (Integer) obj[1]); + System.out.println(tmp); + sendBackTeams.add(tmp); + } + return ResponseEntity.status(200).body(new Gson().toJson(sendBackTeams)); + } + @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose @RequestMapping("/api/getUser") @ResponseBody From c10820d83251471f222b2d7f246ad593c810ea2d Mon Sep 17 00:00:00 2001 From: rchrist Date: Sat, 27 Apr 2019 21:43:23 +0200 Subject: [PATCH 05/17] myProfile and myTeams MOCKUP version added --- frontend/quasar.conf.js | 1 + frontend/src/pages/Profile.vue | 196 +++++++++++++++++++++++++++++---- 2 files changed, 176 insertions(+), 21 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index 9ee4e06..1ceac6e 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -68,6 +68,7 @@ module.exports = function (ctx) { 'QEditor', 'QSelect', 'QField', + 'QBtnDropdown', ], directives: [ diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue index d3a76c6..44f4ff8 100644 --- a/frontend/src/pages/Profile.vue +++ b/frontend/src/pages/Profile.vue @@ -1,20 +1,21 @@