Merge pull request #130 from ASAP-Lettering/ASAP-451

tlarbals824 · web-flow · commit 7f895d31a299 · 2025-05-18T15:29:16.000+09:00
ASAP-451 익명 편지 전송 api 추가
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/GetVerifiedLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/GetVerifiedLetterUsecase.kt
@@ -3,23 +3,18 @@ package com.asap.application.letter.port.`in`
 import java.time.LocalDate
 
 interface GetVerifiedLetterUsecase {
-
-    fun get(
-        query: Query
-    ): Response
+    fun get(query: Query): Response
 
     data class Query(
         val letterId: String,
-        val userId: String
+        val userId: String,
     )
 
     data class Response(
-        val senderName: String,
+        val senderName: String?,
         val content: String,
         val sendDate: LocalDate,
         val templateType: Int,
-        val images: List<String>
+        val images: List<String>,
     )
-
-
-}
+}
diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/SendLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/SendLetterUsecase.kt
@@ -1,21 +1,27 @@
 package com.asap.application.letter.port.`in`
 
 interface SendLetterUsecase {
+    fun send(command: Command): Response
 
-    fun send(
-        command: Command
-    ): Response
+    fun sendAnonymous(command: AnonymousCommand): Response
 
     data class Command(
         val receiverName: String,
         val content: String,
         val images: List<String>,
         val templateType: Int,
         val draftId: String?,
-        val userId: String
+        val userId: String,
+    )
+
+    data class AnonymousCommand(
+        val receiverName: String,
+        val content: String,
+        val images: List<String>,
+        val templateType: Int,
     )
 
     data class Response(
-        val letterCode: String
+        val letterCode: String,
     )
-}
+}
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
@@ -56,6 +56,27 @@ class LetterCommandService(
         return SendLetterUsecase.Response(letterCode = sendLetter.letterCode!!)
     }
 
+    override fun sendAnonymous(command: SendLetterUsecase.AnonymousCommand): SendLetterUsecase.Response {
+        val sendLetter =
+            SendLetter.createAnonymous(
+                receiverName = command.receiverName,
+                content =
+                    LetterContent(
+                        content = command.content,
+                        templateType = command.templateType,
+                        images = command.images.toMutableList(),
+                    ),
+                letterCode =
+                    letterCodeGenerator.generateCode(
+                        content = command.content,
+                    ),
+            )
+
+        sendLetterManagementPort.save(sendLetter)
+
+        return SendLetterUsecase.Response(letterCode = sendLetter.letterCode!!)
+    }
+
     override fun verify(command: VerifyLetterAccessibleUsecase.Command): VerifyLetterAccessibleUsecase.Response {
         if (sendLetterManagementPort.verifiedLetter(DomainId(command.userId), command.letterCode)) {
             val sendLetter =
@@ -67,15 +88,15 @@ class LetterCommandService(
         }
 
         val sendLetter = sendLetterManagementPort.getLetterByCodeNotNull(command.letterCode)
-        sendLetter
-            .isSameReceiver {
-                userManagementPort.getUserNotNull(DomainId(command.userId))
-            }.takeIf { it }
-            ?.let {
-                sendLetter.readLetter(DomainId(command.userId))
-                sendLetterManagementPort.save(sendLetter)
-                return VerifyLetterAccessibleUsecase.Response(letterId = sendLetter.id.value)
-            } ?: throw LetterException.InvalidLetterAccessException()
+        val receiver = userManagementPort.getUserNotNull(DomainId(command.userId))
+
+        if (sendLetter.isSameReceiver(receiver)) {
+            sendLetter.readLetter(DomainId(command.userId))
+            sendLetterManagementPort.save(sendLetter)
+            return VerifyLetterAccessibleUsecase.Response(letterId = sendLetter.id.value)
+        }
+
+        throw LetterException.InvalidLetterAccessException()
     }
 
     override fun addVerifiedLetter(command: AddLetterUsecase.Command.VerifyLetter) {
@@ -89,7 +110,10 @@ class LetterCommandService(
                 sender =
                     SenderInfo(
                         senderId = sendLetter.senderId,
-                        senderName = userManagementPort.getUserNotNull(sendLetter.senderId).username,
+                        senderName =
+                            sendLetter.senderId
+                                ?.let { userManagementPort.getUserNotNull(it).username }
+                                .orEmpty(),
                     ),
                 receiver =
                     ReceiverInfo(
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
@@ -32,9 +32,9 @@ class LetterQueryService(
                 receiverId = DomainId(query.userId),
                 letterId = DomainId(query.letterId),
             ).also {
-                val sender = userManagementPort.getUserNotNull(it.senderId)
+                val sender = it.senderId?.let { userManagementPort.getUserNotNull(it) }
                 return GetVerifiedLetterUsecase.Response(
-                    senderName = sender.username,
+                    senderName = sender?.username,
                     content = it.content.content,
                     sendDate = it.createdDate,
                     templateType = it.content.templateType,
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
@@ -57,6 +57,26 @@ class LetterCommandServiceTest :
             }
         }
 
+        given("익명 편지 전송 요청이 들어올 때") {
+            val command =
+                SendLetterUsecase.AnonymousCommand(
+                    receiverName = "receiver-name",
+                    content = "content",
+                    images = emptyList(),
+                    templateType = 1,
+                )
+            `when`("익명 편지 전송 요청을 처리하면") {
+                val response = letterCommandService.sendAnonymous(command)
+                then("편지 코드가 생성되고, 편지가 저장되어야 한다") {
+                    response.letterCode shouldNotBeNull {
+                        this.isNotBlank()
+                        this.isNotEmpty()
+                    }
+                    verify { mockSendLetterManagementPort.save(any()) }
+                }
+            }
+        }
+
         given("편지 검증 시에") {
             val letterCode = "letter-code"
             val mockUser = UserFixture.createUser(username = "receiver-name")
diff --git a/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterQueryServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/letter/service/LetterQueryServiceTest.kt
@@ -42,7 +42,7 @@ class LetterQueryServiceTest :
                     userId = user.id.value,
                 )
             val mockSendLetter = LetterFixture.generateSendLetter(user.id)
-            val mockSender = UserFixture.createUser(mockSendLetter.senderId, "sender-name")
+            val mockSender = UserFixture.createUser(mockSendLetter.senderId!!, "sender-name")
             every {
                 mockSendLetterManagementPort.getReadLetterNotNull(
                     receiverId = DomainId(query.userId),
@@ -96,9 +96,10 @@ class LetterQueryServiceTest :
                     letterId = "letter-id",
                     userId = "user-id",
                 )
-            val space = SpaceFixture.createSpace(
-                userId = DomainId(query.userId),
-            )
+            val space =
+                SpaceFixture.createSpace(
+                    userId = DomainId(query.userId),
+                )
             val spaceLetter = LetterFixture.generateSpaceLetter(receiverId = DomainId(query.userId), spaceId = space.id)
             val prevSpaceLetter =
                 LetterFixture.generateSpaceLetter(receiverId = DomainId(query.userId), spaceId = space.id)
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/LetterApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/api/LetterApi.kt
@@ -2,20 +2,7 @@ package com.asap.bootstrap.web.letter.api
 
 import com.asap.bootstrap.common.exception.ExceptionResponse
 import com.asap.bootstrap.common.security.annotation.AccessUser
-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 io.swagger.v3.oas.annotations.Operation
@@ -317,4 +304,28 @@ interface LetterApi {
         @RequestBody request: DeleteSendLettersRequest,
         @AccessUser userId: String,
     )
+
+    @Operation(summary = "비회원 편지 쓰기")
+    @PostMapping("/anonymous/send")
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "비회원 편지 전송 성공",
+                content = [
+                    Content(
+                        mediaType = "application/json",
+                        schema = Schema(implementation = SendLetterResponse::class),
+                    ),
+                ],
+            ),
+            ApiResponse(
+                responseCode = "4XX",
+                description = "비회원 편지 전송 실패",
+            ),
+        ],
+    )
+    fun sendAnonymousLetter(
+        @RequestBody request: AnonymousSendLetterRequest,
+    ): SendLetterResponse
 }
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
@@ -265,4 +265,19 @@ class LetterController(
             ),
         )
     }
+
+    override fun sendAnonymousLetter(request: AnonymousSendLetterRequest): SendLetterResponse {
+        val response =
+            sendLetterUsecase.sendAnonymous(
+                SendLetterUsecase.AnonymousCommand(
+                    receiverName = request.receiverName,
+                    content = request.content,
+                    images = request.images,
+                    templateType = request.templateType,
+                ),
+            )
+        return SendLetterResponse(
+            letterCode = response.letterCode,
+        )
+    }
 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AnonymousSendLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/AnonymousSendLetterRequest.kt
@@ -0,0 +1,8 @@
+package com.asap.bootstrap.web.letter.dto
+
+data class AnonymousSendLetterRequest(
+    val receiverName: String,
+    val content: String,
+    val images: List<String>,
+    val templateType: Int,
+)
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/VerifiedLetterInfoResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/web/letter/dto/VerifiedLetterInfoResponse.kt
@@ -3,10 +3,9 @@ package com.asap.bootstrap.web.letter.dto
 import java.time.LocalDate
 
 data class VerifiedLetterInfoResponse(
-    val senderName: String,
+    val senderName: String?,
     val content: String,
     val date: LocalDate,
     val templateType: Int,
-    val images: List<String>
-) {
-}
+    val images: List<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
@@ -16,7 +16,7 @@ class DraftLetterEventHandler(
         event.draftId?.let {
             removeDraftLetterUsecase.deleteBy(
                 RemoveDraftLetterUsecase.Command.Send(
-                    userId = event.sendLetter.senderId.value,
+                    userId = event.sendLetter.senderId!!.value,
                     draftId = it,
                 ),
             )
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
@@ -589,4 +589,41 @@ class LetterControllerTest : LetterAcceptanceSupporter() {
             }
         }
     }
+    @Test
+    fun sendAnonymousLetter() {
+        // given
+        val request =
+            AnonymousSendLetterRequest(
+                receiverName = "receiverName",
+                content = "content",
+                images = listOf("images"),
+                templateType = 1,
+            )
+        BDDMockito
+            .given(
+                sendLetterUsecase.sendAnonymous(
+                    SendLetterUsecase.AnonymousCommand(
+                        receiverName = request.receiverName,
+                        content = request.content,
+                        images = request.images,
+                        templateType = request.templateType,
+                    ),
+                ),
+            ).willReturn(SendLetterUsecase.Response("letterCode"))
+        // when
+        val response =
+            mockMvc.post("/api/v1/letters/anonymous/send") {
+                contentType = MediaType.APPLICATION_JSON
+                content = objectMapper.writeValueAsString(request)
+            }
+        // then
+        response.andExpect {
+            status { isOk() }
+            jsonPath("$.letterCode") {
+                exists()
+                isString()
+                isNotEmpty()
+            }
+        }
+    }
 }
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
@@ -1081,4 +1081,32 @@ class LetterApiIntegrationTest : IntegrationSupporter() {
             }
         }
     }
+
+    @Test
+    @DisplayName("비회원 편지 쓰기")
+    fun sendAnonymousLetter() {
+        // given
+        val request =
+            AnonymousSendLetterRequest(
+                receiverName = "receiverName",
+                content = "content",
+                images = listOf("images"),
+                templateType = 1,
+            )
+        // when
+        val response =
+            mockMvc.post("/api/v1/letters/anonymous/send") {
+                contentType = MediaType.APPLICATION_JSON
+                content = objectMapper.writeValueAsString(request)
+            }
+        // then
+        response.andExpect {
+            status { isOk() }
+            jsonPath("$.letterCode") {
+                exists()
+                isString()
+                isNotEmpty()
+            }
+        }
+    }
 }
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SendLetter.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SendLetter.kt
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/service/LetterCodeGenerator.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/service/LetterCodeGenerator.kt
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/SendLetterMapper.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/SendLetterMapper.kt
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/SendLetterEntity.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/letter/entity/SendLetterEntity.kt
diff --git a/Infrastructure-Module/Persistence/src/main/resources/db/V1_20__alter_send_letter_sender_id_to_nullable.sql b/Infrastructure-Module/Persistence/src/main/resources/db/V1_20__alter_send_letter_sender_id_to_nullable.sql
