diff --git a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/UpdateLetterUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/UpdateLetterUsecase.kt index 9175ff5f..667eafc9 100644 --- a/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/UpdateLetterUsecase.kt +++ b/Application-Module/src/main/kotlin/com/asap/application/letter/port/in/UpdateLetterUsecase.kt @@ -5,14 +5,14 @@ interface UpdateLetterUsecase { fun updateSpaceLetter(command: Command.Space) - sealed class Command { - + sealed class Command { data class Independent( val letterId: String, val userId: String, val senderName: String, val content: String, val images: List, + val templateType: Int, ) : Command() data class Space( @@ -21,6 +21,7 @@ interface UpdateLetterUsecase { val senderName: String, val content: String, val images: List, + val templateType: Int, ) : 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 index 50c1bbce..ff23e088 100644 --- 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 @@ -221,6 +221,7 @@ class LetterCommandService( senderName = command.senderName, content = command.content, images = command.images, + templateType = command.templateType, ) independentLetterManagementPort.save(independentLetter) } @@ -235,6 +236,7 @@ class LetterCommandService( senderName = command.senderName, content = command.content, images = command.images, + templateType = command.templateType, ) spaceLetterManagementPort.save(spaceLetter) } 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 index 972e0ede..e03cc2ce 100644 --- 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 @@ -301,6 +301,7 @@ class LetterCommandServiceTest : content = "content", images = emptyList(), userId = "user-id", + templateType = 1, ) val independentLetter = LetterFixture.generateIndependentLetter( @@ -318,7 +319,7 @@ class LetterCommandServiceTest : } given("행성 편지 수정 요청이 들어올 떄") { - val command = UpdateLetterUsecase.Command.Space("letter-id", "user-id", "name", "content", emptyList()) + val command = UpdateLetterUsecase.Command.Space("letter-id", "user-id", "name", "content", emptyList(), 1) val spaceLetter = LetterFixture.generateSpaceLetter( id = DomainId("letter-id"), diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt index cee055b6..f8262551 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/LetterController.kt @@ -163,6 +163,7 @@ class LetterController( content = request.content, images = request.images, userId = userId, + templateType = request.templateType, ), ) } diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt index 3dfd9e1d..9d7923a2 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt @@ -139,6 +139,7 @@ class SpaceLetterController( content = request.content, images = request.images, userId = userId, + templateType = request.templateType, ), ) } diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt index 1cc67906..9d68bac3 100644 --- a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt +++ b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/dto/ModifyLetterRequest.kt @@ -3,6 +3,6 @@ package com.asap.bootstrap.letter.dto data class ModifyLetterRequest( val senderName: String, val content: String, - val images: List -) { -} \ No newline at end of file + val images: List, + val templateType: Int, +) 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 index 3f1ac465..ac6c0e5d 100644 --- 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 @@ -381,6 +381,7 @@ class LetterControllerTest : LetterAcceptanceSupporter() { senderName = "senderName", content = "content", images = listOf("images"), + templateType = 1, ) // when val response = @@ -545,7 +546,7 @@ class LetterControllerTest : LetterAcceptanceSupporter() { } @Nested - inner class DeleteSendLetter { + inner class DeleteSendLetter { @Test fun deleteSendLetter() { // given @@ -564,7 +565,7 @@ class LetterControllerTest : LetterAcceptanceSupporter() { } @Test - fun deleteSendLetters() { + fun deleteSendLetters() { // given val userId = userMockManager.settingUser() val accessToken = jwtMockManager.generateAccessToken(userId) diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt index f5a52b2d..be62c6fe 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt @@ -226,6 +226,7 @@ class SpaceLetterControllerTest : LetterAcceptanceSupporter() { content = "content", images = listOf("images"), senderName = "senderName", + templateType = 1, ) // when val response = 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 index 587d68b8..607a6732 100644 --- 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 @@ -684,6 +684,7 @@ class LetterApiIntegrationTest : IntegrationSupporter() { content = "content", images = listOf("images"), senderName = "senderName", + templateType = 1, ) // when val response = diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt index fc69613f..52011f7f 100644 --- a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt +++ b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt @@ -429,6 +429,7 @@ class SpaceLetterApiIntegrationTest : IntegrationSupporter() { content = "updateContent", images = listOf("image1", "image2"), senderName = "updateSenderName", + templateType = 1, ) // when val response = 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 index 1047119d..734bd3cb 100644 --- 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 @@ -62,10 +62,12 @@ class IndependentLetter( senderName: String, content: String, images: List, + templateType: Int, ) { this.sender.update(senderName) this.content.updateContent(content) this.content.updateImages(images.toMutableList()) + this.content.updateTemplateType(templateType) } fun delete() { diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SpaceLetter.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SpaceLetter.kt index 88f55146..1ec8c4fb 100644 --- a/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SpaceLetter.kt +++ b/Domain-Module/src/main/kotlin/com/asap/domain/letter/entity/SpaceLetter.kt @@ -56,9 +56,11 @@ class SpaceLetter( senderName: String, content: String, images: List, + templateType: Int, ) { this.sender.update(senderName) this.content.updateContent(content) this.content.updateImages(images.toMutableList()) + this.content.updateTemplateType(templateType) } } diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/letter/vo/LetterContent.kt b/Domain-Module/src/main/kotlin/com/asap/domain/letter/vo/LetterContent.kt index da90b554..04f8900c 100644 --- a/Domain-Module/src/main/kotlin/com/asap/domain/letter/vo/LetterContent.kt +++ b/Domain-Module/src/main/kotlin/com/asap/domain/letter/vo/LetterContent.kt @@ -3,7 +3,7 @@ package com.asap.domain.letter.vo data class LetterContent( var content: String, val images: MutableList, - val templateType: Int, + var templateType: Int, ) { fun updateContent(content: String) { this.content = content @@ -14,7 +14,11 @@ data class LetterContent( this.images.addAll(images) } - fun delete() { + fun updateTemplateType(templateType: Int) { + this.templateType = templateType + } + + fun delete() { this.content = "" this.images.clear() }