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 index 434dc8f5..d72cd395 100644 --- 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 @@ -302,10 +302,15 @@ public GetMainViewResponseDto getMainInfo(Long userId) { List qnaList = getQnAListByParentchild(parentchild); - QnA lastQna = qnaList.get(parentchild.getCount()-1); + QnA currentQnA = qnaList.get(parentchild.getCount()-1); log.info("getCount(): {}", parentchild.getCount()); - return GetMainViewResponseDto.of(lastQna, parentchild.getCount()); + if (parentchild.getCount() == 7 && (currentQnA.isParentAnswer() && currentQnA.isChildAnswer())) { + return GetMainViewResponseDto.of(currentQnA, parentchild.getCount()+1); // 유효하지 않은 8로 반환 시 엔딩이벤트 + } + + + return GetMainViewResponseDto.of(currentQnA, parentchild.getCount()); } @NotNull