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

Merge branch 'develop' of https://bitbucket-student.it.hs-heilbronn.de/scm/labswp19/labswp_2019_sose_geocaching into develop

Browse Source
This commit is contained in:
Maximilian Leopold 2019-05-16 09:35:00 +02:00
commit 3b3e1ab3d7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,7 +367,7 @@ public class Controller {
}
}*/
List<Bearbeitet> 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!");
@ -660,6 +660,10 @@ public class Controller {
// löscht team, wenn keine teammitglieder mehr vorhanden
if (user_infos.size() == 0) {
List<TeamInvite> teamInvites = teamInviteRepository.findByTeam(team);
for (TeamInvite teamInvite : teamInvites) {
teamInviteRepository.delete(teamInvite);
}
teamRepository.delete(team);
}

1
src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
View File

@ -11,4 +11,5 @@ import java.util.List;
public interface TeamInviteRepository extends JpaRepository<TeamInvite, Integer> {
TeamInvite findByUserAndTeam(User user, Team team);
List<TeamInvite> findByUser(User user);
List<TeamInvite> findByTeam(Team team);
}