From 362e75ed4d73508635474143efa415f51d1046cc Mon Sep 17 00:00:00 2001
From: Jonas <jonas.fischer14@gmx.de>
Date: Thu, 11 Jan 2024 22:18:36 +0100
Subject: [PATCH] 11.01.2024 - adjust controller #22
---
.../controller/TournamentController.java | 33 ++++++++++++-------
1 file changed, 21 insertions(+), 12 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 53d4194..8e3253e 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
@@ -2,12 +2,14 @@ package hdm.mi.sthbackend.controller;
import hdm.mi.sthbackend.dto.PlayerDTO;
-import hdm.mi.sthbackend.exeptions.*;
import hdm.mi.sthbackend.dto.TeamDTO;
+import hdm.mi.sthbackend.dto.TournamentDTO;
+import hdm.mi.sthbackend.exeptions.*;
import hdm.mi.sthbackend.model.Player;
import hdm.mi.sthbackend.model.Team;
-import hdm.mi.sthbackend.model.Tournament;
import hdm.mi.sthbackend.service.TournamentService;
+import hdm.mi.sthbackend.types.TeamName;
+import hdm.mi.sthbackend.types.TournamentName;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -43,9 +45,9 @@ public class TournamentController {
}
@PostMapping("/tournaments/{tournamentId}/teams")
- public Team createTeam(@PathVariable UUID tournamentId,
- @RequestBody String teamName) throws TournamentIdNotFoundException {
- return service.createAndAddTeamToTournament(tournamentId, teamName);
+ public TeamDTO createTeam(@PathVariable UUID tournamentId,
+ @RequestBody TeamName teamName) throws TournamentIdNotFoundException {
+ return service.createAndAddTeamToTournament(tournamentId, teamName.getName());
}
@DeleteMapping("/tournaments/{tournamentId}/teams/{teamId}")
@@ -55,7 +57,7 @@ public class TournamentController {
}
@PostMapping("/teams/{teamId}/addPlayer")
- public Player addPlayerToTeam(@PathVariable UUID teamId,
+ public PlayerDTO addPlayerToTeam(@PathVariable UUID teamId,
@RequestBody String playerName) throws Exception {
return service.addPlayerToTeam(teamId, playerName);
}
@@ -65,19 +67,26 @@ public class TournamentController {
@PathVariable UUID playerId) throws PlayerIdNotFoundException, TeamIdNotFoundException {
return service.removePlayerFromTeam(teamId, playerId);
}
- @PatchMapping("/tournaments/{tournamentId}/match/{matchId}")
- public UUID determineWinner(@PathVariable UUID tournamentId,
- @PathVariable UUID matchId) throws TournamentIdNotFoundException, MatchIdNotFoundException, WinnerNotDeterminedException {
- return service.determineWinner(tournamentId, matchId);
+
+ @PatchMapping("/match/{matchId}/determineWinner")
+ public UUID determineWinner(@PathVariable UUID matchId) throws MatchIdNotFoundException, WinnerNotDeterminedException {
+ return service.determineWinner(matchId);
}
/**
* Tournament Endpoints
*/
+ @GetMapping("/tournaments/{tournamentId}")
+ public TournamentDTO findTournamentById(@PathVariable UUID tournamentId) throws TournamentIdNotFoundException {
+ return service.getTournament(tournamentId);
+ }
+
@PostMapping("/tournaments")
- public Tournament createTournament(@RequestBody String tournamentName) {
- return service.createTournament(tournamentName);
+ public TournamentDTO createTournament(@RequestBody TournamentName params) {
+ return service.createTournament(params.getName());
}
+
+
}
--
GitLab