resolve conflicts after upstream/leaderboard and leaderboard merge

Author: gae-m

T23-G1/src/main/java/com/example/db_setup/controller/PlayerController.java

@@ -21,21 +21,14 @@ public class PlayerController {
      */
 
     private final PlayerService playerService;
-    private final PlayerRepository playerRepository;
-    private final Logger logger = LoggerFactory.getLogger(PlayerController.class);
 
-    public PlayerController(PlayerService playerService, PlayerRepository playerRepository) {
+    public PlayerController(PlayerService playerService) {
         this.playerService = playerService;
-        this.playerRepository = playerRepository;
     }
 
     @GetMapping("/players")
     public ResponseEntity<List<PlayerDTO>> getAllPlayers() {
-        logger.info("[GET /players] Received request");
-        List<Player> players = playerRepository.findAll();
-        List<PlayerDTO> playersDTO = players.stream().map(PlayerDTO::new).toList();
-        logger.info("[GET /players] Players retrieved: {}", playersDTO);
-        return ResponseEntity.ok(playersDTO);
+        return ResponseEntity.ok(playerService.getAllPlayers());
     }
 
     @PostMapping("/players/studentsByIds")

T23-G1/src/main/java/com/example/db_setup/mapper/MapperFacade.java

@@ -2,9 +2,11 @@
 
 import com.example.db_setup.model.GameProgress;
 import com.example.db_setup.model.Opponent;
+import com.example.db_setup.model.Player;
 import com.example.db_setup.model.PlayerProgress;
 import com.example.db_setup.model.dto.gamification.GameProgressDTO;
 import com.example.db_setup.model.dto.gamification.OpponentDTO;
+import com.example.db_setup.model.dto.gamification.PlayerDTO;
 import com.example.db_setup.model.dto.gamification.PlayerProgressDTO;
 import org.springframework.stereotype.Service;
 
@@ -29,13 +31,16 @@ public class MapperFacade {
     private final OpponentMapper opponentMapper;
     private final PlayerProgressMapper playerProgressMapper;
     private final GameProgressMapper gameProgressMapper;
+    private final PlayerMapper playerMapper;
 
     public MapperFacade(OpponentMapper opponentMapper,
                         PlayerProgressMapper playerProgressMapper,
-                        GameProgressMapper gameProgressMapper) {
+                        GameProgressMapper gameProgressMapper,
+                        PlayerMapper playerMapper) {
         this.opponentMapper = opponentMapper;
         this.playerProgressMapper = playerProgressMapper;
         this.gameProgressMapper = gameProgressMapper;
+        this.playerMapper = playerMapper;
     }
 
     public OpponentDTO toDTO(Opponent opponent) {
@@ -49,4 +54,8 @@ public PlayerProgressDTO toDTO(PlayerProgress playerProgress) {
     public GameProgressDTO toDTO(GameProgress gameProgress) {
         return gameProgressMapper.gameProgressToGameProgressDTO(gameProgress);
     }
+
+    public PlayerDTO toDTO(Player player){
+        return playerMapper.playerToPlayerDTO(player);
+    }
 }

T23-G1/src/main/java/com/example/db_setup/mapper/PlayerMapper.java

@@ -5,20 +5,16 @@
 import com.example.db_setup.model.dto.gamification.PlayerProgressDTO;
 import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
 
 @Mapper(componentModel = "spring", uses = PlayerProgressMapper.class)
 public interface PlayerMapper {
 
-    @BeanMapping(ignoreUnmappedSourceProperties = {"ID", "password", "userProfile")
-    PlayerDTO playerToPlayerDTO(Player player){
-        return new PlayerDTO(
-            player.getID(),
-            player.getName(),
-            player.getSurname(),
-            player.getNickname(),
-            player.getEmail(),
-            player.getStudies().toString(),
-
-        )
-    }
-}
+    @BeanMapping(ignoreUnmappedSourceProperties = {"password"})
+    @Mapping(source = "player.userProfile.name", target = "name")
+    @Mapping(source = "player.userProfile.surname", target = "surname")
+    @Mapping(source = "player.userProfile.nickname", target = "nickname")
+    @Mapping(source = "player.userProfile.email", target = "email")
+    @Mapping(source="ID", target="id")
+    PlayerDTO playerToPlayerDTO(Player player);
+}

T23-G1/src/main/java/com/example/db_setup/model/dto/gamification/PlayerDTO.java

@@ -19,15 +19,15 @@ public class PlayerDTO {
 	private String studies;
 	private PlayerProgressDTO playerProgress;
 
-	public PlayerDTO(Player player) {
-		this(
-			player.getID(),
-			player.getName(),
-			player.getSurname(),
-			player.getNickname(),
-			player.getEmail(),
-			player.getStudies().toString(),
-			new PlayerProgressDTO(player.getPlayerProgress())
-		);
-	}
+//	public PlayerDTO(Player player) {
+//		this(
+//			player.getID(),
+//			player.getName(),
+//			player.getSurname(),
+//			player.getNickname(),
+//			player.getEmail(),
+//			player.getStudies().toString(),
+//			new PlayerProgressDTO(player.getPlayerProgress())
+//		);
+//	}
 }

T23-G1/src/main/java/com/example/db_setup/service/PlayerService.java

@@ -16,9 +16,11 @@
  */
 package com.example.db_setup.service;
 
+import com.example.db_setup.mapper.MapperFacade;
 import com.example.db_setup.model.Player;
 import com.example.db_setup.model.Studies;
 import com.example.db_setup.model.UserProfile;
+import com.example.db_setup.model.dto.gamification.PlayerDTO;
 import com.example.db_setup.model.repository.PlayerRepository;
 import com.example.db_setup.model.repository.UserProfileRepository;
 import com.example.db_setup.service.exception.UserNotFoundException;
@@ -40,11 +42,24 @@ public class PlayerService {
     private final PlayerProgressService playerProgressService;
     private final PlayerRepository playerRepository;
     private final UserProfileRepository userProfileRepository;
+    private final MapperFacade mapperFacade;
 
-    public PlayerService(PlayerProgressService playerProgressService, PlayerRepository playerRepository, UserProfileRepository userProfileRepository) {
+    public PlayerService(PlayerProgressService playerProgressService,
+                         PlayerRepository playerRepository,
+                         UserProfileRepository userProfileRepository,
+                         MapperFacade mapperFacade) {
         this.playerProgressService = playerProgressService;
         this.playerRepository = playerRepository;
         this.userProfileRepository = userProfileRepository;
+        this.mapperFacade = mapperFacade;
+    }
+
+    public List<PlayerDTO> getAllPlayers() {
+        logger.info("[GET /players] Received request");
+        List<Player> players = playerRepository.findAll();
+        List<PlayerDTO> playersDTO = players.stream().map(mapperFacade::toDTO).toList();
+        logger.info("[GET /players] Players retrieved");
+        return playersDTO;
     }
 
     @Transactional