defined all players endpoint in oas, implemented method to get all players filtered and paginated (not done)
This commit is contained in:
parent
601d814b97
commit
b22ffd0cfa
4 changed files with 96 additions and 1 deletions
api
src/main/java/de/towerdefence/server
32
api/api.yml
32
api/api.yml
|
@ -58,6 +58,17 @@ components:
|
||||||
type: string
|
type: string
|
||||||
required:
|
required:
|
||||||
- username
|
- username
|
||||||
|
#############################################
|
||||||
|
# PlayerApiModel #
|
||||||
|
#############################################
|
||||||
|
PlayerApiModel:
|
||||||
|
description: a Player
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
name:
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- name
|
||||||
responses:
|
responses:
|
||||||
201PlayerCreated:
|
201PlayerCreated:
|
||||||
description: "201 - Player Created"
|
description: "201 - Player Created"
|
||||||
|
@ -148,3 +159,24 @@ paths:
|
||||||
$ref: "#/components/responses/500InternalError"
|
$ref: "#/components/responses/500InternalError"
|
||||||
503:
|
503:
|
||||||
$ref: "#/components/responses/503ServiceUnavailable"
|
$ref: "#/components/responses/503ServiceUnavailable"
|
||||||
|
/admin/players:
|
||||||
|
get:
|
||||||
|
operationId: "GetAllPlayers"
|
||||||
|
tags:
|
||||||
|
- admin
|
||||||
|
description: 'Endpoint for getting all players'
|
||||||
|
responses:
|
||||||
|
200:
|
||||||
|
description: "A List of all Player"
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: "#/components/schemas/PlayerApiModel"
|
||||||
|
401:
|
||||||
|
$ref: "#/components/responses/401Unauthorized"
|
||||||
|
500:
|
||||||
|
$ref: "#/components/responses/500InternalError"
|
||||||
|
503:
|
||||||
|
$ref: "#/components/responses/503ServiceUnavailable"
|
|
@ -1,16 +1,26 @@
|
||||||
package de.towerdefence.server.admin;
|
package de.towerdefence.server.admin;
|
||||||
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
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.PlayerApiModel;
|
||||||
|
import de.towerdefence.server.player.Player;
|
||||||
|
import de.towerdefence.server.player.PlayerRepository;
|
||||||
|
import de.towerdefence.server.utils.PlayerMapperService;
|
||||||
import jakarta.servlet.http.HttpServletRequest;
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
|
@ -20,6 +30,13 @@ public class AdminApiController implements AdminApi {
|
||||||
@Autowired
|
@Autowired
|
||||||
UserSession userSession;
|
UserSession userSession;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
PlayerRepository playerRepository;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
PlayerMapperService playerMapperService;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<ObjectMapper> getObjectMapper() {
|
public Optional<ObjectMapper> getObjectMapper() {
|
||||||
return Optional.empty();
|
return Optional.empty();
|
||||||
|
@ -36,4 +53,26 @@ public class AdminApiController implements AdminApi {
|
||||||
authInfo.setUsername(this.userSession.getUsername());
|
authInfo.setUsername(this.userSession.getUsername());
|
||||||
return ResponseEntity.ok(authInfo);
|
return ResponseEntity.ok(authInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/admin/players")
|
||||||
|
public ResponseEntity<List<PlayerApiModel>> getAllPlayers(
|
||||||
|
@RequestParam(value = "page", required = false, defaultValue = "0") int page,
|
||||||
|
@RequestParam(value = "pageSize", required = false, defaultValue = "10") int pageSize,
|
||||||
|
@RequestParam(value = "sortBy", required = false, defaultValue = "name") String sortBy,
|
||||||
|
@RequestParam(value = "order", required = false, defaultValue = "asc") String order,
|
||||||
|
@RequestParam(value = "name", required = false) String name) {
|
||||||
|
|
||||||
|
Sort.Direction direction = order.equalsIgnoreCase("desc") ? Sort.Direction.DESC : Sort.Direction.ASC;
|
||||||
|
Pageable pageable = PageRequest.of(page, pageSize, Sort.by(direction, sortBy));
|
||||||
|
|
||||||
|
Page<Player> playerPage = (name != null && !name.trim().isEmpty())
|
||||||
|
? playerRepository.findByNameContainingIgnoreCase(name, pageable)
|
||||||
|
: playerRepository.findAll(pageable);
|
||||||
|
|
||||||
|
List<PlayerApiModel> playersMapped = playerMapperService.mapPlayerToApiPlayers(playerPage.getContent());
|
||||||
|
|
||||||
|
return playersMapped.isEmpty() ? ResponseEntity.noContent().build() : ResponseEntity.ok(playersMapped);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
package de.towerdefence.server.player;
|
package de.towerdefence.server.player;
|
||||||
|
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
public interface PlayerRepository extends JpaRepository<Player, Long> {
|
public interface PlayerRepository extends JpaRepository<Player, Long> {
|
||||||
Player findByUsername(String username);
|
Player findByUsername(String username);
|
||||||
boolean existsByUsername(String username);
|
boolean existsByUsername(String username);
|
||||||
|
Page<Player> findByNameContainingIgnoreCase(String name, Pageable pageable);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
package de.towerdefence.server.utils;
|
||||||
|
|
||||||
|
import de.towerdefence.server.oas.models.PlayerApiModel;
|
||||||
|
import de.towerdefence.server.player.Player;
|
||||||
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Component
|
||||||
|
public class PlayerMapperService {
|
||||||
|
|
||||||
|
public List<PlayerApiModel> mapPlayerToApiPlayers(List<Player> players) {
|
||||||
|
List<PlayerApiModel> apiPlayers = new ArrayList<>();
|
||||||
|
for (Player player : players) {
|
||||||
|
PlayerApiModel apiPlayer = new PlayerApiModel();
|
||||||
|
apiPlayer.setName(player.getUsername());
|
||||||
|
}
|
||||||
|
return apiPlayers;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue