From dee329951d40326efec9bb9a5d608a74e6363c3a Mon Sep 17 00:00:00 2001 From: Miseong Kim Date: Thu, 3 Oct 2024 22:46:45 +0900 Subject: [PATCH] =?UTF-8?q?[Fix/487]=20=EA=B1=B0=EC=A0=88=EB=90=9C=20?= =?UTF-8?q?=EB=B3=B4=ED=8B=80=20=EC=A1=B0=ED=9A=8C=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=A1=B0=EA=B1=B4=EC=9D=84=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=9C=EB=8B=A4=20(#488)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bottles/app/bottle/repository/BottleRepository.kt | 8 +++++--- .../nexters/bottles/app/bottle/service/BottleService.kt | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/nexters/bottles/app/bottle/repository/BottleRepository.kt b/app/src/main/kotlin/com/nexters/bottles/app/bottle/repository/BottleRepository.kt index ee4b1fd5..ecb767ca 100644 --- a/app/src/main/kotlin/com/nexters/bottles/app/bottle/repository/BottleRepository.kt +++ b/app/src/main/kotlin/com/nexters/bottles/app/bottle/repository/BottleRepository.kt @@ -25,12 +25,14 @@ interface BottleRepository : JpaRepository { @Query( value = "SELECT b FROM Bottle b " + - "WHERE b.targetUser = :targetUser AND b.expiredAt > :currentDateTime AND b.bottleStatus IN :bottleStatus " + - "AND b.deleted = false AND b.targetUser.deleted = false AND b.sourceUser.deleted = false " + "WHERE b.targetUser = :targetUser AND b.expiredAt > :currentDateTime AND b.bottleStatus IN :bottleStatus AND b.pingPongStatus IN :pingpPongStatus " + + "AND b.deleted = false AND b.targetUser.deleted = false AND b.sourceUser.deleted = false " + + "ORDER BY b.createdAt desc " ) - fun findAllByTargetUserAndBottleStatusAndNotExpiredAndDeletedFalse( + fun findAllByTargetUserAndStatusesAndNotExpiredAndDeletedFalseOrderByCreatedDesc( @Param("targetUser") targetUser: User, @Param("bottleStatus") bottleStatus: Set, + @Param("pingPongStatus") pingPongStatus: Set, @Param("currentDateTime") currentDateTime: LocalDateTime ): List diff --git a/app/src/main/kotlin/com/nexters/bottles/app/bottle/service/BottleService.kt b/app/src/main/kotlin/com/nexters/bottles/app/bottle/service/BottleService.kt index 702aac03..ca064269 100644 --- a/app/src/main/kotlin/com/nexters/bottles/app/bottle/service/BottleService.kt +++ b/app/src/main/kotlin/com/nexters/bottles/app/bottle/service/BottleService.kt @@ -12,7 +12,6 @@ import com.nexters.bottles.app.bottle.repository.LetterRepository import com.nexters.bottles.app.bottle.repository.dto.UsersCanBeMatchedDto import com.nexters.bottles.app.user.domain.User import com.nexters.bottles.app.user.repository.UserRepository -import mu.KotlinLogging import org.springframework.data.repository.findByIdOrNull import org.springframework.stereotype.Service import org.springframework.transaction.annotation.Transactional @@ -38,9 +37,10 @@ class BottleService( @Transactional(readOnly = true) fun getNewBottlesByBottleStatus(user: User, statusSet: Set): List { - return bottleRepository.findAllByTargetUserAndBottleStatusAndNotExpiredAndDeletedFalse( + return bottleRepository.findAllByTargetUserAndStatusesAndNotExpiredAndDeletedFalseOrderByCreatedDesc( user, statusSet, + setOf(PingPongStatus.NONE), LocalDateTime.now() ) }