Merge pull request #114 from ASAP-Lettering/ASAP-395

tlarbals824 · web-flow · commit d7ee1a241451 · 2025-01-27T10:58:14.000+09:00
ASAP-395 실물 편지 등록할 때 임시 저장 id를 지정할 수 있도록 추가
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/AddLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/AddLetterUsecase.kt
@@ -17,6 +17,7 @@ interface AddLetterUsecase {
             val images: List<String>,
             val templateType: Int,
             val userId: String,
+            val draftId: String?,
         ) : Command()
     }
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/service/LetterCommandService.kt
@@ -123,6 +123,7 @@ class LetterCommandService(
                         images = command.images.toMutableList(),
                     ),
                 receiveDate = LocalDate.now(),
+                draftId = command.draftId?.let { DomainId(it) },
             )
         independentLetterManagementPort.save(independentLetter)
     }
diff --git a/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterCommandServiceTest.kt
@@ -153,6 +153,7 @@ class LetterCommandServiceTest :
                     images = emptyList(),
                     templateType = 1,
                     userId = "user-id",
+                    draftId = null,
                 )
             `when`("편지를 추가하면") {
                 letterCommandService.addPhysicalLetter(command)
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/LetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/controller/LetterController.kt
@@ -2,20 +2,7 @@ package com.asap.bootstrap.web.letter.controller
 
 import com.asap.application.letter.port.`in`.*
 import com.asap.bootstrap.web.letter.api.LetterApi
-import com.asap.bootstrap.web.letter.dto.AddPhysicalLetterRequest
-import com.asap.bootstrap.web.letter.dto.AddVerifiedLetterRequest
-import com.asap.bootstrap.web.letter.dto.AllLetterCountResponse
-import com.asap.bootstrap.web.letter.dto.DeleteSendLettersRequest
-import com.asap.bootstrap.web.letter.dto.GetIndependentLetterDetailResponse
-import com.asap.bootstrap.web.letter.dto.GetIndependentLetterSimpleInfo
-import com.asap.bootstrap.web.letter.dto.LetterVerifyRequest
-import com.asap.bootstrap.web.letter.dto.LetterVerifyResponse
-import com.asap.bootstrap.web.letter.dto.ModifyLetterRequest
-import com.asap.bootstrap.web.letter.dto.SendLetterDetailResponse
-import com.asap.bootstrap.web.letter.dto.SendLetterHistoryResponse
-import com.asap.bootstrap.web.letter.dto.SendLetterRequest
-import com.asap.bootstrap.web.letter.dto.SendLetterResponse
-import com.asap.bootstrap.web.letter.dto.VerifiedLetterInfoResponse
+import com.asap.bootstrap.web.letter.dto.*
 import com.asap.common.page.ListResponse
 import com.asap.common.page.SliceResponse
 import org.springframework.web.bind.annotation.RestController
@@ -91,6 +78,7 @@ class LetterController(
                 images = request.images,
                 templateType = request.templateType,
                 userId = userId,
+                draftId = request.draftId,
             ),
         )
     }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddPhysicalLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AddPhysicalLetterRequest.kt
@@ -4,6 +4,7 @@ class AddPhysicalLetterRequest(
     val senderName: String,
     val content: String,
     val images: List<String>,
-    val templateType: Int
+    val templateType: Int,
+    val draftId: String?
 ) {
 }
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
@@ -2,6 +2,7 @@ package com.asap.bootstrap.web.letter.handler
 
 import com.asap.application.letter.port.`in`.RemoveDraftLetterUsecase
 import com.asap.application.user.event.UserEvent
+import com.asap.domain.letter.event.IndependentLetterEvent
 import com.asap.domain.letter.event.SendLetterEvent
 import org.springframework.context.event.EventListener
 import org.springframework.web.bind.annotation.RestController
@@ -22,6 +23,18 @@ class DraftLetterEventHandler(
         }
     }
 
+    @EventListener
+    fun deletePhysicalDraftLetter(event: IndependentLetterEvent.IndependentLetterCreatedEvent) {
+        event.receiveDraftId?.let {
+            removeDraftLetterUsecase.deleteBy(
+                RemoveDraftLetterUsecase.Command.Physical(
+                    userId = event.independentLetter.getOwnerId().value,
+                    draftId = it,
+                ),
+            )
+        }
+    }
+
     @EventListener
     fun onUserDelete(event: UserEvent.UserDeletedEvent) {
         removeDraftLetterUsecase.deleteBy(
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt
@@ -338,6 +338,7 @@ class LetterControllerTest : LetterAcceptanceSupporter() {
                 content = "content",
                 images = listOf("images"),
                 templateType = 1,
+                draftId = null
             )
         // when
         val response =
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/DraftLetterEventHandlerTest.kt
@@ -5,15 +5,12 @@ import com.asap.application.user.event.UserEvent
 import com.asap.bootstrap.IntegrationSupporter
 import com.asap.bootstrap.web.letter.handler.DraftLetterEventHandler
 import org.junit.jupiter.api.Test
-import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.test.web.servlet.get
 
-class DraftLetterEventHandlerTest : IntegrationSupporter() {
-    @Autowired
-    private lateinit var draftLetterEventHandler: DraftLetterEventHandler
-
-    @Autowired
-    private lateinit var letterMockManager: LetterMockManager
+class DraftLetterEventHandlerTest(
+    val draftLetterEventHandler: DraftLetterEventHandler,
+    val letterMockManager: LetterMockManager,
+) : IntegrationSupporter() {
 
     @Test
     fun onUserDelete() {
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt
@@ -610,28 +610,64 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
         }
     }
 
-    @Test
-    fun addPhysicalLetter() {
-        // given
-        val request =
-            AddPhysicalLetterRequest(
-                senderName = "senderName",
-                content = "content",
-                images = listOf("images"),
-                templateType = 1,
-            )
-        val userId = userMockManager.settingUser()
-        val accessToken = jwtMockManager.generateAccessToken(userId)
-        // when
-        val response =
+    @Nested
+    @DisplayName("실물 편지 추가")
+    inner class AddPhysicalLetter {
+        @Test
+        fun addPhysicalLetter() {
+            // given
+            val request =
+                AddPhysicalLetterRequest(
+                    senderName = "senderName",
+                    content = "content",
+                    images = listOf("images"),
+                    templateType = 1,
+                    draftId = null,
+                )
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            // when
+            val response =
+                mockMvc.post("/api/v1/letters/physical/receive") {
+                    contentType = MediaType.APPLICATION_JSON
+                    content = objectMapper.writeValueAsString(request)
+                    header("Authorization", "Bearer $accessToken")
+                }
+            // then
+            response.andExpect {
+                status { isOk() }
+            }
+        }
+
+
+        @Test
+        fun `addPhysicalLetter with draftId`() {
+            // given
+            val userId = userMockManager.settingUser()
+            val accessToken = jwtMockManager.generateAccessToken(userId)
+            val receiveDraftId = letterMockManager.generateMockReceiveDraftLetter(userId)
+
+            val request =
+                AddPhysicalLetterRequest(
+                    senderName = "senderName",
+                    content = "content",
+                    images = listOf("images"),
+                    templateType = 1,
+                    draftId = receiveDraftId,
+                )
+            // when
             mockMvc.post("/api/v1/letters/physical/receive") {
                 contentType = MediaType.APPLICATION_JSON
                 content = objectMapper.writeValueAsString(request)
                 header("Authorization", "Bearer $accessToken")
             }
-        // then
-        response.andExpect {
-            status { isOk() }
+            // then
+            mockMvc
+                .get("/api/v1/letters/drafts/physical/$receiveDraftId") {
+                    header("Authorization", "Bearer $accessToken")
+                }.andExpect {
+                    status { isNotFound() }
+                }
         }
     }
 
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
@@ -2,6 +2,7 @@ package com.asap.domain.letter.entity
 
 import com.asap.domain.common.Aggregate
 import com.asap.domain.common.DomainId
+import com.asap.domain.letter.event.IndependentLetterEvent
 import com.asap.domain.letter.vo.LetterContent
 import com.asap.domain.letter.vo.ReceiverInfo
 import com.asap.domain.letter.vo.SenderInfo
@@ -40,6 +41,7 @@ class IndependentLetter(
             receiveDate: LocalDate,
             movedAt: LocalDateTime = LocalDateTime.now(),
             isOpened: Boolean = false,
+            draftId: DomainId? = null,
         ): IndependentLetter =
             IndependentLetter(
                 id = id,
@@ -49,7 +51,9 @@ class IndependentLetter(
                 receiveDate = receiveDate,
                 movedAt = movedAt,
                 isOpened = isOpened,
-            )
+            ).also {
+                it.registerEvent(IndependentLetterEvent.IndependentLetterCreatedEvent(it, draftId?.value))
+            }
     }
 
     fun isNew(): Boolean = movedAt.isAfter(LocalDateTime.now().minusDays(1)) && isOpened.not()
@@ -75,6 +79,8 @@ class IndependentLetter(
         this.sender.delete()
     }
 
+    fun getOwnerId(): DomainId = receiver.receiverId
+
     override fun toString(): String =
         "IndependentLetter(content=$content, sender=$sender, receiver=$receiver, receiveDate=$receiveDate, movedAt=$movedAt, isOpened=$isOpened)"
 }
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/event/LetterEvent.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/event/LetterEvent.kt
@@ -1,6 +1,7 @@
 package com.asap.domain.letter.event
 
 import com.asap.domain.common.DomainEvent
+import com.asap.domain.letter.entity.IndependentLetter
 import com.asap.domain.letter.entity.SendLetter
 
 sealed class SendLetterEvent : DomainEvent<SendLetter> {
@@ -10,3 +11,11 @@ sealed class SendLetterEvent : DomainEvent<SendLetter> {
         val draftId: String?,
     ) : SendLetterEvent()
 }
+
+sealed class IndependentLetterEvent : DomainEvent<IndependentLetter> {
+
+    data class IndependentLetterCreatedEvent(
+        val independentLetter: IndependentLetter,
+        val receiveDraftId: String?,
+    ) : IndependentLetterEvent()
+}
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveLetterManagementJpaAdapter.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/adapter/ReceiveLetterManagementJpaAdapter.kt
@@ -3,6 +3,7 @@ package com.asap.persistence.jpa.letter.adapter
 import com.asap.application.letter.exception.LetterException
 import com.asap.application.letter.port.out.IndependentLetterManagementPort
 import com.asap.application.letter.port.out.SpaceLetterManagementPort
+import com.asap.common.event.EventPublisher
 import com.asap.common.page.Page
 import com.asap.common.page.PageRequest
 import com.asap.domain.common.DomainId
@@ -18,6 +19,7 @@ import java.time.LocalDateTime
 @Repository
 class ReceiveLetterManagementJpaAdapter(
     private val receiveLetterJpaRepository: ReceiveLetterJpaRepository,
+    private val eventPublisher: EventPublisher,
 ) : IndependentLetterManagementPort,
     SpaceLetterManagementPort {
     override fun save(letter: IndependentLetter) {
@@ -35,6 +37,7 @@ class ReceiveLetterManagementJpaAdapter(
             spaceId = null,
         ).also {
             receiveLetterJpaRepository.save(it)
+            eventPublisher.publishAll(letter.pullEvents())
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ interface AddLetterUsecase {`
`17`	`17`	`val images: List<String>,`
`18`	`18`	`val templateType: Int,`
`19`	`19`	`val userId: String,`
	`20`	`+ val draftId: String?,`
`20`	`21`	`) : Command()`
`21`	`22`	`}`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,7 @@ class LetterCommandService(`
`123`	`123`	`images = command.images.toMutableList(),`
`124`	`124`	`),`
`125`	`125`	`receiveDate = LocalDate.now(),`
	`126`	`+ draftId = command.draftId?.let { DomainId(it) },`
`126`	`127`	`)`
`127`	`128`	`independentLetterManagementPort.save(independentLetter)`
`128`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ class LetterCommandServiceTest :`
`153`	`153`	`images = emptyList(),`
`154`	`154`	`templateType = 1,`
`155`	`155`	`userId = "user-id",`
	`156`	`+ draftId = null,`
`156`	`157`	`)`
`157`	`158`	`when`("편지를 추가하면") {
`158`	`159`	`letterCommandService.addPhysicalLetter(command)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ class AddPhysicalLetterRequest(`
`4`	`4`	`val senderName: String,`
`5`	`5`	`val content: String,`
`6`	`6`	`val images: List<String>,`
`7`		`- val templateType: Int`
	`7`	`+ val templateType: Int,`
	`8`	`+ val draftId: String?`
`8`	`9`	`) {`
`9`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,6 +338,7 @@ class LetterControllerTest : LetterAcceptanceSupporter() {`
`338`	`338`	`content = "content",`
`339`	`339`	`images = listOf("images"),`
`340`	`340`	`templateType = 1,`
	`341`	`+ draftId = null`
`341`	`342`	`)`
`342`	`343`	`// when`
`343`	`344`	`val response =`