Merge pull request #105 from ASAP-Lettering/ASAP-249

ASAP-249 feat: 편지 수정할 떄 templatetype도 받도록 추가
ASAP-Lettering · Oct 24, 2024 · 268cbfa · 268cbfa
2 parents 59fdbb0 + 168fead
commit 268cbfa
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 10 deletions.
diff --git a/...ication-Module/src/main/kotlin/com/asap/application/letter/port/in/UpdateLetterUsecase.kt b/...ication-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<String>,
+            val templateType: Int,
         ) : Command()
 
         data class Space(
@@ -21,6 +21,7 @@ interface UpdateLetterUsecase {
             val senderName: String,
             val content: String,
             val images: List<String>,
+            val templateType: Int,
         ) : Command()
     }
 }
diff --git a/...cation-Module/src/main/kotlin/com/asap/application/letter/service/LetterCommandService.kt b/...cation-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/...on-Module/src/test/kotlin/com/asap/application/letter/service/LetterCommandServiceTest.kt b/...on-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
@@ -163,6 +163,7 @@ class LetterController(
                 content = request.content,
                 images = request.images,
                 userId = userId,
+                templateType = request.templateType,
             ),
         )
     }

diff --git a/...trap-Module/src/main/kotlin/com/asap/bootstrap/letter/controller/SpaceLetterController.kt b/...trap-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
@@ -3,6 +3,6 @@ package com.asap.bootstrap.letter.dto
 data class ModifyLetterRequest(
     val senderName: String,
     val content: String,
-    val images: List<String>
-) {
-}
+    val images: List<String>,
+    val templateType: Int,
+)
diff --git a/...e/src/test/kotlin/com/asap/bootstrap/acceptance/letter/controller/LetterControllerTest.kt b/...e/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/.../test/kotlin/com/asap/bootstrap/acceptance/letter/controller/SpaceLetterControllerTest.kt b/.../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/...-Module/src/test/kotlin/com/asap/bootstrap/integration/letter/LetterApiIntegrationTest.kt b/...-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/...le/src/test/kotlin/com/asap/bootstrap/integration/letter/SpaceLetterApiIntegrationTest.kt b/...le/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
@@ -62,10 +62,12 @@ class IndependentLetter(
         senderName: String,
         content: String,
         images: List<String>,
+        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
@@ -56,9 +56,11 @@ class SpaceLetter(
         senderName: String,
         content: String,
         images: List<String>,
+        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
@@ -3,7 +3,7 @@ package com.asap.domain.letter.vo
 data class LetterContent(
     var content: String,
     val images: MutableList<String>,
-    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()
     }