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 21:37:29 +02:00
commit fec8723bbd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
View File

@ -601,6 +601,7 @@ public class Controller {
int i = 0; int i = 0;
// zählt teammitglieder // zählt teammitglieder
List<User_Info> user_infos = user_infoRepository.findByTeam(team); List<User_Info> user_infos = user_infoRepository.findByTeam(team);
/*for (User_Info userInfo1 : user_infoRepository.findAll()) { /*for (User_Info userInfo1 : user_infoRepository.findAll()) {
@ -618,6 +619,8 @@ public class Controller {
user_info.setTeam(team); user_info.setTeam(team);
user_infoRepository.save(user_info); user_infoRepository.save(user_info);
TeamInvite teamInvite = teamInviteRepository.findByUserAndTeam(user, team);
teamInviteRepository.delete(teamInvite);
return ResponseEntity.status(200).body(new Gson().toJson(team)); return ResponseEntity.status(200).body(new Gson().toJson(team));
} }