From 63d471168738a38c95d768140dc8870558311f91 Mon Sep 17 00:00:00 2001
From: Matthis Bauer <mb420@hdm-stuttgart.de>
Date: Mon, 8 Jan 2024 17:45:51 +0100
Subject: [PATCH] merge commit

---
 .../java/hdm/mi/sthbackend/controller/TournamentController.java | 2 +-
 .../main/java/hdm/mi/sthbackend/service/TournamentService.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java b/sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java
index a6860c8..6849707 100644
--- a/sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java
+++ b/sth-backend/src/main/java/hdm/mi/sthbackend/controller/TournamentController.java
@@ -37,7 +37,7 @@ public class TournamentController {
     @PostMapping("/{tournamentId}/teams")
     public Team createTeam(@PathVariable UUID tournamentId,
                            @RequestBody String teamName) throws TournamentIdNotFoundException {
-        return service.createTeamFromTournament(tournamentId, teamName);
+        return service.createTeam(tournamentId, teamName);
     }
     @DeleteMapping("/{tournamentId}/teams/{teamId}")
     public UUID removeTeamFromTournament(@PathVariable UUID tournamentId,
diff --git a/sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java b/sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java
index a7d3810..03a3726 100644
--- a/sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java
+++ b/sth-backend/src/main/java/hdm/mi/sthbackend/service/TournamentService.java
@@ -70,7 +70,7 @@ public class TournamentService {
         return playerId;
     }
 
-    public Team createTeamFromTournament(UUID tournamentId, String teamName) throws TournamentIdNotFoundException {
+    public Team createTeam(UUID tournamentId, String teamName) throws TournamentIdNotFoundException {
         Tournament tournament = tournamentRepository.findById(tournamentId)
                 .orElseThrow(() -> new TournamentIdNotFoundException(tournamentId));
 
-- 
GitLab