diff --git a/pom.xml b/pom.xml index e7bebd0..17703a9 100644 --- a/pom.xml +++ b/pom.xml @@ -164,34 +164,7 @@ - - - com.hubspot.maven.plugins - prettier-maven-plugin - 0.16 - - 1.5.0 - 120 - 4 - false - true - true - - - - src/main/java/**/*.java - src/test/java/**/*.java - - - - - validate - - ${plugin.prettier.goal} - - - - + org.apache.maven.plugins maven-compiler-plugin diff --git a/src/main/java/de/unistuttgart/memorybackend/data/GameResult.java b/src/main/java/de/unistuttgart/memorybackend/data/GameResult.java index 4f03ef6..92f42be 100644 --- a/src/main/java/de/unistuttgart/memorybackend/data/GameResult.java +++ b/src/main/java/de/unistuttgart/memorybackend/data/GameResult.java @@ -34,14 +34,17 @@ public class GameResult { @CreationTimestamp private Date playedDay = new Date(); + int rewards; public GameResult( final Boolean isFinished, final UUID configurationAsUUID, - final String playerId + final String playerId, + final int rewards ) { this.isFinished = isFinished; this.configurationAsUUID = configurationAsUUID; this.playerId = playerId; + this.rewards = rewards; } } diff --git a/src/main/java/de/unistuttgart/memorybackend/data/GameResultDTO.java b/src/main/java/de/unistuttgart/memorybackend/data/GameResultDTO.java index 7ad69ba..43cce6a 100644 --- a/src/main/java/de/unistuttgart/memorybackend/data/GameResultDTO.java +++ b/src/main/java/de/unistuttgart/memorybackend/data/GameResultDTO.java @@ -20,10 +20,13 @@ public class GameResultDTO { @NotNull(message = "playerId cannot be null") private String playerId; - public GameResultDTO(final Boolean isFinished, final UUID configurationAsUUID, final String playerId) { + private int rewards; + + public GameResultDTO(final Boolean isFinished, final UUID configurationAsUUID, final String playerId, final int rewards) { this.isFinished = isFinished; this.configurationAsUUID = configurationAsUUID; this.playerId = playerId; + this.rewards = rewards; } diff --git a/src/main/java/de/unistuttgart/memorybackend/service/GameResultService.java b/src/main/java/de/unistuttgart/memorybackend/service/GameResultService.java index 2cbf4b8..f366454 100644 --- a/src/main/java/de/unistuttgart/memorybackend/service/GameResultService.java +++ b/src/main/java/de/unistuttgart/memorybackend/service/GameResultService.java @@ -50,6 +50,8 @@ public void saveGameResult( final int resultScore = calculateResultScore(gameResultDTO.getIsFinished()); final int rewards = calculateRewards(resultScore); + gameResultDTO.setRewards(rewards); + final OverworldResultDTO resultDTO = new OverworldResultDTO( gameResultDTO.getConfigurationAsUUID(), resultScore, @@ -61,7 +63,8 @@ public void saveGameResult( final GameResult result = new @Valid GameResult( gameResultDTO.getIsFinished(), gameResultDTO.getConfigurationAsUUID(), - userId + userId, + rewards ); gameResultRepository.save(result);