fix: fixed nullpointer

Arquisoft · Apr 9, 2024 · b902cfb · b902cfb
1 parent 28160d1
commit b902cfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/api/src/main/java/lab/en2b/quizapi/game/mappers/GameResponseDtoMapper.java b/api/src/main/java/lab/en2b/quizapi/game/mappers/GameResponseDtoMapper.java
@@ -22,7 +22,7 @@ public GameResponseDto apply(Game game) {
                 .correctlyAnsweredQuestions(game.getCorrectlyAnsweredQuestions())
                 .actualRound(game.getActualRound())
                 .roundDuration(game.getRoundDuration())
-                .roundStartTime(Instant.ofEpochMilli(game.getRoundStartTime()).toString())
+                .roundStartTime(game.getRoundStartTime() != null?  Instant.ofEpochMilli(game.getRoundStartTime()).toString(): null)
                 .isGameOver(game.isGameOver())
                 .build();
     }

diff --git a/api/src/test/java/lab/en2b/quizapi/game/GameServiceTest.java b/api/src/test/java/lab/en2b/quizapi/game/GameServiceTest.java
@@ -144,6 +144,7 @@ void setUp() {
                 .questions(new ArrayList<>())
                 .rounds(9L)
                 .actualRound(0L)
+                .roundStartTime(0L)
                 .correctlyAnsweredQuestions(0L)
                 .language("en")
                 .roundDuration(30)
@@ -170,7 +171,7 @@ public void startRound(){
         GameResponseDto result = defaultGameResponseDto;
         result.setActualRound(1L);
         result.setId(1L);
-        result.setRoundStartTime(defaultGame.getRoundStartTime());
+        result.setRoundStartTime(Instant.ofEpochMilli(defaultGame.getRoundStartTime()).toString());
         assertEquals(result, gameDto);
     }
 
@@ -220,7 +221,7 @@ public void getCurrentQuestionRoundFinished() {
         when(questionService.findRandomQuestion(any())).thenReturn(defaultQuestion);
         when(userService.getUserByAuthentication(authentication)).thenReturn(defaultUser);
         gameService.startRound(1L,authentication);
-        defaultGame.setRoundStartTime(Instant.now().minusSeconds(100).toString());
+        defaultGame.setRoundStartTime(Instant.now().minusSeconds(100).toEpochMilli());
         assertThrows(IllegalStateException.class, () -> gameService.getCurrentQuestion(1L,authentication));
     }
 
@@ -285,7 +286,7 @@ public void answerQuestionWhenRoundHasFinished(){
         when(questionService.findRandomQuestion(any())).thenReturn(defaultQuestion);
         gameService.newGame(authentication);
         gameService.startRound(1L, authentication);
-        defaultGame.setRoundStartTime(Instant.now().minusSeconds(100).toString());
+        defaultGame.setRoundStartTime(Instant.now().minusSeconds(100).toEpochMilli());
         assertThrows(IllegalStateException.class, () -> gameService.answerQuestion(1L, new GameAnswerDto(1L), authentication));
     }