fix: 종료된 질문 응답 시, 답변이 없을 경우 버그 수정

depromeet · Aug 4, 2024 · 66b76c3 · 66b76c3
1 parent d44e561
commit 66b76c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/...promeet/sambad/moring/meeting/question/infrastructure/MeetingQuestionQueryRepository.java b/...promeet/sambad/moring/meeting/question/infrastructure/MeetingQuestionQueryRepository.java
@@ -131,15 +131,15 @@ private OrderSpecifier<Integer> orderDescByMeetingAnswerCount() {
 		return new OrderSpecifier<>(Order.DESC, meetingQuestion.memberAnswers.size());
 	}
 
-	private Answer getBestAnswer(MeetingQuestion meetingQuestion) {
-		return queryFactory
+	private Optional<Answer> getBestAnswer(MeetingQuestion meetingQuestion) {
+		return Optional.ofNullable(queryFactory
 			.select(meetingAnswer.answer)
 			.from(meetingAnswer)
 			.where(meetingAnswer.meetingQuestion.eq(meetingQuestion))
 			.groupBy(meetingAnswer.answer)
 			.orderBy(meetingAnswer.count().desc())
 			.limit(1)
-			.fetchOne();
+			.fetchOne());
 	}
 
 	private Boolean isAnswered(Long meetingQuestionId, Long meetingMemberId) {

diff --git a/...meeting/question/presentation/response/MostInactiveMeetingQuestionListResponseDetail.java b/...meeting/question/presentation/response/MostInactiveMeetingQuestionListResponseDetail.java
@@ -1,6 +1,8 @@
 package org.depromeet.sambad.moring.meeting.question.presentation.response;
 
-import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
+import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.*;
+
+import java.util.Optional;
 
 import org.depromeet.sambad.moring.answer.domain.Answer;
 import org.depromeet.sambad.moring.meeting.meeting.domain.Meeting;
@@ -17,7 +19,7 @@ public record MostInactiveMeetingQuestionListResponseDetail(
 	@Schema(example = "갖고 싶은 초능력은?", description = "모임 질문 TITLE", requiredMode = REQUIRED)
 	String title,
 
-	@Schema(example = "순간이동", description = "가장 많이 선택한 답변", requiredMode = REQUIRED)
+	@Schema(example = "순간이동", description = "가장 많이 선택한 답변", requiredMode = NOT_REQUIRED)
 	String content,
 
 	@Schema(example = "70", description = "참여율, 소수점 첫째 자리에서 반올림하여 반환합니다.", requiredMode = REQUIRED)
@@ -27,13 +29,14 @@ public record MostInactiveMeetingQuestionListResponseDetail(
 	Long startTime
 ) {
 
-	public static MostInactiveMeetingQuestionListResponseDetail of(MeetingQuestion meetingQuestion, Answer bestAnswer) {
+	public static MostInactiveMeetingQuestionListResponseDetail of(MeetingQuestion meetingQuestion,
+		Optional<Answer> bestAnswer) {
 		Meeting meeting = meetingQuestion.getMeeting();
 
 		return MostInactiveMeetingQuestionListResponseDetail.builder()
 			.meetingQuestionId(meetingQuestion.getId())
 			.title(meetingQuestion.getQuestion().getTitle())
-			.content(bestAnswer.getContent())
+			.content(bestAnswer.isPresent() ? bestAnswer.get().getContent() : null)
 			.engagementRate(meeting.calculateEngagementRate(meetingQuestion))
 			.startTime(meetingQuestion.getEpochMilliStartTime())
 			.build();