updated overview logic

Gamify-IT · Jul 1, 2024 · 6b86367 · 6b86367
1 parent 03f4f3f
commit 6b86367
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -164,34 +164,7 @@
 						</manifest>
 					</archive>
 				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>com.hubspot.maven.plugins</groupId>
-				<artifactId>prettier-maven-plugin</artifactId>
-				<version>0.16</version>
-				<configuration>
-					<prettierJavaVersion>1.5.0</prettierJavaVersion>
-					<printWidth>120</printWidth>
-					<tabWidth>4</tabWidth>
-					<useTabs>false</useTabs>
-					<ignoreConfigFile>true</ignoreConfigFile>
-					<ignoreEditorConfig>true</ignoreEditorConfig>
-					<!-- Use <inputGlobs> to override the default input patterns -->
-					<inputGlobs>
-						<!-- These are the default patterns, you can omit <inputGlobs> entirely unless you want to override them -->
-						<inputGlob>src/main/java/**/*.java</inputGlob>
-						<inputGlob>src/test/java/**/*.java</inputGlob>
-					</inputGlobs>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>validate</phase>
-						<goals>
-							<goal>${plugin.prettier.goal}</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
+			</plugin>		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

diff --git 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
@@ -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
@@ -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);