Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java

sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java

@@ -217,6 +217,22 @@ public class TournamentService {
         log.debug("Tournament Name for TournamentID " + tournamentId + " updated to " + newTournamentName);
         return tournamentId;
     }
+    public Tournament getTournament(UUID tournamentId) throws TournamentIdNotFoundException {
+        Tournament tournament = tournamentRepository.findById(tournamentId)
+                .orElseThrow(() -> new TournamentIdNotFoundException(tournamentId));
+
+        log.debug(tournament + "is found");
+        return tournament;
+    }
+
+    public void deleteTournament(UUID tournamentId) throws TournamentIdNotFoundException {
+        Tournament tournamentToDelete = tournamentRepository.findById(tournamentId)
+                .orElseThrow(() -> new TournamentIdNotFoundException(tournamentId));
+
+        tournamentRepository.delete(tournamentToDelete);
+        log.debug("Tournament " + tournamentId + " has been deleted");
+    }
+
     /*
     Weitere Methoden:
     UpdateTeamScore  Marius