Merge pull request #100 from ASAP-Lettering/ASAP-237

tlarbals824 · web-flow · commit 5ef539978e76 · 2024-10-20T17:10:59.000+09:00
ASAP-237 refactor: 이벤트를 도메인 안에 저장한 다음 영속화할 때 배포하도록 수정
diff --git a/Application-Module/src/main/kotlin/com/asap/application/user/service/UserCommandService.kt b/Application-Module/src/main/kotlin/com/asap/application/user/service/UserCommandService.kt
@@ -1,6 +1,5 @@
 package com.asap.application.user.service
 
-import com.asap.application.user.event.UserEvent
 import com.asap.application.user.exception.UserException
 import com.asap.application.user.port.`in`.DeleteUserUsecase
 import com.asap.application.user.port.`in`.RegisterUserUsecase
@@ -14,7 +13,6 @@ import com.asap.domain.user.entity.User
 import com.asap.domain.user.entity.UserAuth
 import com.asap.domain.user.entity.UserToken
 import com.asap.domain.user.vo.UserPermission
-import org.springframework.context.ApplicationEventPublisher
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -25,7 +23,6 @@ class UserCommandService(
     private val userAuthManagementPort: UserAuthManagementPort,
     private val userManagementPort: UserManagementPort,
     private val userTokenManagementPort: UserTokenManagementPort,
-    private val applicationEventPublisher: ApplicationEventPublisher,
 ) : RegisterUserUsecase,
     DeleteUserUsecase,
     UpdateUserUsecase {
@@ -38,7 +35,7 @@ class UserCommandService(
             throw UserException.UserAlreadyRegisteredException()
         }
         val registerUser =
-            User(
+            User.create(
                 username = command.realName,
                 profileImage = userClaims.profileImage,
                 permission =
@@ -65,9 +62,6 @@ class UserCommandService(
 
         userTokenManagementPort.saveUserToken(UserToken(token = refreshToken, userId = registerUser.id))
 
-        // TODO: 이벤트 발행을 이렇게하는게 좋은지 다시 생각해보기
-        applicationEventPublisher.publishEvent(UserEvent.UserCreatedEvent(registerUser))
-
         return RegisterUserUsecase.Response(accessToken, refreshToken)
     }
 
@@ -77,7 +71,6 @@ class UserCommandService(
             .apply {
                 this.delete()
                 userManagementPort.save(this)
-                applicationEventPublisher.publishEvent(UserEvent.UserDeletedEvent(this))
             }.also {
                 userAuthManagementPort.getNotNull(it.id).apply {
                     this.delete()
diff --git a/Application-Module/src/test/kotlin/com/asap/application/image/service/ImageCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/image/service/ImageCommandServiceTest.kt
@@ -25,9 +25,10 @@ class ImageCommandServiceTest :
             )
 
         given("이미지 업로드 요청이 들어올 때") {
+            val mockUser = UserFixture.createUser()
             val command =
                 UploadImageUsecase.Command(
-                    userId = "user-id",
+                    userId = mockUser.id.value,
                     image =
                         FileMetaData(
                             name = "name",
@@ -36,7 +37,6 @@ class ImageCommandServiceTest :
                             inputStream = InputStream.nullInputStream(),
                         ),
                 )
-            val mockUser = UserFixture.createUser("user-id")
             every {
                 mockUserManagementPort.getUserNotNull(any())
             } returns mockUser
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
@@ -67,10 +67,11 @@ class LetterCommandServiceTest :
 
         given("편지 검증 시에") {
             val letterCode = "letter-code"
+            val mockUser = UserFixture.createUser(username = "receiver-name")
             val verifyCommand =
                 VerifyLetterAccessibleUsecase.Command(
                     letterCode = letterCode,
-                    userId = "user-id",
+                    userId = mockUser.id.value,
                 )
             val sendLetter =
                 SendLetter(
@@ -84,7 +85,7 @@ class LetterCommandServiceTest :
                     senderId = DomainId("sender-id"),
                     letterCode = letterCode,
                 )
-            val mockUser = UserFixture.createUser("user-id", "receiver-name")
+
             every { mockSendLetterManagementPort.verifiedLetter(any(), letterCode) } returns false
             every { mockSendLetterManagementPort.getLetterByCodeNotNull(any()) } returns sendLetter
             every { mockUserManagementPort.getUserNotNull(any()) } returns mockUser
@@ -107,7 +108,7 @@ class LetterCommandServiceTest :
                 }
             }
 
-            val anotherUser = UserFixture.createUser("another-user-id")
+            val anotherUser = UserFixture.createUser()
             every { mockSendLetterManagementPort.getLetterByCodeNotNull(any()) } returns sendLetter
             every { mockUserManagementPort.getUserNotNull(any()) } returns anotherUser
             `when`("편지의 수신자 이름과 사용자 이름이 다르면") {
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
@@ -60,7 +60,7 @@ class LetterQueryServiceTest :
                     senderId = DomainId.generate(),
                     letterCode = "letter-code",
                 )
-            val mockSender = UserFixture.createUser(mockSendLetter.senderId.value, "sender-name")
+            val mockSender = UserFixture.createUser(mockSendLetter.senderId, "sender-name")
             every {
                 mockSendLetterManagementPort.getReadLetterNotNull(
                     receiverId = DomainId(query.userId),
diff --git a/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceQueryServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/space/service/SpaceQueryServiceTest.kt
@@ -35,11 +35,11 @@ class SpaceQueryServiceTest :
                 MainSpace(
                     id = DomainId.generate(),
                 )
+            val user = UserFixture.createUser()
             val query =
                 GetMainSpaceUsecase.Query(
-                    userId = "userId",
+                    userId = user.id.value,
                 )
-            val user = UserFixture.createUser("userId")
             val space =
                 Space(
                     id = mainSpace.id,
diff --git a/Application-Module/src/test/kotlin/com/asap/application/user/service/SocialLoginServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/user/service/SocialLoginServiceTest.kt
@@ -43,7 +43,7 @@ class SocialLoginServiceTest :
                     socialId = "socialId",
                     socialLoginProvider = SocialLoginProvider.KAKAO,
                 )
-            val getUser = UserFixture.createUser(getUserAuth.userId.value)
+            val getUser = UserFixture.createUser(getUserAuth.userId)
             every { mockAuthInfoRetrievePort.getAuthInfo(SocialLoginProvider.KAKAO, "registered") } returns authInfo
             every {
                 mockUserAuthManagementPort.getUserAuth(
diff --git a/Application-Module/src/test/kotlin/com/asap/application/user/service/UserCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/user/service/UserCommandServiceTest.kt
@@ -1,6 +1,5 @@
 package com.asap.application.user.service
 
-import com.asap.application.user.event.UserEvent
 import com.asap.application.user.exception.UserException
 import com.asap.application.user.port.`in`.RegisterUserUsecase
 import com.asap.application.user.port.`in`.UpdateUserUsecase
@@ -19,7 +18,6 @@ import io.kotest.matchers.shouldBe
 import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
-import org.springframework.context.ApplicationEventPublisher
 import java.time.LocalDate
 
 class UserCommandServiceTest :
@@ -29,15 +27,13 @@ class UserCommandServiceTest :
         val mockUserAuthManagementPort = mockk<UserAuthManagementPort>(relaxed = true)
         val mockUserTokenConvertPort = mockk<UserTokenConvertPort>()
         val mockUserTokenManagementPort = mockk<UserTokenManagementPort>(relaxed = true)
-        val mockEventApplicationPublisher = mockk<ApplicationEventPublisher>(relaxed = true)
 
         val userCommandService =
             UserCommandService(
                 mockUserTokenConvertPort,
                 mockUserAuthManagementPort,
                 mockUserManagementPort,
                 mockUserTokenManagementPort,
-                mockEventApplicationPublisher,
             )
 
         given("회원 가입 요청이 들어왔을 때") {
@@ -68,7 +64,6 @@ class UserCommandServiceTest :
                     response.accessToken.isNotEmpty() shouldBe true
                     response.refreshToken.isNotEmpty() shouldBe true
                     verify { mockUserManagementPort.save(any()) }
-                    verify { mockEventApplicationPublisher.publishEvent(any(UserEvent.UserCreatedEvent::class)) }
                 }
             }
 
diff --git a/Application-Module/src/test/kotlin/com/asap/application/user/service/UserTokenCommandServiceTest.kt b/Application-Module/src/test/kotlin/com/asap/application/user/service/UserTokenCommandServiceTest.kt
@@ -57,11 +57,11 @@ class UserTokenCommandServiceTest :
 
             val refreshToken = "valid"
             every { mockUserTokenManagementPort.isExistsToken(refreshToken) } returns true
+            val mockUser = UserFixture.createUser()
             every { mockUserTokenConvertPort.resolveRefreshToken(refreshToken) } returns
                 UserClaims.Refresh(
-                    userId = "123",
+                    userId = mockUser.id.value,
                 )
-            val mockUser = UserFixture.createUser("123")
             every { mockUserManagementPort.getUserNotNull(any()) } returns mockUser
             every { mockUserTokenConvertPort.generateAccessToken(mockUser) } returns "accessToken"
             every { mockUserTokenConvertPort.generateRefreshToken(mockUser) } returns "refreshToken"
diff --git a/Bootstrap-Module/build.gradle.kts b/Bootstrap-Module/build.gradle.kts
@@ -22,4 +22,6 @@ dependencies {
 
     implementation(project(Modules.INFRASTRUCTURE_PERSISTENCE_MODULE))
     testFixturesImplementation(testFixtures(project(Modules.INFRASTRUCTURE_PERSISTENCE_MODULE)))
+
+    implementation(project(Modules.INFRASTRUCTURE_EVENT_MODULE))
 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/BootstrapApplication.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/BootstrapApplication.kt
@@ -3,6 +3,7 @@ package com.asap.bootstrap
 import com.asap.application.ApplicationConfig
 import com.asap.aws.AwsConfig
 import com.asap.client.ClientConfig
+import com.asap.event.EventConfig
 import com.asap.persistence.PersistenceConfig
 import com.asap.security.SecurityConfig
 import org.springframework.boot.SpringApplication
@@ -16,11 +17,12 @@ import org.springframework.context.annotation.Import
         ClientConfig::class,
         SecurityConfig::class,
         AwsConfig::class,
-        PersistenceConfig::class
-    ]
+        PersistenceConfig::class,
+        EventConfig::class,
+    ],
 )
-class BootstrapApplication {}
+class BootstrapApplication
 
 fun main(args: Array<String>) {
     SpringApplication.run(BootstrapApplication::class.java, *args)
-}
+}
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/integration/user/UserApiIntegrationTest.kt
@@ -18,8 +18,7 @@ class UserApiIntegrationTest : IntegrationSupporter() {
     @Test
     fun registerUserSuccessTest() {
         // given
-        val userId = userMockManager.settingUser()
-        val registerToken = jwtMockManager.generateRegisterToken(userId)
+        val registerToken = jwtMockManager.generateRegisterToken()
         val request = RegisterUserRequest(registerToken, true, true, true, LocalDate.now(), "realName")
         // when
         val response =
@@ -46,8 +45,7 @@ class UserApiIntegrationTest : IntegrationSupporter() {
     @Test
     fun registerUserInvalidTest_with_DuplicateUser() {
         // given
-        val userId = userMockManager.settingUser()
-        val duplicateRegisterToken = jwtMockManager.generateRegisterToken(userId)
+        val duplicateRegisterToken = jwtMockManager.generateRegisterToken()
         val request = RegisterUserRequest(duplicateRegisterToken, true, true, true, LocalDate.now(), "realName")
         mockMvc.post("/api/v1/users") {
             contentType = MediaType.APPLICATION_JSON
diff --git a/Common-Module/src/main/kotlin/com/asap/common/event/EventPublisher.kt b/Common-Module/src/main/kotlin/com/asap/common/event/EventPublisher.kt
@@ -0,0 +1,5 @@
+package com.asap.common.event
+
+interface EventPublisher {
+    fun <T : Any> publishAll(events: List<T>)
+}
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/common/Aggregate.kt b/Domain-Module/src/main/kotlin/com/asap/domain/common/Aggregate.kt
@@ -0,0 +1,21 @@
+package com.asap.domain.common
+
+import io.github.oshai.kotlinlogging.KotlinLogging
+
+abstract class Aggregate<T : Aggregate<T>>(
+    val id: DomainId,
+) {
+    private val logger = KotlinLogging.logger {}
+    private val events: MutableList<DomainEvent<T>> = mutableListOf()
+
+    fun registerEvent(event: DomainEvent<T>) {
+        events.add(event)
+    }
+
+    fun pullEvents(): List<DomainEvent<T>> {
+        val pulledEvents = events.toList()
+        logger.info { "Pulled events: $pulledEvents" }
+        events.clear()
+        return pulledEvents
+    }
+}
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/common/DomainEvent.kt b/Domain-Module/src/main/kotlin/com/asap/domain/common/DomainEvent.kt
@@ -0,0 +1,3 @@
+package com.asap.domain.common
+
+interface DomainEvent<T : Aggregate<T>>
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/user/entity/User.kt b/Domain-Module/src/main/kotlin/com/asap/domain/user/entity/User.kt
@@ -1,22 +1,40 @@
 package com.asap.domain.user.entity
 
+import com.asap.application.user.event.UserEvent
+import com.asap.domain.common.Aggregate
 import com.asap.domain.common.DomainId
 import com.asap.domain.user.vo.UserPermission
 import java.time.LocalDate
 
-data class User(
-    val id: DomainId = DomainId.generate(),
+class User(
+    id: DomainId,
     var username: String,
     var profileImage: String,
     var email: String,
     val permission: UserPermission,
     var birthday: LocalDate?,
-) {
+) : Aggregate<User>(id) {
+    companion object {
+        fun create(
+            id: DomainId = DomainId.generate(),
+            username: String,
+            profileImage: String,
+            email: String,
+            permission: UserPermission,
+            birthday: LocalDate?,
+        ): User =
+            User(id, username, profileImage, email, permission, birthday).also {
+                it.registerEvent(UserEvent.UserCreatedEvent(it))
+            }
+    }
+
     fun delete() {
         this.username = "UNKNOWN"
         this.profileImage = "UNKNOWN"
         this.email = "UNKNOWN"
         this.birthday = null
+
+        registerEvent(UserEvent.UserDeletedEvent(this))
     }
 
     fun updateBirthday(birthday: LocalDate) {
diff --git a/Domain-Module/src/main/kotlin/com/asap/domain/user/event/UserEvent.kt b/Domain-Module/src/main/kotlin/com/asap/domain/user/event/UserEvent.kt
@@ -1,13 +1,14 @@
 package com.asap.application.user.event
 
+import com.asap.domain.common.DomainEvent
 import com.asap.domain.user.entity.User
 
-sealed class UserEvent {
+sealed class UserEvent : DomainEvent<User> {
     data class UserCreatedEvent(
         val user: User,
-    )
+    ) : UserEvent()
 
     data class UserDeletedEvent(
         val user: User,
-    )
+    ) : UserEvent()
 }
diff --git a/Domain-Module/src/testFixtures/kotlin/com/asap/domain/UserFixture.kt b/Domain-Module/src/testFixtures/kotlin/com/asap/domain/UserFixture.kt
@@ -9,12 +9,12 @@ import java.time.LocalDate
 
 object UserFixture {
     fun createUser(
-        userId: String = "userId",
+        id: DomainId = DomainId.generate(),
         username: String = "nickname",
     ): User {
         // use instancio
-        return User(
-            id = DomainId(userId),
+        return User.create(
+            id = id,
             username = username,
             profileImage = "profileImage",
             permission = UserPermission(true, true, true),
diff --git a/Infrastructure-Module/Event/src/main/kotlin/com/asap/event/EventConfig.kt b/Infrastructure-Module/Event/src/main/kotlin/com/asap/event/EventConfig.kt
@@ -0,0 +1,8 @@
+package com.asap.event
+
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+@ComponentScan("com.asap.event")
+class EventConfig
diff --git a/Infrastructure-Module/Event/src/main/kotlin/com/asap/event/SpringEventPublisher.kt b/Infrastructure-Module/Event/src/main/kotlin/com/asap/event/SpringEventPublisher.kt
@@ -0,0 +1,14 @@
+package com.asap.event
+
+import com.asap.common.event.EventPublisher
+import org.springframework.context.ApplicationEventPublisher
+import org.springframework.stereotype.Component
+
+@Component
+class SpringEventPublisher(
+    private val applicationEventPublisher: ApplicationEventPublisher,
+) : EventPublisher {
+    override fun <T : Any> publishAll(events: List<T>) {
+        events.forEach { applicationEventPublisher.publishEvent(it) }
+    }
+}
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/adapter/UserManagementJpaAdapter.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/adapter/UserManagementJpaAdapter.kt
@@ -2,6 +2,7 @@ package com.asap.persistence.jpa.user.adapter
 
 import com.asap.application.user.exception.UserException
 import com.asap.application.user.port.out.UserManagementPort
+import com.asap.common.event.EventPublisher
 import com.asap.domain.common.DomainId
 import com.asap.domain.user.entity.User
 import com.asap.persistence.jpa.user.UserMapper
@@ -12,10 +13,12 @@ import org.springframework.stereotype.Repository
 @Repository
 class UserManagementJpaAdapter(
     private val userJpaRepository: UserJpaRepository,
+    private val eventPublisher: EventPublisher,
 ) : UserManagementPort {
     override fun save(user: User): User {
         val userEntity = UserMapper.toUserEntity(user)
         userJpaRepository.save(userEntity)
+        eventPublisher.publishAll(user.pullEvents())
         return user
     }
 
diff --git a/Infrastructure-Module/Persistence/src/main/resources/application-persistence-local.yml b/Infrastructure-Module/Persistence/src/main/resources/application-persistence-local.yml
diff --git a/Infrastructure-Module/Persistence/src/main/resources/application-persistence-test.yml b/Infrastructure-Module/Persistence/src/main/resources/application-persistence-test.yml
diff --git a/Infrastructure-Module/Persistence/src/main/resources/application-persistence.yml b/Infrastructure-Module/Persistence/src/main/resources/application-persistence.yml
diff --git a/Infrastructure-Module/Security/src/testFixtures/kotlin/com/asap/security/jwt/JwtMockManager.kt b/Infrastructure-Module/Security/src/testFixtures/kotlin/com/asap/security/jwt/JwtMockManager.kt
diff --git a/buildSrc/src/main/kotlin/Modules.kt b/buildSrc/src/main/kotlin/Modules.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class LetterQueryServiceTest :`
`60`	`60`	`senderId = DomainId.generate(),`
`61`	`61`	`letterCode = "letter-code",`
`62`	`62`	`)`
`63`		`- val mockSender = UserFixture.createUser(mockSendLetter.senderId.value, "sender-name")`
	`63`	`+ val mockSender = UserFixture.createUser(mockSendLetter.senderId, "sender-name")`
`64`	`64`	`every {`
`65`	`65`	`mockSendLetterManagementPort.getReadLetterNotNull(`
`66`	`66`	`receiverId = DomainId(query.userId),`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,11 @@ class SpaceQueryServiceTest :`
`35`	`35`	`MainSpace(`
`36`	`36`	`id = DomainId.generate(),`
`37`	`37`	`)`
	`38`	`+ val user = UserFixture.createUser()`
`38`	`39`	`val query =`
`39`	`40`	`GetMainSpaceUsecase.Query(`
`40`		`- userId = "userId",`
	`41`	`+ userId = user.id.value,`
`41`	`42`	`)`
`42`		`- val user = UserFixture.createUser("userId")`
`43`	`43`	`val space =`
`44`	`44`	`Space(`
`45`	`45`	`id = mainSpace.id,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class SocialLoginServiceTest :`
`43`	`43`	`socialId = "socialId",`
`44`	`44`	`socialLoginProvider = SocialLoginProvider.KAKAO,`
`45`	`45`	`)`
`46`		`- val getUser = UserFixture.createUser(getUserAuth.userId.value)`
	`46`	`+ val getUser = UserFixture.createUser(getUserAuth.userId)`
`47`	`47`	`every { mockAuthInfoRetrievePort.getAuthInfo(SocialLoginProvider.KAKAO, "registered") } returns authInfo`
`48`	`48`	`every {`
`49`	`49`	`mockUserAuthManagementPort.getUserAuth(`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,6 @@ dependencies {`
`22`	`22`
`23`	`23`	`implementation(project(Modules.INFRASTRUCTURE_PERSISTENCE_MODULE))`
`24`	`24`	`testFixturesImplementation(testFixtures(project(Modules.INFRASTRUCTURE_PERSISTENCE_MODULE)))`
	`25`	`+`
	`26`	`+ implementation(project(Modules.INFRASTRUCTURE_EVENT_MODULE))`
`25`	`27`	`}`