fix: 작성 편지 리스트 조회시 발송 옵션 텍스트도 같이 보이도록 수정 #3

Nexters · Aug 11, 2021 · 24032ed · 24032ed
1 parent e3df571
commit 24032ed
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/src/main/java/com/nexters/covid/letter/api/dto/LetterResponse.java b/src/main/java/com/nexters/covid/letter/api/dto/LetterResponse.java
@@ -28,13 +28,20 @@ public class LetterResponse {
 
   private String encryptedId;
 
+  private String sendOptionText;
+
   private LocalDateTime createdDate;
 
   public LetterResponse(Letter source) {
     copyProperties(source, this);
     this.contents = decodeContents(source.getContents());
   }
 
+  public LetterResponse(Letter source, String sendOptionText) {
+    this(source);
+    this.sendOptionText = sendOptionText;
+  }
+
   private String decodeContents(String contents) {
     return new String(decodeBase64(contents));
   }

diff --git a/src/main/java/com/nexters/covid/letter/domain/question/Question.java b/src/main/java/com/nexters/covid/letter/domain/question/Question.java
@@ -26,4 +26,8 @@ public class Question {
   private SendOption sendOption;
 
   private String text;
+
+  public boolean isMatch(Long questionId) {
+    return id.equals(questionId);
+  }
 }
diff --git a/src/main/java/com/nexters/covid/letter/domain/sendoption/SendOption.java b/src/main/java/com/nexters/covid/letter/domain/sendoption/SendOption.java
@@ -31,7 +31,12 @@ public class SendOption {
   @OneToMany(mappedBy = "sendOption", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
   private final List<Question> questions = new ArrayList<>();
 
-  public List<Question> questions() {
-    return questions;
+  public boolean isMatchQuestion(Long questionId) {
+    for (Question question : questions) {
+      if (question.isMatch(questionId)) {
+        return true;
+      }
+    }
+    return false;
   }
 }
diff --git a/src/main/java/com/nexters/covid/letter/service/LetterService.java b/src/main/java/com/nexters/covid/letter/service/LetterService.java
@@ -8,6 +8,7 @@
 import com.nexters.covid.letter.domain.Letter;
 import com.nexters.covid.letter.domain.LetterRepository;
 import com.nexters.covid.letter.domain.question.QuestionRepository;
+import com.nexters.covid.letter.domain.sendoption.SendOption;
 import com.nexters.covid.letter.domain.sendoption.SendOptionRepository;
 import com.nexters.covid.user.domain.User;
 import com.nexters.covid.user.domain.UserRepository;
@@ -30,10 +31,21 @@ public class LetterService {
   public List<LetterResponse> findLettersByEmail(String email) {
     return letterRepository.findLettersByEmailOrderByCreatedDateDesc(email)
         .stream()
-        .map(LetterResponse::new)
+        .map(l -> new LetterResponse(l, findSendOptionByQuestionId(l.getQuestionId())))
         .collect(Collectors.toList());
   }
 
+  @Transactional(readOnly = true)
+  public String findSendOptionByQuestionId(Long questionId) {
+    List<SendOption> options = sendOptionRepository.findAllJoinFetch();
+
+    return options.stream()
+        .filter(o -> o.isMatchQuestion(questionId))
+        .map(SendOption::getText)
+        .findAny()
+        .orElseThrow(() -> new IllegalArgumentException("발송 옵션이 존재하지 않습니다."));
+  }
+
   @Transactional(readOnly = true)
   public List<OptionResponse> findAllOptions() {
     return sendOptionRepository.findAll()
@@ -45,7 +57,8 @@ public List<OptionResponse> findAllOptions() {
   @Transactional(readOnly = true)
   public List<QuestionResponse> findQuestionsByOptionId(Long optionId) {
     return questionRepository
-        .findQuestionsBySendOptionIdEqualsOrSendOptionIdEquals(optionId, Constant.COMMON_SEND_OPTION_ID)
+        .findQuestionsBySendOptionIdEqualsOrSendOptionIdEquals(optionId,
+            Constant.COMMON_SEND_OPTION_ID)
         .stream()
         .map(QuestionResponse::new)
         .collect(Collectors.toList());