Merge pull request #104 from ASAP-Lettering/ASAP-209

ASAP-209 fix: 궤도 편지 정렬 순서 변경
ASAP-Lettering · Oct 21, 2024 · 59fdbb0 · 59fdbb0
2 parents 7ffd5d9 + ab9509a
commit 59fdbb0
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterQueryService.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterQueryService.kt
@@ -44,7 +44,10 @@ class LetterQueryService(
     }
 
     override fun getAll(queryAll: GetIndependentLettersUsecase.QueryAll): GetIndependentLettersUsecase.Response.All {
-        val letters = independentLetterManagementPort.getAllByReceiverId(DomainId(queryAll.userId))
+        val letters =
+            independentLetterManagementPort
+                .getAllByReceiverId(DomainId(queryAll.userId))
+                .sortedByDescending { it.movedAt }
         return GetIndependentLettersUsecase.Response.All(
             letters =
                 letters.map {

diff --git a/...-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt b/...-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt
@@ -405,13 +405,14 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
                     spaceId = space.id.value,
                 )
 
-            (0..1).forEach { _ ->
-                letterMockManager.generateMockIndependentLetter(
-                    senderId = senderId,
-                    receiverId = receiverId,
-                    senderName = "senderUsername",
-                )
-            }
+            val independentLetters =
+                (0..1).map { _ ->
+                    letterMockManager.generateMockIndependentLetter(
+                        senderId = senderId,
+                        receiverId = receiverId,
+                        senderName = "senderUsername",
+                    )
+                }
 
             mockMvc.put("/api/v1/spaces/letters/${spaceLetter.id.value}/independent") {
                 contentType = MediaType.APPLICATION_JSON
@@ -424,6 +425,7 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
                     contentType = MediaType.APPLICATION_JSON
                     header("Authorization", "Bearer $accessToken")
                 }
+
             // then
             result
                 .andExpect {
@@ -437,6 +439,18 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
                             isNotEmpty()
                             value(spaceLetter.id.value)
                         }
+                        jsonPath("$.content[1].letterId") {
+                            exists()
+                            isString()
+                            isNotEmpty()
+                            value(independentLetters[1].id.value)
+                        }
+                        jsonPath("$.content[2].letterId") {
+                            exists()
+                            isString()
+                            isNotEmpty()
+                            value(independentLetters[0].id.value)
+                        }
                     }
                 }.andDo { print() }
         }
@@ -940,7 +954,7 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
     }
 
     @Nested
-    inner class DeleteSendLetter  {
+    inner class DeleteSendLetter {
         @Test
         fun deleteSendLetter() {
             // given
@@ -969,7 +983,7 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
         }
 
         @Test
-        fun deleteSendLetters()  {
+        fun deleteSendLetters() {
             // given
             val senderId = userMockManager.settingUser()
             val accessToken = jwtMockManager.generateAccessToken(senderId)

diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/IndependentLetter.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/IndependentLetter.kt
@@ -72,4 +72,7 @@ class IndependentLetter(
         this.content.delete()
         this.sender.delete()
     }
+
+    override fun toString(): String =
+        "IndependentLetter(content=$content, sender=$sender, receiver=$receiver, receiveDate=$receiveDate, movedAt=$movedAt, isOpened=$isOpened)"
 }
diff --git a/.../main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveLetterManagementJpaAdapter.kt b/.../main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveLetterManagementJpaAdapter.kt
@@ -42,7 +42,6 @@ class ReceiveLetterManagementJpaAdapter(
         receiveLetterJpaRepository
             .findAllIndependentLetterBy(receiverId.value)
             .map { ReceiverLetterMapper.toIndependentLetter(it) }
-            .sortedByDescending { it.receiveDate }
 
     override fun getIndependentLetterByIdNotNull(id: DomainId): IndependentLetter =
         receiveLetterJpaRepository