Merge pull request #135 from TeamMiso/hotfix/push-notification-logic-fix

푸시 알림 오류 수정
TeamMiso · Dec 20, 2023 · a10ca85 · a10ca85
2 parents eaf7f26 + fce51bb
commit a10ca85
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/src/main/kotlin/andreas311/miso/domain/inquiry/repository/InquiryRepository.kt b/src/main/kotlin/andreas311/miso/domain/inquiry/repository/InquiryRepository.kt
@@ -6,5 +6,7 @@ import org.springframework.data.repository.CrudRepository
 
 interface InquiryRepository : CrudRepository<Inquiry, Long> {
 
-    fun findByUser(user: User): List<Inquiry>?
+    fun findAllByOrderByCreatedDateDesc(): List<Inquiry>
+
+    fun findByUserOrderByCreatedDateDesc(user: User): List<Inquiry>?
 }
diff --git a/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/ListAllInquiryServiceImpl.kt b/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/ListAllInquiryServiceImpl.kt
@@ -12,7 +12,7 @@ class ListAllInquiryServiceImpl(
 ) : ListAllInquiryService {
 
     override fun execute(): ListInquiryResponseDto = ListInquiryResponseDto(
-        inquiryList = inquiryRepository.findAll()
+        inquiryList = inquiryRepository.findAllByOrderByCreatedDateDesc()
             .map { InquiryResponseDto(it) }
     )
 }
diff --git a/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/ListMyInquiryServiceImpl.kt b/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/ListMyInquiryServiceImpl.kt
@@ -18,7 +18,7 @@ class ListMyInquiryServiceImpl(
 
         val user = userUtil.currentUser()
 
-        val inquiry = inquiryRepository.findByUser(user)
+        val inquiry = inquiryRepository.findByUserOrderByCreatedDateDesc(user)
             ?: throw InquiryNotFoundException()
 
         return ListInquiryResponseDto(

diff --git a/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/RespondInquiryServiceImpl.kt b/src/main/kotlin/andreas311/miso/domain/inquiry/service/impl/RespondInquiryServiceImpl.kt
@@ -36,7 +36,7 @@ class RespondInquiryServiceImpl(
 
         inquiry.updateInquiryStatus(InquiryStatus.COMPLETE)
 
-        val token = deviceTokenRepository.findByUser(user)
+        val token = deviceTokenRepository.findByUser(inquiry.user)
 
         token?.let { inquiryNotificationSendService.execute(inquiry, token.token)}
 

diff --git a/src/main/kotlin/andreas311/miso/domain/purchase/repository/PurchaseRepository.kt b/src/main/kotlin/andreas311/miso/domain/purchase/repository/PurchaseRepository.kt
@@ -6,5 +6,5 @@ import org.springframework.data.repository.CrudRepository
 
 interface PurchaseRepository : CrudRepository<Purchase, Long> {
 
-    fun findAllByUser(user: User): List<Purchase>?
+    fun findAllByUserOrderByCreatedDateDesc(user: User): List<Purchase>?
 }
diff --git a/...main/kotlin/andreas311/miso/domain/purchase/service/impl/ListMyPurchaseItemServiceImpl.kt b/...main/kotlin/andreas311/miso/domain/purchase/service/impl/ListMyPurchaseItemServiceImpl.kt
@@ -18,7 +18,7 @@ class ListMyPurchaseItemServiceImpl(
 
         val user = userUtil.currentUser()
 
-        val purchase = purchaseRepository.findAllByUser(user)
+        val purchase = purchaseRepository.findAllByUserOrderByCreatedDateDesc(user)
             ?: throw PurchaseNotFoundException()
 
         return ListMyPurchaseItemResponseDto(