Merge pull request #565 from bounswe/develop

bounswe · Nov 24, 2024 · fcb6698 · fcb6698
2 parents 7227ea9 + 8f28da4
commit fcb6698
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 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;
+        }
+    }
 }
diff --git a/frontend/src/services/exercism.ts b/frontend/src/services/exercism.ts
@@ -1,5 +1,5 @@
 import * as reactQuery from "@tanstack/react-query";
-const SERVER_URL = "http://64.226.72.194:8000";
+const SERVER_URL = "https://exercism.mmtf.workers.dev";
 
 interface SearchResult {
   slug: string;