Adds dtomappers for dto -> entity conversion

Author: vanny96

leaderboards/src/main/java/com/lunatech/leaderboard/controller/GameController.java

@@ -2,13 +2,16 @@
 
 import com.lunatech.leaderboard.dto.game.GameDto;
 import com.lunatech.leaderboard.entity.Game;
+import com.lunatech.leaderboard.mapper.game.GameDtoMapper;
 import io.quarkus.security.Authenticated;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponseSchema;
 
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -23,6 +26,9 @@
 @Authenticated
 public class GameController {
 
+    @Inject
+    GameDtoMapper gameDtoMapper;
+
     @GET
     @APIResponse(content = @Content(schema = @Schema(
             type = SchemaType.ARRAY,
@@ -37,8 +43,9 @@ public Response list() {
     @POST
     @Transactional
     @APIResponseSchema(GameDto.class)
+    @RolesAllowed("admin")
     public Response add(@Valid GameDto body) {
-        Game game = body.toEntity();
+        Game game = gameDtoMapper.toEntity(body);
         game.persist();
         return Response.created(URI.create("/games/"+game.id))
                 .entity(new GameDto(game))

leaderboards/src/main/java/com/lunatech/leaderboard/controller/GameModeController.java

@@ -1,17 +1,20 @@
 package com.lunatech.leaderboard.controller;
 
 import com.lunatech.leaderboard.dto.gamemode.GameModeDto;
-import com.lunatech.leaderboard.dto.gamemode.GameModeLeaderboardDto;
+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 io.quarkus.security.Authenticated;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponseSchema;
 
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
 import javax.transaction.Transactional;
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -27,6 +30,9 @@
 @Authenticated
 public class GameModeController {
 
+    @Inject
+    GameModeDtoMapper gameModeDtoMapper;
+
     @PathParam("gameId")
     private Long gameId;
 
@@ -48,21 +54,24 @@ public Response list() {
     @APIResponseSchema(GameModeDto.class)
     public Response leaderboard(Long gameModeId) {
         GameMode gameMode = GameMode.findByIdWithLeaderboard(gameModeId);
-        return Response.ok(new GameModeLeaderboardDto(gameMode)).build();
+        return Response.ok(new GameModeDetailDto(gameMode)).build();
     }
 
     @POST
     @Transactional
     @APIResponseSchema(GameModeDto.class)
+    @RolesAllowed("admin")
     public Response add(@Valid GameModePostDto body) {
-        GameMode gameMode = body.toEntity();
+        gameModeDtoMapper.setGameId(gameId);
+        GameMode gameMode = gameModeDtoMapper.toEntity(body);
+
         if(!Objects.equals(gameMode.game.id, gameId))
             throw new BadRequestException("GameMode game does not match path");
 
         gameMode.persist();
 
         return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameMode.id))
-                .entity(new GameModePostDto(gameMode))
+                .entity(new GameModeDto(gameMode))
                 .build();
     }
 
@@ -77,6 +86,6 @@ public Response delete(@Valid Long gameModeId) {
 
         gameMode.delete();
 
-        return Response.ok(new GameModePostDto(gameMode)).build();
+        return Response.ok(new GameModeDto(gameMode)).build();
     }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/controller/MatchController.java

@@ -4,8 +4,8 @@
 import com.lunatech.leaderboard.dto.match.MatchPostDto;
 import com.lunatech.leaderboard.entity.Match;
 import com.lunatech.leaderboard.entity.User;
+import com.lunatech.leaderboard.mapper.match.MatchDtoMapper;
 import com.lunatech.leaderboard.service.MatchService;
-import com.lunatech.leaderboard.service.UserService;
 import io.quarkus.security.Authenticated;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
@@ -14,6 +14,7 @@
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponseSchema;
 
+import javax.annotation.security.RolesAllowed;
 import javax.inject.Inject;
 import javax.transaction.Transactional;
 import javax.ws.rs.*;
@@ -33,7 +34,7 @@ public class MatchController {
     MatchService matchService;
 
     @Inject
-    UserService userService;
+    MatchDtoMapper matchDtoMapper;
 
     @PathParam("gameId")
     private Long gameId;
@@ -55,8 +56,10 @@ public Response list() {
     @POST
     @Transactional
     @APIResponseSchema(MatchDto.class)
+    @RolesAllowed("admin")
     public Response add(MatchPostDto body) {
-        Match match = body.toEntity(userService);
+        matchDtoMapper.setGameModeId(gameModeId);
+        Match match = matchDtoMapper.toEntity(body);
         matchService.save(match);
 
         return Response.created(URI.create("/games/"+gameId+"/gamemodes/"+gameModeId+"/matches/"+match.id))

leaderboards/src/main/java/com/lunatech/leaderboard/controller/UserController.java

@@ -3,6 +3,7 @@
 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.user.UserDtoMapper;
 import io.quarkus.security.Authenticated;
 import org.eclipse.microprofile.openapi.annotations.enums.SchemaType;
 import org.eclipse.microprofile.openapi.annotations.media.Content;
@@ -11,6 +12,8 @@
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
 import org.eclipse.microprofile.openapi.annotations.responses.APIResponseSchema;
 
+import javax.annotation.security.RolesAllowed;
+import javax.inject.Inject;
 import javax.transaction.Transactional;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -24,6 +27,9 @@
 @Authenticated
 public class UserController {
 
+    @Inject
+    UserDtoMapper userDtoMapper;
+
     @Parameter(hidden = true)
     @HeaderParam("email")
     private String email;
@@ -57,13 +63,12 @@ public Response get(Long userId) {
         return Response.ok(dto).build();
     }
 
-    @PUT
+    @POST
     @Transactional
-    @Authenticated
+    @RolesAllowed("admin")
     @APIResponseSchema(UserDto.class)
-    //To fix, should retrieve user
     public Response add(UserPostDto body) {
-        User user = body.toEntity(email);
+        User user = userDtoMapper.toEntity(body);
         user.persist();
         return Response.created(URI.create("/users/" + user.id))
                 .entity(new UserDto(user))

leaderboards/src/main/java/com/lunatech/leaderboard/dto/game/GameDto.java

@@ -12,12 +12,4 @@ public record GameDto(
     public GameDto(Game game) {
         this(game.id, game.name, game.imageUrl);
     }
-
-    public Game toEntity() {
-        Game game = new Game();
-        game.id = id;
-        game.name = name;
-        game.imageUrl = imageUrl;
-        return game;
-    }
 }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeLeaderboardDto.java renamed to leaderboards/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModeDetailDto.java

@@ -1,16 +1,16 @@
 package com.lunatech.leaderboard.dto.gamemode;
 
 import com.lunatech.leaderboard.dto.game.GameDto;
-import com.lunatech.leaderboard.dto.leaderboarduser.LeaderboardUserDto;
+import com.lunatech.leaderboard.model.leaderboarduser.LeaderboardUserDto;
 import com.lunatech.leaderboard.entity.GameMode;
 import com.lunatech.leaderboard.entity.LeaderboardUser;
 
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
-public record GameModeLeaderboardDto(Long id, String name, String rules, GameDto game, List<LeaderboardUserDto> leaderboard) {
-    public GameModeLeaderboardDto(GameMode gameMode) {
+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));
     }
 

leaderboards/src/main/java/com/lunatech/leaderboard/dto/gamemode/GameModePostDto.java

@@ -9,27 +9,5 @@
 public record GameModePostDto(
         Long id,
         @NotBlank String name,
-        @NotBlank String rules,
-        @NotNull Long gameId
-) {
-    public GameModePostDto(GameMode gameMode) {
-        this(gameMode.id, gameMode.name, gameMode.rules, gameMode.game.id);
-    }
-
-    public GameMode toFetchedEntity() {
-        GameMode gameMode = toEntity();
-        gameMode.game = Game.findById(gameMode.game.id);
-        return gameMode;
-    }
-
-    public GameMode toEntity() {
-        GameMode gameMode = new GameMode();
-        gameMode.id = id;
-        gameMode.name = name;
-        gameMode.rules = rules;
-
-        gameMode.game = new Game();
-        gameMode.game.id = gameId;
-        return gameMode;
-    }
-}
+        @NotBlank String rules
+) { }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/match/MatchPostDto.java

@@ -6,19 +6,12 @@
 import com.lunatech.leaderboard.entity.MatchUser;
 import com.lunatech.leaderboard.service.UserService;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
-public record MatchPostDto(Match.Outcome outcome, Long gameModeId, List<MatchUserPostDto> teamA, List<MatchUserPostDto> teamB) {
-
-    public Match toEntity(UserService userService) {
-        GameMode gameMode = new GameMode();
-        gameMode.id = gameModeId;
-
-        Match match = new Match();
-        match.gameMode = gameMode;
-        match.outcome = outcome;
-        match.teamA = teamA.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_A, userService)).toList();
-        match.teamB = teamB.stream().map(dto -> dto.toEntity(match, MatchUser.Team.TEAM_B, userService)).toList();
-        return match;
-    }
+public record MatchPostDto(
+        @NotNull Match.Outcome outcome,
+        @NotEmpty List<MatchUserPostDto> teamA,
+        @NotEmpty List<MatchUserPostDto> teamB) {
 }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/matchuser/MatchUserPostDto.java

@@ -1,20 +1,7 @@
 package com.lunatech.leaderboard.dto.matchuser;
 
-import com.lunatech.leaderboard.entity.Match;
-import com.lunatech.leaderboard.entity.MatchUser;
-import com.lunatech.leaderboard.entity.User;
-import com.lunatech.leaderboard.service.UserService;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
 
-public record MatchUserPostDto(String userEmail) {
-
-    public MatchUser toEntity(Match match, MatchUser.Team team, UserService userService) {
-        MatchUser matchUser = new MatchUser();
-        matchUser.match = match;
-        matchUser.team = team;
-        matchUser.outcomeConfirmed = false;
-
-        matchUser.user = User.findByEmail(userEmail)
-                .orElseGet(() -> userService.add(userEmail));
-        return matchUser;
-    }
+public record MatchUserPostDto(@Email @NotBlank String userEmail) {
 }

leaderboards/src/main/java/com/lunatech/leaderboard/dto/user/UserPostDto.java

@@ -1,14 +1,9 @@
 package com.lunatech.leaderboard.dto.user;
 
-import com.lunatech.leaderboard.entity.User;
+import javax.validation.constraints.NotBlank;
 
-public record UserPostDto(String displayName, String profilePicUrl) {
-
-    public User toEntity(String email) {
-        User user = new User();
-        user.email = email;
-        user.displayName = displayName;
-        user.profilePicUrl = profilePicUrl;
-        return user;
-    }
+public record UserPostDto(
+        @NotBlank String email,
+        @NotBlank String displayName,
+        String profilePicUrl) {
 }