ASAP-390 실물 편지 임시저장 삭제, 저장한 수 조회 api 추가

tlarbals824 · tlarbals824 · commit 1c41cfcead1f · 2025-01-27T10:26:56.000+09:00
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/GetPhysicalDraftLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/GetPhysicalDraftLetterUsecase.kt
@@ -8,6 +8,8 @@ interface GetPhysicalDraftLetterUsecase {
 
     fun getByKey(query: Query.ByKey): Response.ByKey
 
+    fun count(query: Query.All): Response.Count
+
     sealed class Query {
         data class All(
             val userId: String,
@@ -31,5 +33,9 @@ interface GetPhysicalDraftLetterUsecase {
             val images: List<String>,
             val lastUpdated: LocalDateTime,
         ) : Response()
+
+        data class Count(
+            val count: Int,
+        ) : Response()
     }
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/RemoveDraftLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/RemoveDraftLetterUsecase.kt
@@ -1,21 +1,23 @@
 package com.asap.application.letter.port.`in`
 
 interface RemoveDraftLetterUsecase {
-    fun deleteBy(command: Command.Draft)
+    fun deleteBy(command: Command.Send)
 
     fun deleteBy(command: Command.User)
 
-//    data class Command(
-//        val draftId: String,
-//        val userId: String,
-//    )
+    fun deleteBy(command: Command.Physical)
 
     sealed class Command  {
         data class User(
             val userId: String,
         ) : Command()
 
-        data class Draft(
+        data class Send(
+            val draftId: String,
+            val userId: String,
+        ) : Command()
+
+        data class Physical(
             val draftId: String,
             val userId: String,
         ) : Command()
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/out/ReceiveDraftLetterManagementPort.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/out/ReceiveDraftLetterManagementPort.kt
@@ -9,4 +9,8 @@ interface ReceiveDraftLetterManagementPort {
     fun getDraftLetterNotNull(draftId: DomainId, ownerId: DomainId): ReceiveDraftLetter
 
     fun getAllDrafts(ownerId: DomainId): List<ReceiveDraftLetter>
+
+    fun countDrafts(ownerId: DomainId): Int
+
+    fun remove(receiveDraftLetter: ReceiveDraftLetter)
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/service/DraftLetterCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/service/DraftLetterCommandService.kt
@@ -46,7 +46,7 @@ class DraftLetterCommandService(
         draftLetterManagementPort.save(draftLetter)
     }
 
-    override fun deleteBy(command: RemoveDraftLetterUsecase.Command.Draft) {
+    override fun deleteBy(command: RemoveDraftLetterUsecase.Command.Send) {
         draftLetterManagementPort
             .getDraftLetterNotNull(
                 draftId = DomainId(command.draftId),
@@ -64,6 +64,16 @@ class DraftLetterCommandService(
             }
     }
 
+    override fun deleteBy(command: RemoveDraftLetterUsecase.Command.Physical) {
+        receiveDraftLetterManagementPort
+            .getDraftLetterNotNull(
+                draftId = DomainId(command.draftId),
+                ownerId = DomainId(command.userId),
+            ).let {
+                receiveDraftLetterManagementPort.remove(it)
+            }
+    }
+
     override fun command(command: UpdateDraftLetterUsecase.Command.Physical) {
         val receiveDraftLetter =
             receiveDraftLetterManagementPort.getDraftLetterNotNull(
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/service/DraftLetterQueryService.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/service/DraftLetterQueryService.kt
@@ -78,4 +78,9 @@ class DraftLetterQueryService(
             lastUpdated = draft.lastUpdated
         )
     }
+
+    override fun count(query: GetPhysicalDraftLetterUsecase.Query.All): GetPhysicalDraftLetterUsecase.Response.Count {
+        val count = receiveDraftLetterManagementPort.countDrafts(DomainId(query.userId))
+        return GetPhysicalDraftLetterUsecase.Response.Count(count)
+    }
 }
diff --git a/Application-Module/src/test/kotlin/com/asap/application/letter/service/DraftLetterCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/letter/service/DraftLetterCommandServiceTest.kt
@@ -62,7 +62,7 @@ class DraftLetterCommandServiceTest :
         }
 
         given("임시 저장 편지를 삭제할 때") {
-            val command = RemoveDraftLetterUsecase.Command.Draft(draftId = "draftId", userId = "userId")
+            val command = RemoveDraftLetterUsecase.Command.Send(draftId = "draftId", userId = "userId")
             val draftLetter = DraftLetter.default(DomainId(command.userId))
             every {
                 mockGenerateDraftKeyUsecase.getDraftLetterNotNull(
@@ -135,4 +135,38 @@ class DraftLetterCommandServiceTest :
                 }
             }
         }
+
+        given("받은 임시 저장편지를 삭제할 때"){
+
+            `when`("사용자 아이디와 임시 저장 편지 아이디를 입력하면"){
+                val command = RemoveDraftLetterUsecase.Command.Physical(draftId = "draftId", userId = "userId")
+                val receiveDraftLetter = ReceiveDraftLetter.default(DomainId(command.userId))
+                every {
+                    mockReceiveDraftLetterManagementPort.getDraftLetterNotNull(
+                        draftId = receiveDraftLetter.id,
+                        ownerId = receiveDraftLetter.ownerId,
+                    )
+                } returns receiveDraftLetter
+                draftLetterCommandService.deleteBy(command)
+                then("받은 임시 저장편지를 삭제한다"){
+                    verify { mockReceiveDraftLetterManagementPort.remove(any()) }
+                }
+            }
+
+            `when`("임시 저장 편지가 없으면"){
+
+                val command = RemoveDraftLetterUsecase.Command.Physical(draftId = "draftId", userId = "userId")
+                every {
+                    mockReceiveDraftLetterManagementPort.getDraftLetterNotNull(
+                        draftId = DomainId(command.draftId),
+                        ownerId = DomainId(command.userId),
+                    )
+                } throws LetterException.DraftLetterNotFoundException()
+                then("임시 저장 편지가 삭제되지 않는다"){
+                    verify(exactly = 0) {
+                        mockReceiveDraftLetterManagementPort.remove(any())
+                    }
+                }
+            }
+        }
     })
diff --git a/Application-Module/src/test/kotlin/com/asap/application/letter/service/DraftLetterQueryServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/letter/service/DraftLetterQueryServiceTest.kt
@@ -144,4 +144,17 @@ class DraftLetterQueryServiceTest :
                 }
             }
         }
+
+        given("임시 저장한 실물 편지 개수를 조회할 때") {
+            val userId = "userId"
+            val query = GetPhysicalDraftLetterUsecase.Query.All(userId)
+            val draftCount = 1
+            every { mockReceiveLetterManagementPort.countDrafts(DomainId(userId)) } returns draftCount
+            `when`("사용자 아이디를 입력하면") {
+                val response = draftLetterQueryService.count(query)
+                then("임시 저장한 실물 편지 개수를 반환한다") {
+                    response.count shouldBe draftCount
+                }
+            }
+        }
     })
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/DraftLetterApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/DraftLetterApi.kt
@@ -174,6 +174,25 @@ interface DraftLetterApi {
         @AccessUser userId: String,
     ): GetDraftLetterCountResponse
 
+    @Operation(summary = "실물 편지 임시 저장 개수 조회")
+    @GetMapping("/physical/count")
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "임시 저장 개수 조회 성공",
+                content = [
+                    Content(
+                        schema = Schema(implementation = GetPhysicalDraftLetterCountResponse::class),
+                    ),
+                ],
+            ),
+        ],
+    )
+    fun getPhysicalDraftCount(
+        @AccessUser userId: String,
+    ): GetPhysicalDraftLetterCountResponse
+
     @Operation(summary = "임시 저장 삭제")
     @DeleteMapping("/{draftId}")
     @ApiResponses(
@@ -185,4 +204,16 @@ interface DraftLetterApi {
         @PathVariable draftId: String,
         @AccessUser userId: String,
     )
+
+    @Operation(summary = "실물 편지 임시 저장 삭제")
+    @DeleteMapping("/physical/{draftId}")
+    @ApiResponses(
+        value = [
+            ApiResponse(responseCode = "200", description = "임시 저장 삭제 성공"),
+        ],
+    )
+    fun deletePhysicalDraft(
+        @PathVariable draftId: String,
+        @AccessUser userId: String,
+    )
 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/DraftLetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/DraftLetterController.kt
@@ -123,12 +123,26 @@ class DraftLetterController(
         return GetDraftLetterCountResponse(response.count)
     }
 
+    override fun getPhysicalDraftCount(userId: String): GetPhysicalDraftLetterCountResponse {
+        val response = getPhysicalDraftLetterUsecase.count(GetPhysicalDraftLetterUsecase.Query.All(userId))
+        return GetPhysicalDraftLetterCountResponse(response.count)
+    }
+
     override fun deleteDraft(
         draftId: String,
         userId: String,
     ) {
         removeDraftLetterUsecase.deleteBy(
-            RemoveDraftLetterUsecase.Command.Draft(
+            RemoveDraftLetterUsecase.Command.Send(
+                draftId = draftId,
+                userId = userId,
+            ),
+        )
+    }
+
+    override fun deletePhysicalDraft(draftId: String, userId: String) {
+        removeDraftLetterUsecase.deleteBy(
+            RemoveDraftLetterUsecase.Command.Physical(
                 draftId = draftId,
                 userId = userId,
             ),
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetPhysicalDraftLetterCountResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/GetPhysicalDraftLetterCountResponse.kt
@@ -0,0 +1,6 @@
+package com.asap.bootstrap.web.letter.dto
+
+data class GetPhysicalDraftLetterCountResponse(
+    val count: Int
+) {
+}
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/DraftLetterEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/handler/DraftLetterEventHandler.kt
@@ -14,7 +14,7 @@ class DraftLetterEventHandler(
     fun deleteDraftLetter(event: SendLetterEvent.SendLetterCreatedEvent) {
         event.draftId?.let {
             removeDraftLetterUsecase.deleteBy(
-                RemoveDraftLetterUsecase.Command.Draft(
+                RemoveDraftLetterUsecase.Command.Send(
                     userId = event.sendLetter.senderId.value,
                     draftId = it,
                 ),
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/DraftLetterControllerTest.kt
@@ -307,4 +307,47 @@ class DraftLetterControllerTest : LetterAcceptanceSupporter() {
             }
         }
     }
+
+    @Test
+    fun `get physical draft count`() {
+        // given
+        val userId = userMockManager.settingUser()
+        val accessToken = jwtMockManager.generateAccessToken(userId)
+
+        BDDMockito
+            .given(getPhysicalDraftLetterUsecase.count(GetPhysicalDraftLetterUsecase.Query.All(userId)))
+            .willReturn(GetPhysicalDraftLetterUsecase.Response.Count(1))
+
+        // when
+        val response =
+            mockMvc.get("/api/v1/letters/drafts/physical/count") {
+                contentType = MediaType.APPLICATION_JSON
+                header("Authorization", "Bearer $accessToken")
+            }
+
+        // then
+        response.andExpect {
+            status { isOk() }
+            jsonPath("$.count") { isNumber() }
+        }
+    }
+
+    @Test
+    fun `delete physical draft`() {
+        // given
+        val userId = userMockManager.settingUser()
+        val accessToken = jwtMockManager.generateAccessToken(userId)
+
+        // when
+        val response =
+            mockMvc.delete("/api/v1/letters/drafts/physical/draftKey") {
+                contentType = MediaType.APPLICATION_JSON
+                header("Authorization", "Bearer $accessToken")
+            }
+
+        // then
+        response.andExpect {
+            status { isOk() }
+        }
+    }
 }
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterApiIntegrationTest.kt
@@ -1,11 +1,13 @@
 package com.asap.bootstrap.integration.letter
 
 import com.asap.application.letter.LetterMockManager
+import com.asap.application.letter.exception.LetterException
 import com.asap.application.letter.port.out.ReceiveDraftLetterManagementPort
 import com.asap.bootstrap.IntegrationSupporter
 import com.asap.bootstrap.web.letter.dto.UpdateDraftLetterRequest
 import com.asap.bootstrap.web.letter.dto.UpdatePhysicalDraftLetterRequest
 import com.asap.domain.common.DomainId
+import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Nested
@@ -322,4 +324,85 @@ class DraftLetterApiIntegrationTest(
             }
         }
     }
+
+    @Nested
+    @DisplayName("delete physical draft")
+    inner class DeletePhysicalDraft {
+        @Test
+        fun `delete physical draft`() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            val draftId = letterMockManager.generateMockReceiveDraftLetter(userId)
+            // when
+            val response =
+                mockMvc.delete("/api/v1/letters/drafts/physical/$draftId") {
+                    contentType = MediaType.APPLICATION_JSON
+                    header("Authorization", "Bearer $accessToken")
+                }
+
+            // then
+            response.andExpect {
+                status { isOk() }
+            }
+            shouldThrow<LetterException.DraftLetterNotFoundException> {
+                receiveDraftLetterManagementPort.getDraftLetterNotNull(
+                    draftId = DomainId(draftId),
+                    ownerId = DomainId(userId)
+                )
+            }
+        }
+
+        @Test
+        fun `throw exception when physical draft not found`() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            val draftId = "notFound"
+            // when
+            val response =
+                mockMvc.delete("/api/v1/letters/drafts/physical/$draftId") {
+                    contentType = MediaType.APPLICATION_JSON
+                    header("Authorization", "Bearer $accessToken")
+                }
+
+            // then
+            response.andExpect {
+                status { isNotFound() }
+            }
+        }
+    }
+
+    @Nested
+    @DisplayName("get physical draft count")
+    inner class GetPhysicalDraftCount {
+        @Test
+        fun `get physical draft count`() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+
+            val draftLetterCount = 10
+
+            (1..draftLetterCount).forEach {
+                letterMockManager.generateMockReceiveDraftLetter(userId)
+            }
+
+            // when
+            val response =
+                mockMvc.get("/api/v1/letters/drafts/physical/count") {
+                    header("Authorization", "Bearer $accessToken")
+                }
+
+            // then
+            response.andExpect {
+                status { isOk() }
+                jsonPath("$.count") {
+                    isNumber()
+                    value(10)
+                }
+            }
+        }
+    }
+
 }
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveDraftLetterManagementJpaAdapter.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveDraftLetterManagementJpaAdapter.kt
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/ReceiveDraftLetterJpaRepository.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/repository/ReceiveDraftLetterJpaRepository.kt

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,8 @@ interface ReceiveDraftLetterManagementPort {`
`9`	`9`	`fun getDraftLetterNotNull(draftId: DomainId, ownerId: DomainId): ReceiveDraftLetter`
`10`	`10`
`11`	`11`	`fun getAllDrafts(ownerId: DomainId): List<ReceiveDraftLetter>`
	`12`	`+`
	`13`	`+ fun countDrafts(ownerId: DomainId): Int`
	`14`	`+`
	`15`	`+ fun remove(receiveDraftLetter: ReceiveDraftLetter)`
`12`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,9 @@ class DraftLetterQueryService(`
`78`	`78`	`lastUpdated = draft.lastUpdated`
`79`	`79`	`)`
`80`	`80`	`}`
	`81`	`+`
	`82`	`+ override fun count(query: GetPhysicalDraftLetterUsecase.Query.All): GetPhysicalDraftLetterUsecase.Response.Count {`
	`83`	`+ val count = receiveDraftLetterManagementPort.countDrafts(DomainId(query.userId))`
	`84`	`+ return GetPhysicalDraftLetterUsecase.Response.Count(count)`
	`85`	`+ }`
`81`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,4 +144,17 @@ class DraftLetterQueryServiceTest :`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
	`147`	`+`
	`148`	`+ given("임시 저장한 실물 편지 개수를 조회할 때") {`
	`149`	`+ val userId = "userId"`
	`150`	`+ val query = GetPhysicalDraftLetterUsecase.Query.All(userId)`
	`151`	`+ val draftCount = 1`
	`152`	`+ every { mockReceiveLetterManagementPort.countDrafts(DomainId(userId)) } returns draftCount`
	`153`	+ `when`("사용자 아이디를 입력하면") {
	`154`	`+ val response = draftLetterQueryService.count(query)`
	`155`	`+ then("임시 저장한 실물 편지 개수를 반환한다") {`
	`156`	`+ response.count shouldBe draftCount`
	`157`	`+ }`
	`158`	`+ }`
	`159`	`+ }`
`147`	`160`	`})`