TD-18: Match Creation

api/api.yml

@@ -7,7 +7,7 @@ servers:
   - url: /api/v1
   - url: http://localhost:8080/api/v1
 security:
-  - JWTAuth: [ ]
+  - JWTAuth: []
 
 components:
   securitySchemes:
@@ -86,44 +86,6 @@ components:
            type: string
       required:
         - username
-    #############################################
-    #  AdministratablePlayer                                   #
-    #############################################
-    AdministratablePlayer:
-      description: a Player
-      type: object
-      properties:
-        username:
-          type: string
-      required:
-        - username
-    #############################################
-    #  PlayerFilter                             #
-    #############################################
-    PlayerFilter:
-      description: Configuration data for query for the getting all players endpoint
-      type: object
-      properties:
-        page:
-          type: integer
-          description: "Page number (zero-based index)."
-        pageSize:
-          type: integer
-          description: "Number of players per page."
-        sortBy:
-          type: string
-          description: "Field to sort by (default is username)."
-        order:
-          type: string
-          enum: [ ascending, descending ]
-          description: "Sorting order (asc or desc)."
-        username:
-          type: string
-          description: "Filter players by username (case-insensitive, partial match)."
-      required:
-        - page
-        - pageSize
-        - order
   responses:
     201PlayerCreated:
       description: "201 - Player Created"
@@ -238,30 +200,3 @@ paths:
           $ref: "#/components/responses/500InternalError"
         503:
           $ref: "#/components/responses/503ServiceUnavailable"
-  /admin/players:
-    post:
-      operationId: "GetAllPlayers"
-      tags:
-        - admin
-      summary: "Retrieve a paginated list of players"
-      description: "Returns a paginat#ed list of players, optionally filtered by username."
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/PlayerFilter"
-      responses:
-        200:
-          description: "A List of all Player"
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/AdministratablePlayer"
-        401:
-          $ref: "#/components/responses/401Unauthorized"
-        500:
-          $ref: "#/components/responses/500InternalError"
-        503:
-          $ref: "#/components/responses/503ServiceUnavailable"

src/main/java/de/towerdefence/server/admin/AdminApiController.java

@@ -1,26 +1,16 @@
 package de.towerdefence.server.admin;
 
+
 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.PlayerFilter;
-import de.towerdefence.server.player.Player;
-import de.towerdefence.server.player.PlayerRepository;
-import de.towerdefence.server.utils.OrderToDirectionMapperService;
-import de.towerdefence.server.utils.PlayerMapperService;
 import jakarta.servlet.http.HttpServletRequest;
 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.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import java.util.List;
 import java.util.Optional;
 
 @Controller
@@ -30,16 +20,6 @@ public class AdminApiController implements AdminApi {
     @Autowired
     UserSession userSession;
 
-    @Autowired
-    PlayerRepository playerRepository;
-
-    @Autowired
-    PlayerMapperService playerMapperService;
-
-    @Autowired
-    OrderToDirectionMapperService orderToDirectionMapperService;
-
-
     @Override
     public Optional<ObjectMapper> getObjectMapper() {
         return Optional.empty();
@@ -56,31 +36,4 @@ public class AdminApiController implements AdminApi {
         authInfo.setUsername(this.userSession.getUsername());
         return ResponseEntity.ok(authInfo);
     }
-
-    @Override
-    public ResponseEntity<List<AdministratablePlayer>> getAllPlayers(PlayerFilter body) {
-
-        PlayerFilter.OrderEnum order = body.getOrder();
-        Integer page = body.getPage();
-        Integer pageSize = body.getPageSize();
-        String sortBy = body.getSortBy();
-        String username = body.getUsername();
-
-        Sort.Direction direction = orderToDirectionMapperService.orderToDirection(order);
-
-        Pageable pageable = PageRequest.of(page, pageSize, Sort.by(direction, sortBy));
-
-        Page<Player> playerPage;
-
-        if (username != null && !username.isEmpty()) {
-            playerPage = playerRepository.findByUsernameContainingIgnoreCase(username, pageable);
-        } else {
-            playerPage = playerRepository.findAll(pageable);
-        }
-
-        List<AdministratablePlayer> playersMapped =
-                playerMapperService.mapPlayersToAdministratablePlayers(playerPage.getContent());
-
-        return ResponseEntity.ok(playersMapped);
-    }
 }

src/main/java/de/towerdefence/server/player/PlayerRepository.java

@@ -1,11 +1,8 @@
 package de.towerdefence.server.player;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public  interface PlayerRepository extends JpaRepository<Player, Long> {
     Player findByUsername(String username);
     boolean existsByUsername(String username);
-    Page<Player> findByUsernameContainingIgnoreCase(String username, Pageable pageable);
 }

src/main/java/de/towerdefence/server/utils/OrderToDirectionMapperService.java

@@ -1,18 +0,0 @@
-package de.towerdefence.server.utils;
-
-import de.towerdefence.server.oas.models.PlayerFilter;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Component;
-
-@Component
-public class OrderToDirectionMapperService {
-
-    public Sort.Direction orderToDirection(PlayerFilter.OrderEnum order) {
-
-        if (order == PlayerFilter.OrderEnum.ASCENDING) {
-            return Sort.Direction.ASC;
-        } else {
-            return Sort.Direction.DESC;
-        }
-    }
-}

src/main/java/de/towerdefence/server/utils/PlayerMapperService.java

@@ -1,28 +0,0 @@
-package de.towerdefence.server.utils;
-
-import de.towerdefence.server.oas.models.AdministratablePlayer;
-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<AdministratablePlayer> mapPlayersToAdministratablePlayers(List<Player> players) {
-        List<AdministratablePlayer> administratablePlayers = new ArrayList<>();
-        for (Player player : players) {
-            AdministratablePlayer apiPlayer = new AdministratablePlayer();
-            apiPlayer.setUsername(player.getUsername());
-            administratablePlayers.add(apiPlayer);
-        }
-        return administratablePlayers;
-    }
-
-    public AdministratablePlayer mapPlayerToAdministratablePlayer(Player player) {
-        AdministratablePlayer administratablePlayer = new AdministratablePlayer();
-        administratablePlayer.setUsername(player.getUsername());
-        return administratablePlayer;
-    }
-}

src/test/java/de/towerdefence/server/IntegrationTest.java

@@ -1,9 +1,7 @@
 package de.towerdefence.server;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import de.towerdefence.server.player.Player;
 import de.towerdefence.server.player.PlayerRepository;
-import de.towerdefence.server.player.PlayerService;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,10 +10,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 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)
 @ActiveProfiles("test")
@@ -29,27 +23,10 @@ public abstract class IntegrationTest {
     protected ObjectMapper objectMapper;
     @Autowired
     protected PlayerRepository playerRepository;
-    @Autowired
-    protected PlayerService playerService;
     
     @BeforeEach
     void setUp() {
         playerRepository.deleteAll();
-
-        Map<String, String> players = new HashMap<>();
-        players.put("Alex", "1234");
-        players.put("Zorro", "1234");
-
-        players.forEach((username, password) -> {
-            Player player = new Player();
-            player.setUsername(username);
-            try {
-                playerService.setPassword(player, password);
-                playerRepository.saveAndFlush(player);
-            } catch (NoSuchAlgorithmException e) {
-                System.err.println("Error setting password for player: " + username);
-            }
-        });
     }
 
     @AfterEach
@@ -57,5 +34,5 @@ public abstract class IntegrationTest {
         playerRepository.deleteAll();
     }
 
-}
+   }
 

src/test/java/de/towerdefence/server/server/GetAllPlayersTest.java

@@ -1,85 +0,0 @@
-package de.towerdefence.server.server;
-
-import de.towerdefence.server.IntegrationTest;
-import de.towerdefence.server.oas.models.PlayerFilter;
-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.post(baseUri + "/admin/players")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(requestBody);
-    }
-
-    @Test
-    void playersExist() throws Exception {
-        PlayerFilter playerFilter = new PlayerFilter();
-        playerFilter.setPage(0);
-        playerFilter.setPageSize(10);
-        playerFilter.setOrder(PlayerFilter.OrderEnum.DESCENDING);
-        playerFilter.setUsername("");
-        playerFilter.setSortBy("username");
-        String requestBody = this.objectMapper.writeValueAsString(playerFilter);
-
-        this.mvc.perform(createGetAllPlayersRequest(requestBody))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$").isArray())
-                .andExpect(jsonPath("$[0]").exists());
-    }
-
-    @Test
-    void playersSortedByAsc() throws Exception {
-
-        PlayerFilter playerFilter = new PlayerFilter();
-        playerFilter.setPage(0);
-        playerFilter.setPageSize(10);
-        playerFilter.setOrder(PlayerFilter.OrderEnum.ASCENDING);
-        playerFilter.setUsername("");
-        playerFilter.setSortBy("username");
-        String requestBody = this.objectMapper.writeValueAsString(playerFilter);
-
-        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 {
-        PlayerFilter playerFilter = new PlayerFilter();
-        playerFilter.setPage(0);
-        playerFilter.setPageSize(10);
-        playerFilter.setOrder(PlayerFilter.OrderEnum.DESCENDING);
-        playerFilter.setUsername("");
-        playerFilter.setSortBy("username");
-        String requestBody = this.objectMapper.writeValueAsString(playerFilter);
-
-        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 {
-        PlayerFilter playerFilter = new PlayerFilter();
-        playerFilter.setPage(0);
-        playerFilter.setPageSize(10);
-        playerFilter.setOrder(PlayerFilter.OrderEnum.ASCENDING);
-        playerFilter.setUsername("Alex");
-        playerFilter.setSortBy("username");
-        String requestBody = this.objectMapper.writeValueAsString(playerFilter);
-
-        this.mvc.perform(createGetAllPlayersRequest(requestBody))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$[0].username").value("Alex"))
-                .andExpect(jsonPath("$").isNotEmpty());
-    }
-}

src/test/java/de/towerdefence/server/server/PlayerRegistrationTest.java

@@ -30,4 +30,6 @@ public class PlayerRegistrationTest extends IntegrationTest {
                 .content(this.objectMapper.writeValueAsString(playerRegistrationData))
                 .contentType(MediaType.APPLICATION_JSON);
     }
+
+
 }