TD-34: Solved comments made by reviewer
Some checks failed
Quality Check / Validate OAS (pull_request) Successful in 34s
Quality Check / Validate OAS (push) Successful in 38s
Quality Check / Linting (push) Failing after 1m6s
Quality Check / Testing (push) Successful in 1m18s
Quality Check / Static Analysis (push) Successful in 1m27s
Quality Check / Linting (pull_request) Failing after 1m19s
Quality Check / Static Analysis (pull_request) Successful in 1m19s
Quality Check / Testing (pull_request) Successful in 57s
Some checks failed
Quality Check / Validate OAS (pull_request) Successful in 34s
Quality Check / Validate OAS (push) Successful in 38s
Quality Check / Linting (push) Failing after 1m6s
Quality Check / Testing (push) Successful in 1m18s
Quality Check / Static Analysis (push) Successful in 1m27s
Quality Check / Linting (pull_request) Failing after 1m19s
Quality Check / Static Analysis (pull_request) Successful in 1m19s
Quality Check / Testing (pull_request) Successful in 57s
This commit is contained in:
parent
2ccc9f14c5
commit
e388bb0020
4 changed files with 104 additions and 11 deletions
|
@ -59,9 +59,9 @@ components:
|
||||||
required:
|
required:
|
||||||
- username
|
- username
|
||||||
#############################################
|
#############################################
|
||||||
# PlayerApiModel #
|
# AdministratablePlayer #
|
||||||
#############################################
|
#############################################
|
||||||
PlayerApiModel:
|
AdministratablePlayer:
|
||||||
description: a Player
|
description: a Player
|
||||||
type: object
|
type: object
|
||||||
properties:
|
properties:
|
||||||
|
@ -205,7 +205,7 @@ paths:
|
||||||
schema:
|
schema:
|
||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
$ref: "#/components/schemas/PlayerApiModel"
|
$ref: "#/components/schemas/AdministratablePlayer"
|
||||||
401:
|
401:
|
||||||
$ref: "#/components/responses/401Unauthorized"
|
$ref: "#/components/responses/401Unauthorized"
|
||||||
500:
|
500:
|
||||||
|
|
|
@ -4,8 +4,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import de.towerdefence.server.auth.UserSession;
|
import de.towerdefence.server.auth.UserSession;
|
||||||
import de.towerdefence.server.oas.AdminApi;
|
import de.towerdefence.server.oas.AdminApi;
|
||||||
import de.towerdefence.server.oas.models.AdminAuthInfo;
|
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.GetAllPlayersConfigurationData;
|
||||||
import de.towerdefence.server.oas.models.PlayerApiModel;
|
|
||||||
import de.towerdefence.server.player.Player;
|
import de.towerdefence.server.player.Player;
|
||||||
import de.towerdefence.server.player.PlayerRepository;
|
import de.towerdefence.server.player.PlayerRepository;
|
||||||
import de.towerdefence.server.utils.PlayerMapperService;
|
import de.towerdefence.server.utils.PlayerMapperService;
|
||||||
|
@ -54,7 +54,7 @@ public class AdminApiController implements AdminApi {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ResponseEntity<List<PlayerApiModel>> getAllPlayers(GetAllPlayersConfigurationData body) {
|
public ResponseEntity<List<AdministratablePlayer>> getAllPlayers(GetAllPlayersConfigurationData body) {
|
||||||
|
|
||||||
var order = body.getOrder();
|
var order = body.getOrder();
|
||||||
var page = body.getPage();
|
var page = body.getPage();
|
||||||
|
@ -76,8 +76,12 @@ public class AdminApiController implements AdminApi {
|
||||||
playerPage = playerRepository.findAll(pageable);
|
playerPage = playerRepository.findAll(pageable);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<PlayerApiModel> playersMapped = playerMapperService.mapPlayerToApiPlayers(playerPage.getContent());
|
List<AdministratablePlayer> 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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package de.towerdefence.server.utils;
|
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 de.towerdefence.server.player.Player;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
@ -10,13 +10,19 @@ import java.util.List;
|
||||||
@Component
|
@Component
|
||||||
public class PlayerMapperService {
|
public class PlayerMapperService {
|
||||||
|
|
||||||
public List<PlayerApiModel> mapPlayerToApiPlayers(List<Player> players) {
|
public List<AdministratablePlayer> mapPlayersToAdministratablePlayers(List<Player> players) {
|
||||||
List<PlayerApiModel> apiPlayers = new ArrayList<>();
|
List<AdministratablePlayer> apiPlayers = new ArrayList<>();
|
||||||
for (Player player : players) {
|
for (Player player : players) {
|
||||||
PlayerApiModel apiPlayer = new PlayerApiModel();
|
AdministratablePlayer apiPlayer = new AdministratablePlayer();
|
||||||
apiPlayer.setUsername(player.getUsername());
|
apiPlayer.setUsername(player.getUsername());
|
||||||
apiPlayers.add(apiPlayer);
|
apiPlayers.add(apiPlayer);
|
||||||
}
|
}
|
||||||
return apiPlayers;
|
return apiPlayers;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public AdministratablePlayer mapPlayerToAdministratablePlayer(Player player) {
|
||||||
|
AdministratablePlayer apiPlayer = new AdministratablePlayer();
|
||||||
|
apiPlayer.setUsername(player.getUsername());
|
||||||
|
return apiPlayer;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,83 @@
|
||||||
|
package de.towerdefence.server.server;
|
||||||
|
|
||||||
|
import de.towerdefence.server.IntegrationTest;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import org.springframework.http.MediaType;
|
||||||
|
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
|
||||||
|
import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
|
||||||
|
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||||
|
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
|
||||||
|
|
||||||
|
class GetAllPlayersTest extends IntegrationTest {
|
||||||
|
|
||||||
|
private MockHttpServletRequestBuilder createGetAllPlayersRequest(String requestBody) {
|
||||||
|
return MockMvcRequestBuilders.get(baseUri + "/admin/players")
|
||||||
|
.contentType(MediaType.APPLICATION_JSON)
|
||||||
|
.content(requestBody);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void playersExist() throws Exception {
|
||||||
|
String requestBody = "{" +
|
||||||
|
"\"page\": 0," +
|
||||||
|
"\"pageSize\": 10," +
|
||||||
|
"\"sortBy\": \"username\"," +
|
||||||
|
"\"order\": \"descending\"," +
|
||||||
|
"\"username\": \"\"" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
this.mvc.perform(createGetAllPlayersRequest(requestBody))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$").isArray())
|
||||||
|
.andExpect(jsonPath("$[0]").exists());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void playersSortedByAsc() throws Exception {
|
||||||
|
String requestBody = "{" +
|
||||||
|
"\"page\": 0," +
|
||||||
|
"\"pageSize\": 10," +
|
||||||
|
"\"sortBy\": \"username\"," +
|
||||||
|
"\"order\": \"ascending\"," +
|
||||||
|
"\"username\": \"\"" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
this.mvc.perform(createGetAllPlayersRequest(requestBody))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$[0].username").value("Alex"))
|
||||||
|
.andExpect(jsonPath("$[1].username").value("Zorro"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void playersSortedByDesc() throws Exception {
|
||||||
|
String requestBody = "{" +
|
||||||
|
"\"page\": 0," +
|
||||||
|
"\"pageSize\": 10," +
|
||||||
|
"\"sortBy\": \"username\"," +
|
||||||
|
"\"order\": \"descending\"," +
|
||||||
|
"\"username\": \"\"" +
|
||||||
|
"}";
|
||||||
|
|
||||||
|
this.mvc.perform(createGetAllPlayersRequest(requestBody))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$[1].username").value("Alex"))
|
||||||
|
.andExpect(jsonPath("$[0].username").value("Zorro"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void playersFiltered() throws Exception {
|
||||||
|
String requestBody = "{" +
|
||||||
|
"\"page\": 0," +
|
||||||
|
"\"pageSize\": 10," +
|
||||||
|
"\"username\": \"Alex\","+
|
||||||
|
"\"order\": \"ascending\""+
|
||||||
|
"}";
|
||||||
|
|
||||||
|
this.mvc.perform(createGetAllPlayersRequest(requestBody))
|
||||||
|
.andExpect(status().isOk())
|
||||||
|
.andExpect(jsonPath("$").isArray())
|
||||||
|
.andExpect(jsonPath("$[0].username").value("Alex"))
|
||||||
|
.andExpect(jsonPath("$").isNotEmpty());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue