From 980a17e3154748bcb80d477517f126ade42c46d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=A0=95=EB=B9=88?= Date: Sat, 18 Apr 2026 14:39:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=EB=B0=B0=ED=8B=80=20=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=EC=9D=BC=20=EA=B8=B0=EC=A4=80=20=EB=82=B4=EB=A6=BC?= =?UTF-8?q?=EC=B0=A8=EC=88=9C=20=ED=95=98=EC=97=AC=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/persistence/rival/battle/BattleJpaRepository.java | 2 ++ 1 file changed, 2 insertions(+) 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..7a5bff848 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.started_at DESC """, nativeQuery = true) List findPendingBattlesByUserId(@Param("userId") Long userId); } \ No newline at end of file From eeeb1de6a80c00cf73f775bc34b7eb87c10e840f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=99=A9=EC=A0=95=EB=B9=88?= Date: Sat, 18 Apr 2026 14:42:00 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20PENDING=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EC=9D=98=20=EB=B0=B0=ED=8B=80=EC=9D=80=20=EC=83=9D=EC=84=B1=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=20=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/persistence/rival/battle/BattleJpaRepository.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7a5bff848..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 @@ -125,7 +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.started_at DESC + ORDER BY b.created_at DESC """, nativeQuery = true) List findPendingBattlesByUserId(@Param("userId") Long userId); } \ No newline at end of file