diff --git a/api/api.yml b/api/api.yml index 15aa501..29a8d7d 100644 --- a/api/api.yml +++ b/api/api.yml @@ -59,9 +59,9 @@ components: required: - username ############################################# - # PlayerApiModel # + # AdministratablePlayer # ############################################# - PlayerApiModel: + AdministratablePlayer: description: a Player type: object properties: @@ -205,7 +205,7 @@ paths: schema: type: array items: - $ref: "#/components/schemas/PlayerApiModel" + $ref: "#/components/schemas/AdministratablePlayer" 401: $ref: "#/components/responses/401Unauthorized" 500: diff --git a/src/main/java/de/towerdefence/server/admin/AdminApiController.java b/src/main/java/de/towerdefence/server/admin/AdminApiController.java index 35c2c25..826f8a3 100644 --- a/src/main/java/de/towerdefence/server/admin/AdminApiController.java +++ b/src/main/java/de/towerdefence/server/admin/AdminApiController.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import de.towerdefence.server.auth.UserSession; import de.towerdefence.server.oas.AdminApi; import de.towerdefence.server.oas.models.AdminAuthInfo; +import de.towerdefence.server.oas.models.AdministratablePlayer; import de.towerdefence.server.oas.models.GetAllPlayersConfigurationData; -import de.towerdefence.server.oas.models.PlayerApiModel; import de.towerdefence.server.player.Player; import de.towerdefence.server.player.PlayerRepository; import de.towerdefence.server.utils.PlayerMapperService; @@ -54,7 +54,7 @@ public class AdminApiController implements AdminApi { } @Override - public ResponseEntity> getAllPlayers(GetAllPlayersConfigurationData body) { + public ResponseEntity> getAllPlayers(GetAllPlayersConfigurationData body) { var order = body.getOrder(); var page = body.getPage(); @@ -65,7 +65,14 @@ public class AdminApiController implements AdminApi { if (order == null) { order = GetAllPlayersConfigurationData.OrderEnum.DESCENDING; } - Sort.Direction direction = order == GetAllPlayersConfigurationData.OrderEnum.ASCENDING ? Sort.Direction.ASC : Sort.Direction.DESC; + Sort.Direction direction; + + if (order == GetAllPlayersConfigurationData.OrderEnum.ASCENDING) { + direction = Sort.Direction.ASC; + } else { + direction = Sort.Direction.DESC; + } + Pageable pageable = PageRequest.of(page, pageSize, Sort.by(direction, sortBy)); Page playerPage; @@ -76,8 +83,13 @@ public class AdminApiController implements AdminApi { playerPage = playerRepository.findAll(pageable); } - List playersMapped = playerMapperService.mapPlayerToApiPlayers(playerPage.getContent()); + List playersMapped = + playerMapperService.mapPlayersToAdministratablePlayers(playerPage.getContent()); - return playersMapped.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(playersMapped); + if (playersMapped.isEmpty()) { + return ResponseEntity.noContent().build(); + } else { + return ResponseEntity.ok(playersMapped); + } } } diff --git a/src/main/java/de/towerdefence/server/utils/PlayerMapperService.java b/src/main/java/de/towerdefence/server/utils/PlayerMapperService.java index da02c2c..9d01960 100644 --- a/src/main/java/de/towerdefence/server/utils/PlayerMapperService.java +++ b/src/main/java/de/towerdefence/server/utils/PlayerMapperService.java @@ -1,6 +1,6 @@ package de.towerdefence.server.utils; -import de.towerdefence.server.oas.models.PlayerApiModel; +import de.towerdefence.server.oas.models.AdministratablePlayer; import de.towerdefence.server.player.Player; import org.springframework.stereotype.Component; @@ -10,13 +10,19 @@ import java.util.List; @Component public class PlayerMapperService { - public List mapPlayerToApiPlayers(List players) { - List apiPlayers = new ArrayList<>(); + public List mapPlayersToAdministratablePlayers(List players) { + List apiPlayers = new ArrayList<>(); for (Player player : players) { - PlayerApiModel apiPlayer = new PlayerApiModel(); + AdministratablePlayer apiPlayer = new AdministratablePlayer(); apiPlayer.setUsername(player.getUsername()); apiPlayers.add(apiPlayer); } return apiPlayers; } + + public AdministratablePlayer mapPlayerToAdministratablePlayer(Player player) { + AdministratablePlayer apiPlayer = new AdministratablePlayer(); + apiPlayer.setUsername(player.getUsername()); + return apiPlayer; + } } diff --git a/src/test/java/de/towerdefence/server/IntegrationTest.java b/src/test/java/de/towerdefence/server/IntegrationTest.java index 75a7042..5fba1d5 100644 --- a/src/test/java/de/towerdefence/server/IntegrationTest.java +++ b/src/test/java/de/towerdefence/server/IntegrationTest.java @@ -13,6 +13,8 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; @SpringBootTest @AutoConfigureMockMvc(addFilters = false) @@ -34,23 +36,20 @@ public abstract class IntegrationTest { void setUp() { playerRepository.deleteAll(); - Player player1 = new Player(); - player1.setUsername("Alex"); - try { - playerService.setPassword(player1, "1234"); - } catch (NoSuchAlgorithmException e) {return;} + Map players = new HashMap<>(); + players.put("Alex", "1234"); + players.put("Zorro", "1234"); - this.playerRepository.save(player1); - - Player player2 = new Player(); - player2.setUsername("Zorro"); - try { - playerService.setPassword(player2, "1234"); - } catch (NoSuchAlgorithmException e) {return;} - - this.playerRepository.save(player2); - - System.out.println("LISTE: " + playerRepository.findAll()); + players.forEach((username, password) -> { + Player player = new Player(); + player.setUsername(username); + try { + playerService.setPassword(player, password); + playerRepository.save(player); + } catch (NoSuchAlgorithmException e) { + System.err.println("Error setting password for player: " + username); + } + }); } @AfterEach @@ -58,5 +57,5 @@ public abstract class IntegrationTest { playerRepository.deleteAll(); } - } +} diff --git a/src/test/java/de/towerdefence/server/server/GetAllPlayersPaginatedAndSortedTest.java b/src/test/java/de/towerdefence/server/server/GetAllPlayersTest.java similarity index 97% rename from src/test/java/de/towerdefence/server/server/GetAllPlayersPaginatedAndSortedTest.java rename to src/test/java/de/towerdefence/server/server/GetAllPlayersTest.java index 918d75d..69aa942 100644 --- a/src/test/java/de/towerdefence/server/server/GetAllPlayersPaginatedAndSortedTest.java +++ b/src/test/java/de/towerdefence/server/server/GetAllPlayersTest.java @@ -9,7 +9,7 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -class GetAllPlayersPaginatedAndSortedTest extends IntegrationTest { +class GetAllPlayersTest extends IntegrationTest { private MockHttpServletRequestBuilder createGetAllPlayersRequest(String requestBody) { return MockMvcRequestBuilders.get(baseUri + "/admin/players") @@ -80,4 +80,4 @@ class GetAllPlayersPaginatedAndSortedTest extends IntegrationTest { .andExpect(jsonPath("$[0].username").value("Alex")) .andExpect(jsonPath("$").isNotEmpty()); } -} \ No newline at end of file +}