Merge pull request #204 from prgrms-web-devcourse-final-project/refactor/hide-draft-in-inbox-detail(WR9-121)

refactor: 내 편지함에서 임시저장된 편지 안보이게 쿼리 수정 (WR9-121)

Author: Kojinyoung7220

src/main/java/io/crops/warmletter/domain/letter/repository/LetterMatchingRepository.java

@@ -41,7 +41,7 @@ public interface LetterMatchingRepository extends JpaRepository<LetterMatching,
             "COALESCE(COUNT(l), 0)" +
             ") " +
             "FROM LetterMatching lm " +
-            "LEFT JOIN Letter l ON lm.id = l.matchingId AND (l.status = 'DELIVERED' OR l.writerId = :myId) AND l.isActive = true " +
+            "LEFT JOIN Letter l ON lm.id = l.matchingId AND (l.status = 'DELIVERED' OR (l.writerId = :myId AND l.status != 'SAVED')) AND l.isActive = true " +
             "JOIN Member m ON (CASE WHEN lm.firstMemberId = :myId THEN lm.secondMemberId ELSE lm.firstMemberId END) = m.id " +
             "WHERE (lm.firstMemberId = :myId OR lm.secondMemberId = :myId) " +
             "GROUP BY lm.id, m.zipCode, lm.isActive " +

src/main/java/io/crops/warmletter/domain/letter/repository/LetterRepository.java

@@ -38,8 +38,10 @@ public interface LetterRepository extends JpaRepository<Letter, Long> {
 
     Optional<Letter> findByIdAndWriterId(Long letterId, Long writerId);
 
-    @Query("SELECT l FROM Letter l WHERE l.matchingId = :matchingId AND l.isActive = true " +
+    @Query("SELECT l FROM Letter l WHERE l.matchingId = :matchingId " +
+            "AND l.isActive = true " +
             "AND (l.writerId = :currentUserId OR l.status = 'DELIVERED') " +
+            "AND (l.writerId != :currentUserId OR l.status != 'SAVED') " +
             "ORDER BY l.id DESC")
     Page<Letter> findDeliveredOrMyLettersByMatchingId(
             @Param("matchingId") Long matchingId,