From fc94bc22ff985d4b152c8a925715a285febe9ad9 Mon Sep 17 00:00:00 2001
From: Moon0116 <shmoon12@naver.com>
Date: Tue, 19 Aug 2025 13:39:03 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20#217=20=EC=B1=8C=EB=A6=B0=EC=A7=80?=
 =?UTF-8?q?=20=EC=8B=A4=ED=8C=A8=20=EC=8B=9C=20=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=20=EC=A1=B0=ED=9A=8C=20=EC=BF=BC=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappers/challenge/ChallengeMapper.xml     | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/mappers/challenge/ChallengeMapper.xml b/src/main/resources/mappers/challenge/ChallengeMapper.xml
index e419767..e86ded5 100644
--- a/src/main/resources/mappers/challenge/ChallengeMapper.xml
+++ b/src/main/resources/mappers/challenge/ChallengeMapper.xml
@@ -146,27 +146,18 @@
         ORDER BY end_date DESC, start_date DESC
     </select>
 
-    <!-- 챌린지 실패시 소비내역 조회 -->
+    <!-- 챌린지 실패시 소비내역 조회 (최근 7일간) -->
     <select id="getFailExpenditures" resultType="org.bbagisix.challenge.dto.ChallengeFailDTO">
         SELECT
             e.amount,
             e.description,
             e.expenditure_date as expenditureDate
         FROM expenditure e
-                 JOIN (
-            SELECT user_id, MAX(end_date) as latest_end_date
-            FROM user_challenge
-            WHERE user_id = #{userId}
-            GROUP BY user_id
-        ) uc ON e.user_id = uc.user_id
-            AND DATE(e.expenditure_date) = DATE(uc.latest_end_date)
+        JOIN challenge c ON c.challenge_id = #{challengeId}
         WHERE e.user_id = #{userId}
-          AND e.category_id = #{challengeId}
-          AND EXISTS (
-            SELECT 1
-            FROM user_challenge uc2
-            WHERE uc2.user_id = #{userId}
-              AND uc2.challenge_id = #{challengeId}
-        )
+          AND e.category_id = c.category_id
+          AND e.expenditure_date >= DATE_SUB(NOW(), INTERVAL 1 DAY)
+        ORDER BY e.expenditure_date DESC
+        LIMIT 10
     </select>
 </mapper>
\ No newline at end of file

From d67611f9be9002b21433ea75f64fdf77589a6d3d Mon Sep 17 00:00:00 2001
From: Moon0116 <shmoon12@naver.com>
Date: Tue, 19 Aug 2025 13:41:45 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20#217=20=EC=A3=BC=EC=84=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/challenge/ChallengeMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/mappers/challenge/ChallengeMapper.xml b/src/main/resources/mappers/challenge/ChallengeMapper.xml
index e86ded5..707f11d 100644
--- a/src/main/resources/mappers/challenge/ChallengeMapper.xml
+++ b/src/main/resources/mappers/challenge/ChallengeMapper.xml
@@ -146,7 +146,7 @@
         ORDER BY end_date DESC, start_date DESC
     </select>
 
-    <!-- 챌린지 실패시 소비내역 조회 (최근 7일간) -->
+    <!-- 챌린지 실패시 소비내역 조회 -->
     <select id="getFailExpenditures" resultType="org.bbagisix.challenge.dto.ChallengeFailDTO">
         SELECT
             e.amount,