feat: 질문 조회시 공통 질문 여부 boolean 값으로 반환 되도록 추가 #3

Nexters · Aug 7, 2021 · 5b3c999 · 5b3c999
1 parent 5bd8b9c
commit 5b3c999
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/nexters/covid/base/Constant.java b/src/main/java/com/nexters/covid/base/Constant.java
@@ -0,0 +1,6 @@
+package com.nexters.covid.base;
+
+public class Constant {
+
+  public static final Long COMMON_SEND_OPTION_ID = 3L;
+}
diff --git a/src/main/java/com/nexters/covid/letter/api/dto/QuestionResponse.java b/src/main/java/com/nexters/covid/letter/api/dto/QuestionResponse.java
@@ -2,7 +2,9 @@
 
 import static org.springframework.beans.BeanUtils.copyProperties;
 
+import com.nexters.covid.base.Constant;
 import com.nexters.covid.letter.domain.question.Question;
+import com.nexters.covid.letter.domain.sendoption.SendOption;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,10 +13,15 @@
 public class QuestionResponse {
 
   private Long id;
-
   private String text;
+  private boolean commonOptionId;
 
   public QuestionResponse(Question source) {
     copyProperties(source, this);
+    this.commonOptionId = isCommonOptionId(source.getSendOption());
+  }
+
+  private boolean isCommonOptionId(SendOption sendOption) {
+    return sendOption.getId().equals(Constant.COMMON_SEND_OPTION_ID);
   }
 }
diff --git a/src/main/java/com/nexters/covid/letter/service/LetterService.java b/src/main/java/com/nexters/covid/letter/service/LetterService.java
@@ -1,5 +1,6 @@
 package com.nexters.covid.letter.service;
 
+import com.nexters.covid.base.Constant;
 import com.nexters.covid.letter.api.dto.LetterRequest;
 import com.nexters.covid.letter.api.dto.LetterResponse;
 import com.nexters.covid.letter.api.dto.OptionResponse;
@@ -20,8 +21,6 @@
 @Service
 public class LetterService {
 
-  private static final Long COMMON_SEND_OPTION_ID = 3L;
-
   private final LetterRepository letterRepository;
   private final SendOptionRepository sendOptionRepository;
   private final QuestionRepository questionRepository;
@@ -46,7 +45,7 @@ public List<OptionResponse> findAllOptions() {
   @Transactional(readOnly = true)
   public List<QuestionResponse> findQuestionsByOptionId(Long optionId) {
     return questionRepository
-        .findQuestionsBySendOptionIdEqualsOrSendOptionIdEquals(optionId, COMMON_SEND_OPTION_ID)
+        .findQuestionsBySendOptionIdEqualsOrSendOptionIdEquals(optionId, Constant.COMMON_SEND_OPTION_ID)
         .stream()
         .map(QuestionResponse::new)
         .collect(Collectors.toList());