Merge pull request #101 from ASAP-Lettering/ASAP-238

tlarbals824 · web-flow · commit f0da54925194 · 2024-10-20T17:39:55.000+09:00
ASAP-238 refactor: 스페이스 이벤트를 도메인 안에 저장한 다음 영속화할 때 배포하도록 수정
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/event/SpaceDeletedEvent.kt b/Application-Module/src/main/kotlin/com/asap/application/space/event/SpaceDeletedEvent.kt
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/port/out/SpaceManagementPort.kt b/Application-Module/src/main/kotlin/com/asap/application/space/port/out/SpaceManagementPort.kt
@@ -20,6 +20,13 @@ interface SpaceManagementPort {
 
     fun getAllIndexedSpace(userId: DomainId): List<IndexedSpace>
 
+    fun getAllSpaceBy(
+        userId: DomainId,
+        spaceIds: List<DomainId>,
+    ): List<Space>
+
+    fun getAllSpaceBy(userId: DomainId): List<Space>
+
     fun save(space: Space): Space
 
     fun update(space: Space): Space
@@ -31,17 +38,7 @@ interface SpaceManagementPort {
         orders: List<IndexedSpace>,
     )
 
-    fun deleteById(
-        userId: DomainId,
-        spaceId: DomainId,
-    )
-
-    fun deleteAllBySpaceIds(
-        userId: DomainId,
-        spaceIds: List<DomainId>,
-    )
-
-    fun deleteAllByUserId(userId: DomainId)
+    fun deleteBy(space: Space)
 
     fun countByUserId(userId: DomainId): Long
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/space/service/SpaceCommandService.kt
@@ -1,6 +1,5 @@
 package com.asap.application.space.service
 
-import com.asap.application.space.event.SpaceDeletedEvent
 import com.asap.application.space.exception.SpaceException
 import com.asap.application.space.port.`in`.CreateSpaceUsecase
 import com.asap.application.space.port.`in`.DeleteSpaceUsecase
@@ -11,15 +10,13 @@ import com.asap.common.exception.DefaultException
 import com.asap.domain.common.DomainId
 import com.asap.domain.space.entity.Space
 import com.asap.domain.space.service.SpaceIndexValidator
-import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
 @Service
 @Transactional
 class SpaceCommandService(
     private val spaceManagementPort: SpaceManagementPort,
-    private val applicationEventPublisher: ApplicationEventPublisher,
 ) : CreateSpaceUsecase,
     UpdateSpaceNameUsecase,
     DeleteSpaceUsecase,
@@ -44,42 +41,39 @@ class SpaceCommandService(
                 userId = DomainId(command.userId),
                 spaceId = DomainId(command.spaceId),
             )
-        val updatedSpace = space.updateName(command.name)
-        spaceManagementPort.update(updatedSpace)
+        space.updateName(command.name)
+        spaceManagementPort.update(space)
     }
 
     override fun deleteOne(command: DeleteSpaceUsecase.DeleteOneCommand) {
-        spaceManagementPort.deleteById(
-            userId = DomainId(command.userId),
-            spaceId = DomainId(command.spaceId),
-        )
-        applicationEventPublisher.publishEvent(
-            SpaceDeletedEvent(
-                userId = command.userId,
-                spaceId = command.spaceId,
-            ),
-        )
+        spaceManagementPort
+            .getSpaceNotNull(
+                userId = DomainId(command.userId),
+                spaceId = DomainId(command.spaceId),
+            ).apply {
+                delete()
+                spaceManagementPort.deleteBy(this)
+            }
         reIndexingSpaceOrder(DomainId(command.userId))
     }
 
     override fun deleteAllBy(command: DeleteSpaceUsecase.DeleteAllCommand) {
-        spaceManagementPort.deleteAllBySpaceIds(
-            userId = DomainId(command.userId),
-            spaceIds = command.spaceIds.map { DomainId(it) },
-        )
-        command.spaceIds.forEach {
-            applicationEventPublisher.publishEvent(
-                SpaceDeletedEvent(
-                    userId = command.userId,
-                    spaceId = it,
-                ),
-            )
-        }
+        spaceManagementPort
+            .getAllSpaceBy(
+                userId = DomainId(command.userId),
+                spaceIds = command.spaceIds.map { DomainId(it) },
+            ).forEach {
+                it.delete()
+                spaceManagementPort.deleteBy(it)
+            }
         reIndexingSpaceOrder(DomainId(command.userId))
     }
 
     override fun deleteAllBy(command: DeleteSpaceUsecase.DeleteAllUser) {
-        spaceManagementPort.deleteAllByUserId(DomainId(command.userId))
+        spaceManagementPort.getAllSpaceBy(DomainId(command.userId)).forEach {
+            it.delete()
+            spaceManagementPort.deleteBy(it)
+        }
     }
 
     override fun update(command: UpdateSpaceIndexUsecase.Command) {
diff --git a/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceCommandServiceTest.kt
@@ -14,18 +14,15 @@ import io.kotest.core.spec.style.BehaviorSpec
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import org.springframework.context.ApplicationEventPublisher
 
 class SpaceCommandServiceTest :
     BehaviorSpec({
 
         val spaceManagementPort = mockk<SpaceManagementPort>(relaxed = true)
-        val applicationEventPublisher = mockk<ApplicationEventPublisher>(relaxed = true)
 
         val spaceCommandService =
             SpaceCommandService(
                 spaceManagementPort,
-                applicationEventPublisher,
             )
 
         given("스페이스 생성 요청이 들어왔을 때") {
@@ -75,7 +72,7 @@ class SpaceCommandServiceTest :
                         )
                     }
                     verify {
-                        spaceManagementPort.update(mockSpace.updateName(spaceUpdateNameCommand.name))
+                        spaceManagementPort.update(mockSpace)
                     }
                 }
             }
@@ -91,9 +88,8 @@ class SpaceCommandServiceTest :
                 spaceCommandService.deleteOne(spaceDeleteOneCommand)
                 then("스페이스를 삭제한다") {
                     verify {
-                        spaceManagementPort.deleteById(
-                            userId = DomainId(spaceDeleteOneCommand.userId),
-                            spaceId = DomainId(spaceDeleteOneCommand.spaceId),
+                        spaceManagementPort.deleteBy(
+                            any(Space::class),
                         )
                     }
                 }
@@ -108,9 +104,8 @@ class SpaceCommandServiceTest :
                 spaceCommandService.deleteAllBy(spaceDeleteAllCommand)
                 then("여러 스페이스를 삭제한다") {
                     verify {
-                        spaceManagementPort.deleteAllBySpaceIds(
-                            userId = DomainId(spaceDeleteAllCommand.userId),
-                            spaceIds = spaceDeleteAllCommand.spaceIds.map { DomainId(it) },
+                        spaceManagementPort.deleteBy(
+                            any(Space::class),
                         )
                     }
                 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/SpaceLetterEventHandler.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/letter/handler/SpaceLetterEventHandler.kt
@@ -1,7 +1,7 @@
 package com.asap.bootstrap.letter.handler
 
 import com.asap.application.letter.port.`in`.RemoveLetterUsecase
-import com.asap.application.space.event.SpaceDeletedEvent
+import com.asap.domain.space.event.SpaceEvent
 import org.springframework.context.event.EventListener
 import org.springframework.web.bind.annotation.RestController
 
@@ -10,12 +10,12 @@ class SpaceLetterEventHandler(
     private val removeLetterUsecase: RemoveLetterUsecase,
 ) {
     @EventListener
-    fun deleteBySpace(event: SpaceDeletedEvent) {
+    fun deleteBySpace(event: SpaceEvent.SpaceDeletedEvent) {
         removeLetterUsecase.removeSpaceLetterBy(
             command =
                 RemoveLetterUsecase.Command.SpaceId(
-                    userId = event.userId,
-                    spaceId = event.spaceId,
+                    userId = event.space.userId.value,
+                    spaceId = event.space.id.value,
                 ),
         )
     }
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/space/SpaceApiIntegrationTest.kt
@@ -270,10 +270,10 @@ class SpaceApiIntegrationTest : IntegrationSupporter() {
             // given
             val userId = userMockManager.settingUser()
             val accessToken = jwtMockManager.generateAccessToken(userId)
-            val spaceId = spaceMockManager.settingSpace(userId)
+            val space = spaceMockManager.settingSpace(userId)
             // when
             val response =
-                mockMvc.delete("/api/v1/spaces/$spaceId") {
+                mockMvc.delete("/api/v1/spaces/${space.id.value}") {
                     header("Authorization", "Bearer $accessToken")
                 }
             // then
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/IndexedSpace.kt b/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/IndexedSpace.kt
@@ -1,17 +1,18 @@
 package com.asap.domain.space.entity
 
+import com.asap.domain.common.Aggregate
 import com.asap.domain.common.DomainId
 
-data class IndexedSpace(
-    val id: DomainId,
+class IndexedSpace(
+    id: DomainId,
     val userId: DomainId,
     val name: String,
     var index: Int,
     val templateType: Int,
-) {
+) : Aggregate<IndexedSpace>(id) {
     fun isMain(): Boolean = index == 0
 
-    fun updateIndex(index: Int)  {
+    fun updateIndex(index: Int) {
         check(index >= 0) { "Index must be greater than or equal to 0" }
         this.index = index
     }
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/Space.kt b/Domain-Module/src/main/kotlin/com/asap/domain/space/entity/Space.kt
@@ -1,25 +1,37 @@
 package com.asap.domain.space.entity
 
+import com.asap.domain.common.Aggregate
 import com.asap.domain.common.DomainId
+import com.asap.domain.space.event.SpaceEvent
 
-data class Space(
-    val id: DomainId = DomainId.generate(),
+class Space(
+    id: DomainId,
     val userId: DomainId,
-    val name: String,
+    var name: String,
     val templateType: Int,
-) {
+) : Aggregate<Space>(id) {
     companion object {
         fun create(
+            id: DomainId = DomainId.generate(),
             userId: DomainId,
             name: String,
             templateType: Int,
         ): Space =
             Space(
+                id = id,
                 userId = userId,
                 name = name,
                 templateType = templateType,
-            )
+            ).also {
+                it.registerEvent(SpaceEvent.SpaceCreatedEvent(it))
+            }
     }
 
-    fun updateName(name: String): Space = this.copy(name = name)
+    fun updateName(name: String) {
+        this.name = name
+    }
+
+    fun delete() {
+        this.registerEvent(SpaceEvent.SpaceDeletedEvent(this))
+    }
 }
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/space/event/SpaceEvent.kt b/Domain-Module/src/main/kotlin/com/asap/domain/space/event/SpaceEvent.kt
@@ -0,0 +1,14 @@
+package com.asap.domain.space.event
+
+import com.asap.domain.common.DomainEvent
+import com.asap.domain.space.entity.Space
+
+sealed class SpaceEvent : DomainEvent<Space> {
+    data class SpaceCreatedEvent(
+        val space: Space,
+    ) : SpaceEvent()
+
+    data class SpaceDeletedEvent(
+        val space: Space,
+    ) : SpaceEvent()
+}
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/space/adapter/SpaceManagementJpaAdapter.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/space/adapter/SpaceManagementJpaAdapter.kt
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/space/repository/SpaceJpaRepository.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/space/repository/SpaceJpaRepository.kt

Original file line number	Diff line number	Diff line change
`@@ -14,18 +14,15 @@ import io.kotest.core.spec.style.BehaviorSpec`
`14`	`14`	`import io.mockk.every`
`15`	`15`	`import io.mockk.mockk`
`16`	`16`	`import io.mockk.verify`
`17`		`-import org.springframework.context.ApplicationEventPublisher`
`18`	`17`
`19`	`18`	`class SpaceCommandServiceTest :`
`20`	`19`	`BehaviorSpec({`
`21`	`20`
`22`	`21`	`val spaceManagementPort = mockk<SpaceManagementPort>(relaxed = true)`
`23`		`- val applicationEventPublisher = mockk<ApplicationEventPublisher>(relaxed = true)`
`24`	`22`
`25`	`23`	`val spaceCommandService =`
`26`	`24`	`SpaceCommandService(`
`27`	`25`	`spaceManagementPort,`
`28`		`- applicationEventPublisher,`
`29`	`26`	`)`
`30`	`27`
`31`	`28`	`given("스페이스 생성 요청이 들어왔을 때") {`
`@@ -75,7 +72,7 @@ class SpaceCommandServiceTest :`
`75`	`72`	`)`
`76`	`73`	`}`
`77`	`74`	`verify {`
`78`		`- spaceManagementPort.update(mockSpace.updateName(spaceUpdateNameCommand.name))`
	`75`	`+ spaceManagementPort.update(mockSpace)`
`79`	`76`	`}`
`80`	`77`	`}`
`81`	`78`	`}`
`@@ -91,9 +88,8 @@ class SpaceCommandServiceTest :`
`91`	`88`	`spaceCommandService.deleteOne(spaceDeleteOneCommand)`
`92`	`89`	`then("스페이스를 삭제한다") {`
`93`	`90`	`verify {`
`94`		`- spaceManagementPort.deleteById(`
`95`		`- userId = DomainId(spaceDeleteOneCommand.userId),`
`96`		`- spaceId = DomainId(spaceDeleteOneCommand.spaceId),`
	`91`	`+ spaceManagementPort.deleteBy(`
	`92`	`+ any(Space::class),`
`97`	`93`	`)`
`98`	`94`	`}`
`99`	`95`	`}`
`@@ -108,9 +104,8 @@ class SpaceCommandServiceTest :`
`108`	`104`	`spaceCommandService.deleteAllBy(spaceDeleteAllCommand)`
`109`	`105`	`then("여러 스페이스를 삭제한다") {`
`110`	`106`	`verify {`
`111`		`- spaceManagementPort.deleteAllBySpaceIds(`
`112`		`- userId = DomainId(spaceDeleteAllCommand.userId),`
`113`		`- spaceIds = spaceDeleteAllCommand.spaceIds.map { DomainId(it) },`
	`107`	`+ spaceManagementPort.deleteBy(`
	`108`	`+ any(Space::class),`
`114`	`109`	`)`
`115`	`110`	`}`
`116`	`111`	`}`