Add scores to TopMatches

Author: mario-vimal

src/main/java/delta/codecharacter/server/controller/api/MatchController.java

@@ -36,5 +36,4 @@ public void updateMatch(@RequestBody @Valid UpdateMatchRequest updateMatchReques
             return;
         matchService.updateMatch(updateMatchRequest);
     }
-
 }

src/main/java/delta/codecharacter/server/controller/api/UserController.java

@@ -2,7 +2,7 @@
 
 import delta.codecharacter.server.controller.request.User.*;
 import delta.codecharacter.server.controller.response.Match.DetailedMatchStatsResponse;
-import delta.codecharacter.server.controller.response.Match.PrivateMatchResponse;
+import delta.codecharacter.server.controller.response.Match.MatchResponse;
 import delta.codecharacter.server.controller.response.User.PrivateUserResponse;
 import delta.codecharacter.server.controller.response.User.PublicUserResponse;
 import delta.codecharacter.server.controller.response.UserRatingsResponse;
@@ -158,7 +158,7 @@ public ResponseEntity<List<UserRatingsResponse>> getUserRatings(@PathVariable St
     }
 
     @GetMapping(value = "/match/{pageNo}/{pageSize}")
-    public ResponseEntity<List<PrivateMatchResponse>> getManualAndAutoExecutedMatches(@PathVariable Integer pageNo, @PathVariable Integer pageSize, Authentication authentication) {
+    public ResponseEntity<List<MatchResponse>> getManualAndAutoExecutedMatches(@PathVariable Integer pageNo, @PathVariable Integer pageSize, Authentication authentication) {
         String email = userService.getEmailFromAuthentication(authentication);
         User user = userService.getUserByEmail(email);
         Pageable pageable = PageRequest.of(pageNo - 1, pageSize);

src/main/java/delta/codecharacter/server/controller/response/Match/MatchResponse.java

@@ -17,9 +17,9 @@ public class MatchResponse {
 
     private String username2;
 
-    private Integer avatarId1;
+    private Integer avatar1;
 
-    private Integer avatarId2;
+    private Integer avatar2;
 
     private Integer score1;
 

src/main/java/delta/codecharacter/server/controller/response/Match/PrivateMatchResponse.java

@@ -7,7 +7,6 @@
 import delta.codecharacter.server.controller.response.GameLogs;
 import delta.codecharacter.server.controller.response.Match.DetailedMatchStatsResponse;
 import delta.codecharacter.server.controller.response.Match.MatchResponse;
-import delta.codecharacter.server.controller.response.Match.PrivateMatchResponse;
 import delta.codecharacter.server.model.Match;
 import delta.codecharacter.server.model.User;
 import delta.codecharacter.server.repository.*;
@@ -118,8 +117,10 @@ public List<MatchResponse> getTopMatches(Integer PageNumber, Integer PageSize) {
             MatchResponse matchResponse = MatchResponse.builder()
                     .username1(user1.getUsername())
                     .username2(user2.getUsername())
-                    .avatarId1(user1.getAvatarId())
-                    .avatarId2(user2.getAvatarId())
+                    .avatar1(user1.getAvatarId())
+                    .avatar2(user2.getAvatarId())
+                    .score1(match.getScore1())
+                    .score2(match.getScore2())
                     .verdict(match.getVerdict())
                     .matchMode(match.getMatchMode())
                     .games(gameService.getAllGamesByMatchId(match.getId()))
@@ -137,15 +138,15 @@ public List<MatchResponse> getTopMatches(Integer PageNumber, Integer PageSize) {
      * @param userId UserId of the player
      * @return List of paginated manual and auto matches
      */
-    public List<PrivateMatchResponse> getManualAndAutoExecutedMatchesPaginated(Integer userId, Pageable pageable) {
+    public List<MatchResponse> getManualAndAutoExecutedMatchesPaginated(Integer userId, Pageable pageable) {
         Aggregation aggregation = newAggregation(
                 match(
-                    new Criteria().andOperator(
                         new Criteria().andOperator(
-                                new Criteria().orOperator(Criteria.where("player_id_1").is(userId), Criteria.where("player_id_2").is(userId)),
-                                new Criteria().orOperator(Criteria.where("match_mode").is(MatchMode.MANUAL), Criteria.where("match_mode").is(MatchMode.AUTO))
-                        ), Criteria.where("status").is("EXECUTED")
-                    )
+                                new Criteria().andOperator(
+                                        new Criteria().orOperator(Criteria.where("player_id_1").is(userId), Criteria.where("player_id_2").is(userId)),
+                                        new Criteria().orOperator(Criteria.where("match_mode").is(MatchMode.MANUAL), Criteria.where("match_mode").is(MatchMode.AUTO))
+                                ), Criteria.where("status").is("EXECUTED")
+                        )
                 ),
                 sort(Sort.by("createdAt").descending()),
                 skip((long) pageable.getPageNumber() * pageable.getPageSize()),
@@ -155,26 +156,28 @@ public List<PrivateMatchResponse> getManualAndAutoExecutedMatchesPaginated(Integ
         var groupResults = mongoTemplate.aggregate(aggregation, Match.class, Match.class);
         List<Match> matches = groupResults.getMappedResults();
 
-        List<PrivateMatchResponse> privateMatchResponse = new ArrayList<>();
+        List<MatchResponse> matchResponseList = new ArrayList<>();
         for (var match : matches) {
 
             User user1 = userRepository.findByUserId(match.getPlayerId1());
             User user2 = userRepository.findByUserId(match.getPlayerId2());
 
-            var matchResponse = PrivateMatchResponse.builder()
+            var matchResponse = MatchResponse.builder()
                     .username1(user1.getUsername())
                     .username2(user2.getUsername())
                     .avatar1(user1.getAvatarId())
                     .avatar2(user2.getAvatarId())
+                    .score1(match.getScore1())
+                    .score2(match.getScore2())
                     .verdict(match.getVerdict())
                     .playedAt(match.getCreatedAt())
                     .matchMode(match.getMatchMode())
                     .games(gameService.getAllGamesByMatchId(match.getId()))
                     .build();
 
-            privateMatchResponse.add(matchResponse);
+            matchResponseList.add(matchResponse);
         }
-        return privateMatchResponse;
+        return matchResponseList;
     }
 
     /**