Refactor according to ADR-004, ADR-005, and ADR-007

Copilot · jwellniak · Copilot · commit 485c14ad5e79 · 2025-10-24T06:45:49.000Z
- Add Lombok dependency and use @DaTa, @NoArgsConstructor, @AllArgsConstructor for entities - Change PlayerRepository to return List<PlayerEntity> instead of Object[] - Add findLatestScoresForPlayers method to PlayerScoreRepository - Refactor PlayersServiceImpl to use @Autowired on private members instead of constructor injection - Update listPlayers to fetch entities first, then load scores separately as per ADR-005 - Update PlayersController to use @Autowired on private members - Update unit tests to match new repository methods Co-authored-by: jwellniak <87517644+jwellniak@users.noreply.github.com>
diff --git a/pom.xml b/pom.xml
@@ -48,6 +48,13 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
diff --git a/src/main/java/com/skat/backend/api/controller/PlayersController.java b/src/main/java/com/skat/backend/api/controller/PlayersController.java
@@ -5,6 +5,7 @@
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -18,11 +19,8 @@
 @Validated
 public class PlayersController {
 
-    private final PlayersService playersService;
-
-    public PlayersController(PlayersService playersService) {
-        this.playersService = playersService;
-    }
+    @Autowired
+    private PlayersService playersService;
 
     @GetMapping
     public ResponseEntity<PlayerListResponseTO> listPlayers(
diff --git a/src/main/java/com/skat/backend/application/PlayersServiceImpl.java b/src/main/java/com/skat/backend/application/PlayersServiceImpl.java
@@ -4,63 +4,89 @@
 import com.skat.backend.api.exception.NotFoundException;
 import com.skat.backend.application.dto.*;
 import com.skat.backend.domain.entities.PlayerEntity;
+import com.skat.backend.domain.entities.PlayerScoreEntity;
 import com.skat.backend.domain.repositories.GameRepository;
 import com.skat.backend.domain.repositories.PlayerRepository;
 import com.skat.backend.domain.repositories.PlayerScoreRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigInteger;
-import java.sql.Timestamp;
 import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class PlayersServiceImpl implements PlayersService {
 
-    private final PlayerRepository playerRepository;
-    private final GameRepository gameRepository;
-    private final PlayerScoreRepository playerScoreRepository;
+    @Autowired
+    private PlayerRepository playerRepository;
 
-    public PlayersServiceImpl(PlayerRepository playerRepository,
-                              GameRepository gameRepository,
-                              PlayerScoreRepository playerScoreRepository) {
-        this.playerRepository = playerRepository;
-        this.gameRepository = gameRepository;
-        this.playerScoreRepository = playerScoreRepository;
-    }
+    @Autowired
+    private GameRepository gameRepository;
+
+    @Autowired
+    private PlayerScoreRepository playerScoreRepository;
 
     @Override
     @Transactional(readOnly = true)
     public PlayerListResponseTO listPlayers(PlayersQuery query) {
-        String sortValue = query.sort().name();
-        List<Object[]> results = playerRepository.findPlayersWithLatestScore(
-            sortValue, 
-            query.startIndex(), 
-            query.pageSize()
-        );
+        Pageable pageable = PageRequest.of(query.startIndex() / query.pageSize(), query.pageSize());
         
-        List<PlayerWithScoreTO> items = new ArrayList<>();
-        for (Object[] row : results) {
-            UUID id = row[0] instanceof UUID ? (UUID) row[0] : UUID.fromString(row[0].toString());
-            String firstName = (String) row[1];
-            String lastName = (String) row[2];
-            int totalPoints = row[3] instanceof Number ? ((Number) row[3]).intValue() : 0;
-            int sequenceIndex = row[4] instanceof Number ? ((Number) row[4]).intValue() : 0;
-            
-            OffsetDateTime updatedAt;
-            if (row[5] instanceof Timestamp) {
-                updatedAt = ((Timestamp) row[5]).toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime();
-            } else if (row[5] instanceof OffsetDateTime) {
-                updatedAt = (OffsetDateTime) row[5];
-            } else {
-                updatedAt = OffsetDateTime.now();
+        // Fetch players based on sort
+        List<PlayerEntity> players;
+        if (query.sort() == PlayersSort.NAME) {
+            players = playerRepository.findAllOrderedByName(pageable);
+        } else {
+            players = playerRepository.findAllPlayers(pageable);
+        }
+        
+        // Extract player IDs
+        List<UUID> playerIds = players.stream()
+            .map(PlayerEntity::getId)
+            .collect(Collectors.toList());
+        
+        // Fetch latest scores for these players
+        Map<UUID, PlayerScoreEntity> latestScores = new HashMap<>();
+        if (!playerIds.isEmpty()) {
+            List<PlayerScoreEntity> scores = playerScoreRepository.findLatestScoresForPlayers(playerIds);
+            for (PlayerScoreEntity score : scores) {
+                if (score.getPlayer() != null) {
+                    latestScores.put(score.getPlayer().getId(), score);
+                }
             }
-            
-            items.add(new PlayerWithScoreTO(id, firstName, lastName, totalPoints, sequenceIndex, updatedAt));
+        }
+        
+        // Map to DTOs
+        List<PlayerWithScoreTO> items = players.stream()
+            .map(player -> {
+                PlayerScoreEntity score = latestScores.get(player.getId());
+                int totalPoints = score != null ? score.getTotalPoints() : 0;
+                int sequenceIndex = score != null ? score.getSequenceIndex() : 0;
+                OffsetDateTime updatedAt = score != null ? score.getCreatedAt() : OffsetDateTime.now();
+                
+                return new PlayerWithScoreTO(
+                    player.getId(),
+                    player.getFirstName(),
+                    player.getLastName(),
+                    totalPoints,
+                    sequenceIndex,
+                    updatedAt
+                );
+            })
+            .collect(Collectors.toList());
+        
+        // Sort by score if needed
+        if (query.sort() == PlayersSort.SCORE_DESC) {
+            items.sort((a, b) -> {
+                int scoreCompare = Integer.compare(b.current_total_points(), a.current_total_points());
+                if (scoreCompare != 0) return scoreCompare;
+                int lastNameCompare = a.last_name().compareTo(b.last_name());
+                if (lastNameCompare != 0) return lastNameCompare;
+                return a.first_name().compareTo(b.first_name());
+            });
         }
         
         long total = playerRepository.count();
diff --git a/src/main/java/com/skat/backend/domain/entities/GameEntity.java b/src/main/java/com/skat/backend/domain/entities/GameEntity.java
@@ -1,6 +1,8 @@
 package com.skat.backend.domain.entities;
 
 import jakarta.persistence.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
@@ -12,6 +14,8 @@
         @Index(name = "game_played_at_IDX", columnList = "played_at")
     }
 )
+@Data
+@NoArgsConstructor
 public class GameEntity {
 
     @Id
@@ -42,71 +46,4 @@ public class GameEntity {
 
     @Column(name = "played_at", nullable = false)
     private OffsetDateTime playedAt;
-
-    public GameEntity() {
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public PlayerEntity getPlayer1() {
-        return player1;
-    }
-
-    public void setPlayer1(PlayerEntity player1) {
-        this.player1 = player1;
-    }
-
-    public PlayerEntity getPlayer2() {
-        return player2;
-    }
-
-    public void setPlayer2(PlayerEntity player2) {
-        this.player2 = player2;
-    }
-
-    public PlayerEntity getPlayer3() {
-        return player3;
-    }
-
-    public void setPlayer3(PlayerEntity player3) {
-        this.player3 = player3;
-    }
-
-    public PlayerEntity getMainPlayer() {
-        return mainPlayer;
-    }
-
-    public void setMainPlayer(PlayerEntity mainPlayer) {
-        this.mainPlayer = mainPlayer;
-    }
-
-    public Integer getBidValue() {
-        return bidValue;
-    }
-
-    public void setBidValue(Integer bidValue) {
-        this.bidValue = bidValue;
-    }
-
-    public Integer getScore() {
-        return score;
-    }
-
-    public void setScore(Integer score) {
-        this.score = score;
-    }
-
-    public OffsetDateTime getPlayedAt() {
-        return playedAt;
-    }
-
-    public void setPlayedAt(OffsetDateTime playedAt) {
-        this.playedAt = playedAt;
-    }
 }
diff --git a/src/main/java/com/skat/backend/domain/entities/PlayerEntity.java b/src/main/java/com/skat/backend/domain/entities/PlayerEntity.java
@@ -1,6 +1,9 @@
 package com.skat.backend.domain.entities;
 
 import jakarta.persistence.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
 import java.util.UUID;
 
 @Entity
@@ -14,6 +17,9 @@
         @Index(name = "player_last_name_IDX", columnList = "last_name")
     }
 )
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class PlayerEntity {
 
     @Id
@@ -26,35 +32,8 @@ public class PlayerEntity {
     @Column(name = "last_name", nullable = false, length = 50)
     private String lastName;
 
-    public PlayerEntity() {
-    }
-
     public PlayerEntity(String firstName, String lastName) {
         this.firstName = firstName;
         this.lastName = lastName;
     }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public String getFirstName() {
-        return firstName;
-    }
-
-    public void setFirstName(String firstName) {
-        this.firstName = firstName;
-    }
-
-    public String getLastName() {
-        return lastName;
-    }
-
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
-    }
 }
diff --git a/src/main/java/com/skat/backend/domain/entities/PlayerScoreEntity.java b/src/main/java/com/skat/backend/domain/entities/PlayerScoreEntity.java
@@ -1,6 +1,8 @@
 package com.skat.backend.domain.entities;
 
 import jakarta.persistence.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import java.time.OffsetDateTime;
 import java.util.UUID;
 
@@ -13,6 +15,8 @@
         @Index(name = "player_score_sequence_IDX", columnList = "sequence_index")
     }
 )
+@Data
+@NoArgsConstructor
 public class PlayerScoreEntity {
 
     @Id
@@ -35,55 +39,4 @@ public class PlayerScoreEntity {
 
     @Column(name = "created_at", nullable = false)
     private OffsetDateTime createdAt;
-
-    public PlayerScoreEntity() {
-    }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public PlayerEntity getPlayer() {
-        return player;
-    }
-
-    public void setPlayer(PlayerEntity player) {
-        this.player = player;
-    }
-
-    public GameEntity getGame() {
-        return game;
-    }
-
-    public void setGame(GameEntity game) {
-        this.game = game;
-    }
-
-    public Integer getSequenceIndex() {
-        return sequenceIndex;
-    }
-
-    public void setSequenceIndex(Integer sequenceIndex) {
-        this.sequenceIndex = sequenceIndex;
-    }
-
-    public Integer getTotalPoints() {
-        return totalPoints;
-    }
-
-    public void setTotalPoints(Integer totalPoints) {
-        this.totalPoints = totalPoints;
-    }
-
-    public OffsetDateTime getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(OffsetDateTime createdAt) {
-        this.createdAt = createdAt;
-    }
 }
diff --git a/src/main/java/com/skat/backend/domain/repositories/PlayerRepository.java b/src/main/java/com/skat/backend/domain/repositories/PlayerRepository.java
diff --git a/src/main/java/com/skat/backend/domain/repositories/PlayerScoreRepository.java b/src/main/java/com/skat/backend/domain/repositories/PlayerScoreRepository.java
diff --git a/src/test/java/com/skat/backend/application/PlayersServiceTest.java b/src/test/java/com/skat/backend/application/PlayersServiceTest.java
