Adds Response mapping

vanny96 · vanny96 · commit 5b097c399f0d · 2023-02-05T19:35:50.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -38,3 +38,4 @@ nb-configuration.xml
 
 # Local environment
 .env
+ignore
diff --git a/src/main/java/com/lunatech/leaderboard/controller/GameController.java b/src/main/java/com/lunatech/leaderboard/controller/GameController.java
@@ -41,7 +41,7 @@ public class GameController {
     )))
     public Response list() {
         Collection<Game> games = gameService.findAll();
-        List<GameDto> dtos = games.stream().map(GameDto::new).toList();
+        Collection<GameDto> dtos = gameDtoMapper.toDtos(games);
         return Response.ok(dtos).build();
     }
 
@@ -53,7 +53,7 @@ public Response add(@Valid GameDto body) {
         Game game = gameDtoMapper.toEntity(body);
         gameService.add(game);
         return Response.created(URI.create("/games/"+game.id))
-                .entity(new GameDto(game))
+                .entity(gameDtoMapper.toDto(game))
                 .build();
     }
 
@@ -63,6 +63,6 @@ public Response add(@Valid GameDto body) {
     @APIResponseSchema(GameDto.class)
     public Response delete(Long gameId) {
         Game game = gameService.delete(gameId);
-        return Response.ok(game).build();
+        return Response.ok(gameDtoMapper.toDto(game)).build();
     }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/controller/GameModeController.java b/src/main/java/com/lunatech/leaderboard/controller/GameModeController.java
@@ -1,9 +1,7 @@
 package com.lunatech.leaderboard.controller;
 
 import com.lunatech.leaderboard.dto.gamemode.GameModeDto;
-import com.lunatech.leaderboard.dto.gamemode.GameModeDetailDto;
 import com.lunatech.leaderboard.dto.gamemode.GameModePostDto;
-import com.lunatech.leaderboard.entity.Game;
 import com.lunatech.leaderboard.entity.GameMode;
 import com.lunatech.leaderboard.mapper.gamemode.GameModeDtoMapper;
 import com.lunatech.leaderboard.service.GameModeService;
@@ -22,6 +20,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.net.URI;
+import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -47,8 +46,7 @@ public class GameModeController {
     )))
     public Response list() {
         List<GameMode> gameModes = gameModeService.findAllByGame(gameId);
-        List<GameModeDto> response = gameModes.stream().map(GameModeDto::new).toList();
-
+        Collection<GameModeDto> response = gameModeDtoMapper.toDtos(gameModes);
         return Response.ok(response).build();
     }
 
@@ -57,7 +55,7 @@ public Response list() {
     @APIResponseSchema(GameModeDto.class)
     public Response leaderboard(Long gameModeId) {
         GameMode gameMode = GameMode.findByIdWithLeaderboard(gameModeId);
-        return Response.ok(new GameModeDetailDto(gameMode)).build();
+        return Response.ok(gameModeDtoMapper.toDto(gameMode)).build();
     }
 
     @POST
@@ -71,7 +69,7 @@ public Response add(@Valid GameModePostDto body) {
         gameModeService.add(gameMode);
 
         return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameMode.id))
-                .entity(new GameModeDto(gameMode))
+                .entity(gameModeDtoMapper.toDto(gameMode))
                 .build();
     }
 
@@ -86,6 +84,6 @@ public Response delete(Long gameModeId) {
 
         gameModeService.delete(gameMode);
 
-        return Response.ok(new GameModeDto(gameMode)).build();
+        return Response.ok(gameModeDtoMapper.toDto(gameMode)).build();
     }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/controller/MatchController.java b/src/main/java/com/lunatech/leaderboard/controller/MatchController.java
@@ -49,7 +49,7 @@ public class MatchController {
     )))
     public Response list() {
         Collection<Match> matches = matchService.findByGameMode(gameModeId);
-        List<MatchDto> matchesDto = matches.stream().map(MatchDto::new).toList();
+        Collection<MatchDto> matchesDto = matchDtoMapper.toDtos(matches);
         return Response.ok(matchesDto).build();
     }
 
@@ -63,7 +63,7 @@ public Response add(MatchPostDto body) {
         matchService.save(match);
 
         return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameModeId+"/matches/"+match.id))
-                .entity(new MatchDto(match))
+                .entity(matchDtoMapper.toDto(match))
                 .build();
     }
 
diff --git a/src/main/java/com/lunatech/leaderboard/controller/UserController.java b/src/main/java/com/lunatech/leaderboard/controller/UserController.java
@@ -19,6 +19,7 @@
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.net.URI;
+import java.util.Collection;
 import java.util.List;
 
 @Path("/users")
@@ -39,7 +40,7 @@ public class UserController {
     @APIResponseSchema(UserDto.class)
     public Response me() {
         return User.<User>find("email", email).singleResultOptional()
-                .map(user -> Response.ok(new UserDto(user)).build())
+                .map(user -> Response.ok(userDtoMapper.toDto(user)).build())
                 .orElseThrow(() -> new NotFoundException("User with email " + email + " not in leaderboards"));
     }
 
@@ -50,7 +51,7 @@ public Response me() {
     )))
     public Response list() {
         List<User> users = User.listAll();
-        List<UserDto> dtos = users.stream().map(UserDto::new).toList();
+        Collection<UserDto> dtos = userDtoMapper.toDtos(users);
         return Response.ok(dtos).build();
     }
 
@@ -59,7 +60,7 @@ public Response list() {
     @APIResponseSchema(UserDto.class)
     public Response get(Long userId) {
         User user = User.findById(userId);
-        UserDto dto = new UserDto(user);
+        UserDto dto = userDtoMapper.toDto(user);
         return Response.ok(dto).build();
     }
 
@@ -71,7 +72,7 @@ public Response add(UserPostDto body) {
         User user = userDtoMapper.toEntity(body);
         user.persist();
         return Response.created(URI.create("/users/" + user.id))
-                .entity(new UserDto(user))
+                .entity(userDtoMapper.toDto(user))
                 .build();
     }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/game/GameDto.java b/src/main/java/com/lunatech/leaderboard/dto/game/GameDto.java
@@ -9,7 +9,4 @@ public record GameDto(
         @NotBlank String name,
         String imageUrl
 ) {
-    public GameDto(Game game) {
-        this(game.id, game.name, game.imageUrl);
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeDetailDto.java b/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeDetailDto.java
@@ -10,14 +10,4 @@
 import java.util.List;
 
 public record GameModeDetailDto(Long id, String name, String rules, GameDto game, List<LeaderboardUserDto> leaderboard) {
-    public GameModeDetailDto(GameMode gameMode) {
-        this(gameMode.id, gameMode.name, gameMode.rules, new GameDto(gameMode.game), leaderboardToDto(gameMode.leaderboard));
-    }
-
-    private static List<LeaderboardUserDto> leaderboardToDto(Collection<LeaderboardUser> leaderboard) {
-        return leaderboard.stream()
-                .map(LeaderboardUserDto::new)
-                .sorted(Comparator.comparing(LeaderboardUserDto::score).reversed())
-                .toList();
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeDto.java b/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeDto.java
@@ -3,7 +3,4 @@
 import com.lunatech.leaderboard.entity.GameMode;
 
 public record GameModeDto(Long id, Long gameId, String name, String rules) {
-    public GameModeDto(GameMode gameMode) {
-        this(gameMode.id, gameMode.game.id, gameMode.name, gameMode.rules);
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/match/MatchDto.java b/src/main/java/com/lunatech/leaderboard/dto/match/MatchDto.java
@@ -7,11 +7,4 @@
 import java.util.List;
 
 public record MatchDto(Long id, Long gameModeId, Match.Outcome outcome, Boolean confirmed, List<MatchUserDto> teamA, List<MatchUserDto> teamB) {
-    public MatchDto(Match match) {
-        this(match.id, match.gameMode.id, match.outcome, match.confirmed, teamToDto(match.teamA), teamToDto(match.teamB));
-    }
-
-    private static List<MatchUserDto> teamToDto(List<MatchUser> team) {
-        return team.stream().map(MatchUserDto::matchDto).toList();
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/matchuser/MatchUserDto.java b/src/main/java/com/lunatech/leaderboard/dto/matchuser/MatchUserDto.java
@@ -5,7 +5,4 @@
 import com.lunatech.leaderboard.entity.MatchUser;
 
 public record MatchUserDto(UserDto user, MatchDto match, MatchUser.Team team, boolean outcomeConfirmed) {
-    public static MatchUserDto matchDto(MatchUser matchUser) {
-        return new MatchUserDto(new UserDto(matchUser.user), null, matchUser.team, matchUser.outcomeConfirmed);
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/dto/user/UserDto.java b/src/main/java/com/lunatech/leaderboard/dto/user/UserDto.java
@@ -3,7 +3,4 @@
 import com.lunatech.leaderboard.entity.User;
 
 public record UserDto(Long id, String email, String displayName, String profilePicUrl) {
-    public UserDto(User user) {
-        this(user.id, user.email, user.displayName, user.profilePicUrl);
-    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/DtoMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/DtoMapper.java
@@ -3,10 +3,15 @@
 import java.util.Collection;
 import java.util.stream.Collectors;
 
-public interface DtoMapper<DTO, ENTITY> {
-    ENTITY toEntity(DTO dto);
+public interface DtoMapper<ENTITY, REQUEST_DTO, RESPONSE_DTO> {
+    ENTITY toEntity(REQUEST_DTO dto);
+    RESPONSE_DTO toDto(ENTITY entity);
 
-    default Collection<ENTITY> toEntities(Collection<DTO> dtos, Object... args) {
-        return dtos.stream().map(this::toEntity).collect(Collectors.toList());
+    default Collection<ENTITY> toEntities(Collection<REQUEST_DTO> dtos) {
+        return dtos.stream().map(this::toEntity).toList();
+    }
+
+    default Collection<RESPONSE_DTO> toDtos(Collection<ENTITY> entities) {
+        return entities.stream().map(this::toDto).toList();
     }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/game/GameDtoMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/game/GameDtoMapper.java
@@ -7,7 +7,7 @@
 import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
-public class GameDtoMapper implements DtoMapper<GameDto, Game> {
+public class GameDtoMapper implements DtoMapper<Game, GameDto, GameDto> {
     @Override
     public Game toEntity(GameDto dto) {
         Game game = new Game();
@@ -16,4 +16,9 @@ public Game toEntity(GameDto dto) {
         game.imageUrl = dto.imageUrl();
         return game;
     }
+
+    @Override
+    public GameDto toDto(Game game) {
+        return new GameDto(game.id, game.name, game.imageUrl);
+    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/gamemode/GameModeDetailMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/gamemode/GameModeDetailMapper.java
@@ -0,0 +1,40 @@
+package com.lunatech.leaderboard.mapper.gamemode;
+
+import com.lunatech.leaderboard.dto.game.GameDto;
+import com.lunatech.leaderboard.dto.gamemode.GameModeDetailDto;
+import com.lunatech.leaderboard.entity.GameMode;
+import com.lunatech.leaderboard.entity.LeaderboardUser;
+import com.lunatech.leaderboard.mapper.DtoMapper;
+import com.lunatech.leaderboard.mapper.game.GameDtoMapper;
+import com.lunatech.leaderboard.model.leaderboarduser.LeaderboardUserDto;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+@RequestScoped
+public class GameModeDetailMapper implements DtoMapper<GameMode, Void, GameModeDetailDto> {
+
+    @Inject
+    GameDtoMapper gameDtoMapper;
+
+    @Override
+    public GameMode toEntity(Void unused) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public GameModeDetailDto toDto(GameMode gameMode) {
+        GameDto gameDto = gameDtoMapper.toDto(gameMode.game);
+        return new GameModeDetailDto(gameMode.id, gameMode.name, gameMode.rules, gameDto, leaderboardToDto(gameMode.leaderboard));
+    }
+
+    private static List<LeaderboardUserDto> leaderboardToDto(Collection<LeaderboardUser> leaderboard) {
+        return leaderboard.stream()
+                .map(LeaderboardUserDto::new)
+                .sorted(Comparator.comparing(LeaderboardUserDto::score).reversed())
+                .toList();
+    }
+}
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/gamemode/GameModeDtoMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/gamemode/GameModeDtoMapper.java
@@ -1,5 +1,6 @@
 package com.lunatech.leaderboard.mapper.gamemode;
 
+import com.lunatech.leaderboard.dto.gamemode.GameModeDto;
 import com.lunatech.leaderboard.dto.gamemode.GameModePostDto;
 import com.lunatech.leaderboard.entity.Game;
 import com.lunatech.leaderboard.entity.GameMode;
@@ -8,7 +9,7 @@
 import javax.enterprise.context.RequestScoped;
 
 @RequestScoped
-public class GameModeDtoMapper implements DtoMapper<GameModePostDto, GameMode> {
+public class GameModeDtoMapper implements DtoMapper<GameMode, GameModePostDto, GameModeDto> {
 
     private Long gameId;
 
@@ -27,4 +28,9 @@ public GameMode toEntity(GameModePostDto dto) {
     public void setGameId(Long gameId) {
         this.gameId = gameId;
     }
+
+    @Override
+    public GameModeDto toDto(GameMode gameMode) {
+        return new GameModeDto(gameMode.id, gameMode.game.id, gameMode.name, gameMode.rules);
+    }
 }
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/match/MatchDtoMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/match/MatchDtoMapper.java
@@ -1,7 +1,10 @@
 package com.lunatech.leaderboard.mapper.match;
 
+import com.lunatech.leaderboard.dto.match.MatchDto;
 import com.lunatech.leaderboard.dto.match.MatchPostDto;
+import com.lunatech.leaderboard.dto.matchuser.MatchUserDto;
 import com.lunatech.leaderboard.dto.matchuser.MatchUserPostDto;
+import com.lunatech.leaderboard.dto.user.UserDto;
 import com.lunatech.leaderboard.entity.GameMode;
 import com.lunatech.leaderboard.entity.Match;
 import com.lunatech.leaderboard.entity.MatchUser;
@@ -12,9 +15,10 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
+import java.util.List;
 
 @RequestScoped
-public class MatchDtoMapper implements DtoMapper<MatchPostDto, Match> {
+public class MatchDtoMapper implements DtoMapper<Match, MatchPostDto, MatchDto> {
 
     @Inject
     UserService userService;
@@ -33,6 +37,11 @@ public Match toEntity(MatchPostDto dto) {
         return match;
     }
 
+    @Override
+    public MatchDto toDto(Match match) {
+        return new MatchDto(match.id, match.gameMode.id, match.outcome, match.confirmed, teamToDto(match.teamA), teamToDto(match.teamB));
+    }
+
     private MatchUser toMatchUser(MatchUserPostDto dto, Match match, MatchUser.Team team) {
         MatchUser matchUser = new MatchUser();
         matchUser.match = match;
@@ -44,6 +53,14 @@ private MatchUser toMatchUser(MatchUserPostDto dto, Match match, MatchUser.Team
         return matchUser;
     }
 
+    private MatchUserDto toMatchUserDto(MatchUser matchUser) {
+        return new MatchUserDto(new UserDto(matchUser.user), null, matchUser.team, matchUser.outcomeConfirmed);
+    }
+
+    private List<MatchUserDto> teamToDto(List<MatchUser> team) {
+        return team.stream().map(this::toMatchUserDto).toList();
+    }
+
     public void setGameModeId(Long gameModeId) {
         this.gameModeId = gameModeId;
     }
diff --git a/src/main/java/com/lunatech/leaderboard/mapper/user/UserDtoMapper.java b/src/main/java/com/lunatech/leaderboard/mapper/user/UserDtoMapper.java
@@ -1,13 +1,14 @@
 package com.lunatech.leaderboard.mapper.user;
 
+import com.lunatech.leaderboard.dto.user.UserDto;
 import com.lunatech.leaderboard.dto.user.UserPostDto;
 import com.lunatech.leaderboard.entity.User;
 import com.lunatech.leaderboard.mapper.DtoMapper;
 
 import javax.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped
-public class UserDtoMapper implements DtoMapper<UserPostDto, User> {
+public class UserDtoMapper implements DtoMapper<User, UserPostDto, UserDto> {
     @Override
     public User toEntity(UserPostDto dto) {
         User user = new User();
@@ -16,4 +17,9 @@ public User toEntity(UserPostDto dto) {
         user.profilePicUrl = dto.profilePicUrl();
         return user;
     }
+
+    @Override
+    public UserDto toDto(User user) {
+        return new UserDto(user.id, user.email, user.displayName, user.profilePicUrl);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,3 +38,4 @@ nb-configuration.xml`
`38`	`38`
`39`	`39`	`# Local environment`
`40`	`40`	`.env`
	`41`	`+ignore`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class GameController {`
`41`	`41`	`)))`
`42`	`42`	`public Response list() {`
`43`	`43`	`Collection<Game> games = gameService.findAll();`
`44`		`- List<GameDto> dtos = games.stream().map(GameDto::new).toList();`
	`44`	`+ Collection<GameDto> dtos = gameDtoMapper.toDtos(games);`
`45`	`45`	`return Response.ok(dtos).build();`
`46`	`46`	`}`
`47`	`47`
`@@ -53,7 +53,7 @@ public Response add(@Valid GameDto body) {`
`53`	`53`	`Game game = gameDtoMapper.toEntity(body);`
`54`	`54`	`gameService.add(game);`
`55`	`55`	`return Response.created(URI.create("/games/"+game.id))`
`56`		`- .entity(new GameDto(game))`
	`56`	`+ .entity(gameDtoMapper.toDto(game))`
`57`	`57`	`.build();`
`58`	`58`	`}`
`59`	`59`
`@@ -63,6 +63,6 @@ public Response add(@Valid GameDto body) {`
`63`	`63`	`@APIResponseSchema(GameDto.class)`
`64`	`64`	`public Response delete(Long gameId) {`
`65`	`65`	`Game game = gameService.delete(gameId);`
`66`		`- return Response.ok(game).build();`
	`66`	`+ return Response.ok(gameDtoMapper.toDto(game)).build();`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public class MatchController {`
`49`	`49`	`)))`
`50`	`50`	`public Response list() {`
`51`	`51`	`Collection<Match> matches = matchService.findByGameMode(gameModeId);`
`52`		`- List<MatchDto> matchesDto = matches.stream().map(MatchDto::new).toList();`
	`52`	`+ Collection<MatchDto> matchesDto = matchDtoMapper.toDtos(matches);`
`53`	`53`	`return Response.ok(matchesDto).build();`
`54`	`54`	`}`
`55`	`55`
`@@ -63,7 +63,7 @@ public Response add(MatchPostDto body) {`
`63`	`63`	`matchService.save(match);`
`64`	`64`
`65`	`65`	`return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameModeId+"/matches/"+match.id))`
`66`		`- .entity(new MatchDto(match))`
	`66`	`+ .entity(matchDtoMapper.toDto(match))`
`67`	`67`	`.build();`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,4 @@ public record GameDto(`
`9`	`9`	`@NotBlank String name,`
`10`	`10`	`String imageUrl`
`11`	`11`	`) {`
`12`		`- public GameDto(Game game) {`
`13`		`- this(game.id, game.name, game.imageUrl);`
`14`		`- }`
`15`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,4 @@`
`3`	`3`	`import com.lunatech.leaderboard.entity.GameMode;`
`4`	`4`
`5`	`5`	`public record GameModeDto(Long id, Long gameId, String name, String rules) {`
`6`		`- public GameModeDto(GameMode gameMode) {`
`7`		`- this(gameMode.id, gameMode.game.id, gameMode.name, gameMode.rules);`
`8`		`- }`
`9`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,4 @@`
`5`	`5`	`import com.lunatech.leaderboard.entity.MatchUser;`
`6`	`6`
`7`	`7`	`public record MatchUserDto(UserDto user, MatchDto match, MatchUser.Team team, boolean outcomeConfirmed) {`
`8`		`- public static MatchUserDto matchDto(MatchUser matchUser) {`
`9`		`- return new MatchUserDto(new UserDto(matchUser.user), null, matchUser.team, matchUser.outcomeConfirmed);`
`10`		`- }`
`11`	`8`	`}`