fix: answers requiring authentication

bounswe · Nov 24, 2024 · 8f28da4 · 8f28da4
1 parent b70f716
commit 8f28da4
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/backend/src/main/java/com/group1/programminglanguagesforum/Services/AnswerService.java b/backend/src/main/java/com/group1/programminglanguagesforum/Services/AnswerService.java
@@ -71,9 +71,10 @@ public CreateAnswerResponseDto updateAnswer(Long answerId, CreateAnswerRequestDt
                 .build();
     }
 
-    public GetAnswersResponseDto getAnswersForQuestion(Long questionId) throws UnauthorizedAccessException {
+    public GetAnswersResponseDto getAnswersForQuestion(Long questionId) {
         Question question = questionService.findById(questionId).orElseThrow();
-        User currentUser = userContextService.getCurrentUser();
+        final User currentUser = getCurrentUserOrNull();
+
         return GetAnswersResponseDto.builder()
                 .items(question.getAnswers().stream().map(answer -> GetAnswersResponseDto.AnswerResponseDto.builder()
                         .id(answer.getId())
@@ -90,9 +91,17 @@ public GetAnswersResponseDto getAnswersForQuestion(Long questionId) throws Unaut
                         .updatedAt(answer.getUpdatedAt())
                         .upvoteCount(answer.getUpvoteCount())
                         .downvoteCount(answer.getDownvoteCount())
-                        .selfAnswer(currentUser!=null && currentUser.getId().equals(answer.getAnsweredBy().getId()))
+                        .selfAnswer(currentUser != null && currentUser.getId().equals(answer.getAnsweredBy().getId()))
                         .build()).toList())
                 .totalItems(question.getAnswers().size())
                 .build();
     }
+
+    private User getCurrentUserOrNull() {
+        try {
+            return userContextService.getCurrentUser();
+        } catch (UnauthorizedAccessException e) {
+            return null;
+        }
+    }
 }