diff --git a/src/main/java/com/process/clash/adapter/persistence/rival/battle/BattleJpaRepository.java b/src/main/java/com/process/clash/adapter/persistence/rival/battle/BattleJpaRepository.java index 637ac2928..ed759558b 100644 --- a/src/main/java/com/process/clash/adapter/persistence/rival/battle/BattleJpaRepository.java +++ b/src/main/java/com/process/clash/adapter/persistence/rival/battle/BattleJpaRepository.java @@ -49,6 +49,7 @@ AND b.id NOT IN ( LEFT JOIN rivals r ON b.fk_rival_id = r.id WHERE (r.fk_first_user_id = :userId OR r.fk_second_user_id = :userId) AND b.battle_status NOT IN ('REJECTED', 'PENDING', 'CANCELED') + ORDER BY b.started_at DESC """, nativeQuery = true) List findByUserIdWithOutRejected(@Param("userId") Long userId); @@ -124,6 +125,7 @@ AND b.end_at < NOW() LEFT JOIN rivals r ON b.fk_rival_id = r.id WHERE (r.fk_first_user_id = :userId OR r.fk_second_user_id = :userId) AND b.battle_status = 'PENDING' + ORDER BY b.created_at DESC """, nativeQuery = true) List findPendingBattlesByUserId(@Param("userId") Long userId); } \ No newline at end of file