diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java similarity index 80% rename from api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java rename to api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java index dee6016d8904f4036b45d74f1a61bed50013e22d..b240dd9b60a77be0bf50bef9ca3e1b2dee737819 100644 --- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerVeteranDTO.java +++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/dto/PlayerTransferDTO.java @@ -3,10 +3,9 @@ package cz.muni.fi.pa165.icehockeymanager.dto; import lombok.Getter; import lombok.Setter; -import javax.validation.constraints.NotBlank; import java.util.Objects; -public final class PlayerVeteranDTO { +public final class PlayerTransferDTO { @Getter @Setter @@ -20,7 +19,7 @@ public final class PlayerVeteranDTO { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - PlayerVeteranDTO playerDTO = (PlayerVeteranDTO) o; + PlayerTransferDTO playerDTO = (PlayerTransferDTO) o; return getPlayerId() == playerDTO.getPlayerId() && getTeamId() == playerDTO.getTeamId(); } diff --git a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java index 4e097ea1c85fd0ad9991eb4df36976fdfd24f920..ecee8f228a2d54db0b032b2b41a9709943a545ca 100644 --- a/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java +++ b/api/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacade.java @@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; -import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO; +import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; @@ -24,9 +24,9 @@ public interface TeamManagerFacade { /** * Adds player with playerId to team with teamId * - * @param playerVeteranDTO DTO for recruiting veteran player + * @param playerTransferDTO DTO for recruiting veteran player */ - void recruitPlayer(PlayerVeteranDTO playerVeteranDTO); + void recruitPlayer(PlayerTransferDTO playerTransferDTO); /** * Retrieve all players without team diff --git a/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java b/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java index c5822c093e909410c5c4cb6811ab64b2fc9f6db1..023b25831b0f6cf5e626725d374df872c0b4dd5c 100644 --- a/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java +++ b/rest/src/main/java/cz/muni/fi/pa165/icehockeymanager/rest/controller/IceHockeyManagerApi.java @@ -52,8 +52,8 @@ public class IceHockeyManagerApi { teamManagerFacade.recruitNewPlayer(player); } - @PostMapping("/player/recruitVeteran") - public final void recruitVeteranPlayer(@Valid @RequestBody PlayerVeteranDTO player) { + @PostMapping("/player/transferPlayer") + public final void recruitPlayer(@Valid @RequestBody PlayerTransferDTO player) { teamManagerFacade.recruitPlayer(player); } diff --git a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java index db70988420038dcc498a267ecb4e900228e03dad..c7f78738ca883ddbb95f7b7fb59a9fffb97f2ac2 100644 --- a/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java +++ b/service/src/main/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImpl.java @@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; -import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO; +import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; import cz.muni.fi.pa165.icehockeymanager.model.Player; @@ -42,7 +42,7 @@ public class TeamManagerFacadeImpl implements TeamManagerFacade{ } @Override - public void recruitPlayer(PlayerVeteranDTO playerDto){ + public void recruitPlayer(PlayerTransferDTO playerDto){ Team team = teamService.findTeam(playerDto.getTeamId()).orElseThrow( () -> new UnknownTeamException("Team not found") ); diff --git a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java index 2257b963be17762edbd9cfa243e896afc7a5a3ae..705a43bc71f03ea95afc07e11330642fad50ebfb 100644 --- a/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java +++ b/service/src/test/java/cz/muni/fi/pa165/icehockeymanager/facades/TeamManagerFacadeImplTest.java @@ -3,7 +3,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; import cz.muni.fi.pa165.icehockeymanager.config.PersistanceApplicationConfig; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; -import cz.muni.fi.pa165.icehockeymanager.dto.PlayerVeteranDTO; +import cz.muni.fi.pa165.icehockeymanager.dto.PlayerTransferDTO; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownPlayerException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; import cz.muni.fi.pa165.icehockeymanager.model.Player; @@ -104,7 +104,7 @@ public class TeamManagerFacadeImplTest { @Test public void recruitVeteranPlayerNonexistentTeam() { when(teamService.findTeam(1L)).thenReturn(Optional.empty()); - PlayerVeteranDTO player = new PlayerVeteranDTO(); + PlayerTransferDTO player = new PlayerTransferDTO(); player.setPlayerId(1L); player.setTeamId(1L); assertThatExceptionOfType(UnknownTeamException.class).isThrownBy( @@ -116,7 +116,7 @@ public class TeamManagerFacadeImplTest { @Test public void recruitVeteranPlayerNonexistentPlayer() { Team team = buildTeamMock(1L, "Boston Bruins"); - PlayerVeteranDTO player = new PlayerVeteranDTO(); + PlayerTransferDTO player = new PlayerTransferDTO(); player.setPlayerId(1L); player.setTeamId(1L); when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team));