diff --git a/src/main/resources/mappers/challenge/ChallengeMapper.xml b/src/main/resources/mappers/challenge/ChallengeMapper.xml index e419767..707f11d 100644 --- a/src/main/resources/mappers/challenge/ChallengeMapper.xml +++ b/src/main/resources/mappers/challenge/ChallengeMapper.xml @@ -153,20 +153,11 @@ 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 \ No newline at end of file