Skip to content
Snippets Groups Projects
Commit d5a05d12 authored by Erik Moravec's avatar Erik Moravec Committed by Ján Dovjak
Browse files

refactor: Rest API methods name changes

parent d958eb5f
No related branches found
No related tags found
No related merge requests found
...@@ -3,10 +3,9 @@ package cz.muni.fi.pa165.icehockeymanager.dto; ...@@ -3,10 +3,9 @@ package cz.muni.fi.pa165.icehockeymanager.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import javax.validation.constraints.NotBlank;
import java.util.Objects; import java.util.Objects;
public final class PlayerVeteranDTO { public final class PlayerTransferDTO {
@Getter @Getter
@Setter @Setter
...@@ -20,7 +19,7 @@ public final class PlayerVeteranDTO { ...@@ -20,7 +19,7 @@ public final class PlayerVeteranDTO {
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
PlayerVeteranDTO playerDTO = (PlayerVeteranDTO) o; PlayerTransferDTO playerDTO = (PlayerTransferDTO) o;
return getPlayerId() == playerDTO.getPlayerId() && getTeamId() == playerDTO.getTeamId(); return getPlayerId() == playerDTO.getPlayerId() && getTeamId() == playerDTO.getTeamId();
} }
......
...@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; ...@@ -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.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; 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.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
...@@ -24,9 +24,9 @@ public interface TeamManagerFacade { ...@@ -24,9 +24,9 @@ public interface TeamManagerFacade {
/** /**
* Adds player with playerId to team with teamId * 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 * Retrieve all players without team
......
...@@ -52,8 +52,8 @@ public class IceHockeyManagerApi { ...@@ -52,8 +52,8 @@ public class IceHockeyManagerApi {
teamManagerFacade.recruitNewPlayer(player); teamManagerFacade.recruitNewPlayer(player);
} }
@PostMapping("/player/recruitVeteran") @PostMapping("/player/transferPlayer")
public final void recruitVeteranPlayer(@Valid @RequestBody PlayerVeteranDTO player) { public final void recruitPlayer(@Valid @RequestBody PlayerTransferDTO player) {
teamManagerFacade.recruitPlayer(player); teamManagerFacade.recruitPlayer(player);
} }
......
...@@ -2,7 +2,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; ...@@ -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.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; 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.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Player; import cz.muni.fi.pa165.icehockeymanager.model.Player;
...@@ -42,7 +42,7 @@ public class TeamManagerFacadeImpl implements TeamManagerFacade{ ...@@ -42,7 +42,7 @@ public class TeamManagerFacadeImpl implements TeamManagerFacade{
} }
@Override @Override
public void recruitPlayer(PlayerVeteranDTO playerDto){ public void recruitPlayer(PlayerTransferDTO playerDto){
Team team = teamService.findTeam(playerDto.getTeamId()).orElseThrow( Team team = teamService.findTeam(playerDto.getTeamId()).orElseThrow(
() -> new UnknownTeamException("Team not found") () -> new UnknownTeamException("Team not found")
); );
......
...@@ -3,7 +3,7 @@ package cz.muni.fi.pa165.icehockeymanager.facades; ...@@ -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.config.PersistanceApplicationConfig;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO; import cz.muni.fi.pa165.icehockeymanager.dto.PlayerCreateDTO;
import cz.muni.fi.pa165.icehockeymanager.dto.PlayerDTO; 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.UnknownPlayerException;
import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException; import cz.muni.fi.pa165.icehockeymanager.exceptions.UnknownTeamException;
import cz.muni.fi.pa165.icehockeymanager.model.Player; import cz.muni.fi.pa165.icehockeymanager.model.Player;
...@@ -104,7 +104,7 @@ public class TeamManagerFacadeImplTest { ...@@ -104,7 +104,7 @@ public class TeamManagerFacadeImplTest {
@Test @Test
public void recruitVeteranPlayerNonexistentTeam() { public void recruitVeteranPlayerNonexistentTeam() {
when(teamService.findTeam(1L)).thenReturn(Optional.empty()); when(teamService.findTeam(1L)).thenReturn(Optional.empty());
PlayerVeteranDTO player = new PlayerVeteranDTO(); PlayerTransferDTO player = new PlayerTransferDTO();
player.setPlayerId(1L); player.setPlayerId(1L);
player.setTeamId(1L); player.setTeamId(1L);
assertThatExceptionOfType(UnknownTeamException.class).isThrownBy( assertThatExceptionOfType(UnknownTeamException.class).isThrownBy(
...@@ -116,7 +116,7 @@ public class TeamManagerFacadeImplTest { ...@@ -116,7 +116,7 @@ public class TeamManagerFacadeImplTest {
@Test @Test
public void recruitVeteranPlayerNonexistentPlayer() { public void recruitVeteranPlayerNonexistentPlayer() {
Team team = buildTeamMock(1L, "Boston Bruins"); Team team = buildTeamMock(1L, "Boston Bruins");
PlayerVeteranDTO player = new PlayerVeteranDTO(); PlayerTransferDTO player = new PlayerTransferDTO();
player.setPlayerId(1L); player.setPlayerId(1L);
player.setTeamId(1L); player.setTeamId(1L);
when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team)); when(teamService.findTeam(1L)).thenReturn(Optional.ofNullable(team));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment