Add player name to leader board

beverly-hills-money-gangster · Feb 21, 2024 · 819a60c · 819a60c
1 parent f205aec
commit 819a60c
Show file tree

Hide file tree

Showing 7 changed files with 197 additions and 14 deletions.
diff --git a/schema/src/main/java/com/beverly/hills/money/gang/proto/ServerResponse.java b/schema/src/main/java/com/beverly/hills/money/gang/proto/ServerResponse.java
diff --git a/schema/src/main/java/com/beverly/hills/money/gang/proto/ServerResponseOuterClass.java b/schema/src/main/java/com/beverly/hills/money/gang/proto/ServerResponseOuterClass.java
diff --git a/schema/src/main/resources/server-response.proto b/schema/src/main/resources/server-response.proto
@@ -68,6 +68,7 @@ message ServerResponse {
   message LeaderBoardItem {
     optional int32 playerId = 1;
     optional int32 kills = 2;
+    optional string playerName = 3;
   }
 
   message GameEventPlayerStats {

diff --git a/server/src/main/java/com/beverly/hills/money/gang/factory/ServerResponseFactory.java b/server/src/main/java/com/beverly/hills/money/gang/factory/ServerResponseFactory.java
@@ -21,6 +21,7 @@ static ServerResponse.LeaderBoard createLeaderBoard(List<GameLeaderBoardItem> le
         leaderBoard.forEach(leaderBoardItem
                 -> leaderBoardResponse.addItems(ServerResponse.LeaderBoardItem.newBuilder()
                 .setPlayerId(leaderBoardItem.getPlayerId())
+                .setPlayerName(leaderBoardItem.getName())
                 .setKills(leaderBoardItem.getKills())
                 .build()));
         return leaderBoardResponse.build();

diff --git a/server/src/main/java/com/beverly/hills/money/gang/state/Game.java b/server/src/main/java/com/beverly/hills/money/gang/state/Game.java
@@ -66,7 +66,6 @@ public PlayerShootingGameState shoot(final PlayerState.PlayerCoordinates shootin
                                          final Integer shotPlayerId) throws GameLogicError {
         validateGameNotClosed();
         PlayerState shootingPlayerState = getPlayer(shootingPlayerId).orElse(null);
-        List<GameLeaderBoardItem> leaderBoard = new ArrayList<>();
         if (shootingPlayerState == null) {
             LOG.warn("Non-existing player can't shoot");
             return null;
@@ -94,7 +93,6 @@ public PlayerShootingGameState shoot(final PlayerState.PlayerCoordinates shootin
             shotPlayer.getShot();
             if (shotPlayer.isDead()) {
                 shootingPlayerState.registerKill();
-                leaderBoard.addAll(getLeaderBoard());
             }
             return shotPlayer;
         }).orElse(null);
@@ -116,6 +114,7 @@ private List<GameLeaderBoardItem> getLeaderBoard() {
                         player1.getPlayerState().getKills(), player2.getPlayerState().getKills()))
                 .map(playerStateChannel -> GameLeaderBoardItem.builder()
                         .playerId(playerStateChannel.getPlayerState().getPlayerId())
+                        .name(playerStateChannel.getPlayerState().getPlayerName())
                         .kills(playerStateChannel.getPlayerState().getKills())
                         .build())
                 .collect(Collectors.toList());

diff --git a/server/src/main/java/com/beverly/hills/money/gang/state/GameLeaderBoardItem.java b/server/src/main/java/com/beverly/hills/money/gang/state/GameLeaderBoardItem.java
@@ -11,5 +11,7 @@ public class GameLeaderBoardItem {
 
     private final int playerId;
 
+    private final String name;
+
     private final int kills;
 }