[FIX] 새로고침 할 수 있는 일일문답 필드 정리 #123

Team-Umbba · Apr 3, 2024 · e7e0eec · e7e0eec
1 parent 3afd9fc
commit e7e0eec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.../src/main/java/sopt/org/umbba/api/controller/qna/dto/response/RerollCheckResponseDto.java b/.../src/main/java/sopt/org/umbba/api/controller/qna/dto/response/RerollCheckResponseDto.java
@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Builder;
 import lombok.Getter;
-import sopt.org.umbba.domain.domain.qna.QnA;
 import sopt.org.umbba.domain.domain.qna.Question;
 
 @Getter
@@ -13,18 +12,20 @@
 public class RerollCheckResponseDto {
 
     private Long questionId;
-    private String childQuestion;
-    private String parentQuestion;
-    private String section;
-    private String topic;
+    private String newQuestion;
+
+    public static RerollCheckResponseDto of(boolean isMeChild, Question question) {
+
+        String newQuestion;
+        if (isMeChild) {
+            newQuestion = question.getChildQuestion();
+        } else {
+            newQuestion = question.getParentQuestion();
+        }
 
-    public static RerollCheckResponseDto of(Question question) {
         return RerollCheckResponseDto.builder()
             .questionId(question.getId())
-            .childQuestion(question.getChildQuestion())
-            .parentQuestion(question.getParentQuestion())
-            .section(question.getSection().getValue())
-            .topic(question.getTopic())
+            .newQuestion(newQuestion)
             .build();
     }
 }
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
@@ -542,7 +542,7 @@ public RerollCheckResponseDto rerollCheck(Long userId) {
             randomQuestion = differentSectionQuestions.get(random.nextInt(differentSectionQuestions.size()));
         }
 
-        return RerollCheckResponseDto.of(randomQuestion);
+        return RerollCheckResponseDto.of(user.isMeChild(), randomQuestion);
     }
 
     @Transactional