From 896702b8f812735f0834c3147f9bbc8ab636c5ce Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 16 May 2019 09:13:04 +0200 Subject: [PATCH] fixed leaveTeam --- .../hhn/labsw/bugageocaching/controller/Controller.java | 6 +++++- .../bugageocaching/repositories/TeamInviteRepository.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index 071dd3f..44d6cfe 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -448,7 +448,7 @@ public class Controller { } }*/ List bearbeitetList = bearbeitetRepository.findByUser(user); - logger.debug("/api/getMyCaches Got all bearbeitet entreis of user: " +user.getEmail()); + logger.debug("/api/getMyCaches Got all bearbeitet entreis of user: " + user.getEmail()); return ResponseEntity.status(200).body(new Gson().toJson(bearbeitetList)); } else { return ResponseEntity.status(404).body("Es gab einen Fehler. Bitte versuche es erneut oder kontaktiere einen Admin!"); @@ -721,6 +721,10 @@ public class Controller { // löscht team, wenn keine teammitglieder mehr vorhanden if (user_infos.size() == 0) { + List teamInvites = teamInviteRepository.findByTeam(team); + for (TeamInvite teamInvite : teamInvites) { + teamInviteRepository.delete(teamInvite); + } teamRepository.delete(team); } diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java index 0031632..154cd3d 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java @@ -11,4 +11,5 @@ import java.util.List; public interface TeamInviteRepository extends JpaRepository { TeamInvite findByUserAndTeam(User user, Team team); List findByUser(User user); + List findByTeam(Team team); }