Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] 과거 QnA 조회 로직 rollback #143

Merged
merged 1 commit into from
Mar 23, 2024
Merged

[FIX] 과거 QnA 조회 로직 rollback #143

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions umbba-api/src/main/java/sopt/org/umbba/api/service/qna/QnAService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,30 +184,14 @@ 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);

List<User> opponentUserList = userRepository.findUserByParentChild(parentchild)
.stream()
.filter(user -> !user.getId().equals(userId))
.collect(Collectors.toList());

List<QnA> qnaList = getQnAListByParentchild(parentchild);

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);
return SingleQnAResponseDto.of(myUser, opponentUser, qnaList.indexOf(targetQnA) + 1, targetQnA, todayQuestion);
}

@Transactional
Expand Down
Loading