Merge pull request #141 from Team-Umbba/fix/#140-tutorial_bug_fix

[CHORE] 튜토리얼 첫 번째 QnA 조회 로직 버그 해결
Team-Umbba · Mar 20, 2024 · 694d790 · 694d790
2 parents 0caa8a2 + d5f094c
commit 694d790
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java b/umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java
@@ -184,14 +184,30 @@ public List<QnAListResponseDto> getQnaList(Long userId, Long sectionId) {
     public SingleQnAResponseDto getSingleQna(Long userId, Long qnaId) {
         User myUser = getUserById(userId);
         Parentchild parentchild = getParentchildByUser(myUser);
-
-        User opponentUser = getOpponentByParentchild(parentchild, userId);
         QnA targetQnA = getQnAById(qnaId);
         Question todayQuestion = targetQnA.getQuestion();
-
         List<QnA> qnaList = getQnAListByParentchild(parentchild);
 
-        return SingleQnAResponseDto.of(myUser, opponentUser, qnaList.indexOf(targetQnA) + 1, targetQnA, todayQuestion);
+        List<User> opponentUserList = userRepository.findUserByParentChild(parentchild)
+            .stream()
+            .filter(user -> !user.getId().equals(userId))
+            .collect(Collectors.toList());
+
+
+        if (opponentUserList.isEmpty()) {
+            boolean isFirstQnA = qnaList.get(0).equals(targetQnA);
+
+            if (isFirstQnA) {
+                return SingleQnAResponseDto.of(myUser, null, 1, targetQnA, todayQuestion);
+            } else {
+                throw new CustomException(ErrorType.PARENTCHILD_HAVE_NO_OPPONENT);
+            }
+        }
+
+        int index = qnaList.indexOf(targetQnA) + 1;
+        User opponentUser = opponentUserList.get(0);
+
+        return SingleQnAResponseDto.of(myUser, opponentUser, index, targetQnA, todayQuestion);
     }
 
     @Transactional