From 8ff0f8f6b90727967a8818ca40920fa6652521ca Mon Sep 17 00:00:00 2001 From: motzik Date: Wed, 26 Jun 2024 23:48:07 +0200 Subject: [PATCH] chore(#177): prevent team registration when tournament is already started --- .../backend/service/impl/TournamentTeamServiceImpl.java | 2 +- .../tournament/team-signup/team-signup.component.html | 3 +++ .../components/tournament/team-signup/team-signup.component.ts | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/at/ac/tuwien/sepr/groupphase/backend/service/impl/TournamentTeamServiceImpl.java b/backend/src/main/java/at/ac/tuwien/sepr/groupphase/backend/service/impl/TournamentTeamServiceImpl.java index f6d47ea..423a9f7 100644 --- a/backend/src/main/java/at/ac/tuwien/sepr/groupphase/backend/service/impl/TournamentTeamServiceImpl.java +++ b/backend/src/main/java/at/ac/tuwien/sepr/groupphase/backend/service/impl/TournamentTeamServiceImpl.java @@ -62,7 +62,7 @@ public class TournamentTeamServiceImpl implements TournamentTeamService { throw new BadTournamentPublicAccessTokenException(); } - if (tournament.getRegistrationEnd().isBefore(BeerDateTime.nowUtc())) { + if (tournament.getRegistrationEnd().isBefore(BeerDateTime.nowUtc()) || !tournament.getQualificationMatches().isEmpty()) { return SignupTeamResult.REGISTRATION_CLOSED; } diff --git a/frontend/src/app/components/tournament/team-signup/team-signup.component.html b/frontend/src/app/components/tournament/team-signup/team-signup.component.html index 67f8341..44f46fc 100644 --- a/frontend/src/app/components/tournament/team-signup/team-signup.component.html +++ b/frontend/src/app/components/tournament/team-signup/team-signup.component.html @@ -33,6 +33,9 @@ @if (nameFormControl.errors?.maxParticipantsReached) { No more spots left! } + @if (nameFormControl.errors?.registrationClosed) { + Registration is closed! + } diff --git a/frontend/src/app/components/tournament/team-signup/team-signup.component.ts b/frontend/src/app/components/tournament/team-signup/team-signup.component.ts index 0f0afe2..72d3feb 100644 --- a/frontend/src/app/components/tournament/team-signup/team-signup.component.ts +++ b/frontend/src/app/components/tournament/team-signup/team-signup.component.ts @@ -80,6 +80,9 @@ export class TeamSignupComponent { case TournamentSignupTeamResponseDto.SignupTeamResultEnum.MaxParticipantsReached: this.nameFormControl.setErrors({ maxParticipantsReached: true }); return of(); + case TournamentSignupTeamResponseDto.SignupTeamResultEnum.RegistrationClosed: + this.nameFormControl.setErrors({ registrationClosed: true }); + return of(); default: return []; }