From e75a5e1b663d66f776fae5faa4a712bb2a26d7ae Mon Sep 17 00:00:00 2001 From: Michel ten Voorde Date: Tue, 5 Nov 2024 16:10:37 +0100 Subject: [PATCH] Reopen group --- Jenkinsfile | 2 +- .../connectedit/swiss/controller/TournamentController.java | 7 +++++++ .../connectedit/swiss/service/TournamentPlayService.java | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10205a7..5000e8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { } } - stage('Push the Docker Image to DockerHUb') { + stage('Push the Docker Image to DockerHub') { steps { script { withCredentials([string(credentialsId: 'c7783e4f-2f79-482f-885f-dfb39f8c02d3', variable: 'docker_hub')]) { diff --git a/src/main/java/nl/connectedit/swiss/controller/TournamentController.java b/src/main/java/nl/connectedit/swiss/controller/TournamentController.java index df17f87..e3cdbd5 100755 --- a/src/main/java/nl/connectedit/swiss/controller/TournamentController.java +++ b/src/main/java/nl/connectedit/swiss/controller/TournamentController.java @@ -141,6 +141,13 @@ public class TournamentController { return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.finishGroup(tournament, groupId))); } + @PostMapping("/tournaments/{tournamentId}/groups/{groupId}/reopen") + public ResponseEntity reopenGroup(@PathVariable Long tournamentId, @PathVariable Long groupId) { + var tournament = tournamentService.findTournamentById(tournamentId); + + return ResponseEntity.ok(tournamentMapper.toDto(tournamentPlayService.reopenGroup(tournament, groupId))); + } + @PostMapping("/tournaments/{tournamentId}/groups/{groupId}/new") public ResponseEntity newRound(@PathVariable Long tournamentId, @PathVariable Long groupId) { var tournament = tournamentService.findTournamentById(tournamentId); diff --git a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java index 0a26f8e..ade2a14 100644 --- a/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java +++ b/src/main/java/nl/connectedit/swiss/service/TournamentPlayService.java @@ -47,6 +47,12 @@ public class TournamentPlayService { return tournament; } + public Tournament reopenGroup(Tournament tournament, Long groupId) { + getGroup(tournament, groupId).setStatus(Status.IN_PROGRESS); + tournamentRepository.save(tournament); + return tournament; + } + public Tournament newRound(Tournament tournament, Long groupId) { var group = getGroup(tournament, groupId);