Merge pull request #107 from ASAP-Lettering/ASAP-304

tlarbals824 · web-flow · commit 2e9b36d8729a · 2024-12-02T09:06:10.000+09:00
ASAP-304 feat: 온보딩 여부 저장하는 컬럼 추가
diff --git a/.github/workflows/Integration.yml b/.github/workflows/Integration.yml
@@ -35,5 +35,5 @@ jobs:
 
         - name: Build With Gradle
           run: |
-            ./gradlew build --info
+            ./gradlew build
 
diff --git a/Application-Module/src/main/kotlin/com/asap/application/user/port/in/SocialLoginUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/user/port/in/SocialLoginUsecase.kt
@@ -11,9 +11,11 @@ interface SocialLoginUsecase {
 
     sealed class Response {
     }
+
     data class Success(
         val accessToken: String,
-        val refreshToken: String
+        val refreshToken: String,
+        val isProcessedOnboarding: Boolean
     ) : Response()
 
     data class NonRegistered(
diff --git a/Application-Module/src/main/kotlin/com/asap/application/user/port/in/UpdateUserUsecase.kt b/Application-Module/src/main/kotlin/com/asap/application/user/port/in/UpdateUserUsecase.kt
@@ -5,10 +5,16 @@ import java.time.LocalDate
 interface UpdateUserUsecase {
     fun executeFor(command: Command.Birthday)
 
+    fun executeFor(command: Command.Onboarding)
+
     sealed class Command {
         data class Birthday(
             val userId: String,
             val birthday: LocalDate,
         ) : Command()
+
+        data class Onboarding(
+            val userId: String,
+        ) : Command()
     }
 }
diff --git a/Application-Module/src/main/kotlin/com/asap/application/user/service/SocialLoginService.kt b/Application-Module/src/main/kotlin/com/asap/application/user/service/SocialLoginService.kt
@@ -22,11 +22,11 @@ class SocialLoginService(
             authInfoRetrievePort.getAuthInfo(SocialLoginProvider.parse(command.provider), command.accessToken)
         val userAuth = userAuthManagementPort.getUserAuth(authInfo.socialId, authInfo.socialLoginProvider)
         return userAuth?.let {
-            userManagementPort.getUser(userAuth.userId)?.let {
-                val accessToken = userTokenConvertPort.generateAccessToken(it)
-                val refreshToken = userTokenConvertPort.generateRefreshToken(it)
-                userTokenManagementPort.saveUserToken(UserToken(token = refreshToken, userId = it.id))
-                SocialLoginUsecase.Success(accessToken, refreshToken)
+            userManagementPort.getUser(userAuth.userId)?.let { user ->
+                val accessToken = userTokenConvertPort.generateAccessToken(user)
+                val refreshToken = userTokenConvertPort.generateRefreshToken(user)
+                userTokenManagementPort.saveUserToken(UserToken(token = refreshToken, userId = user.id))
+                SocialLoginUsecase.Success(accessToken, refreshToken, user.isProcessedOnboarding())
             } ?: run {
                 throw DefaultException.InvalidStateException("사용자 인증정보만 존재합니다. - ${userAuth.userId}")
             }
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
@@ -87,4 +87,14 @@ class UserCommandService(
                 userManagementPort.save(this)
             }
     }
+
+    override fun executeFor(command: UpdateUserUsecase.Command.Onboarding) {
+        userManagementPort
+            .getUserNotNull(DomainId(command.userId))
+            .apply {
+                this.updateOnboarding()
+                userManagementPort.save(this)
+            }
+
+    }
 }
diff --git a/Application-Module/src/testFixtures/kotlin/com/asap/application/user/UserApplicationConfig.kt b/Application-Module/src/testFixtures/kotlin/com/asap/application/user/UserApplicationConfig.kt
@@ -2,16 +2,14 @@ package com.asap.application.user
 
 import com.asap.application.user.port.out.UserAuthManagementPort
 import com.asap.application.user.port.out.UserManagementPort
-import com.asap.application.user.port.out.UserTokenManagementPort
 import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.context.annotation.Bean
 
 @TestConfiguration
 class UserApplicationConfig(
-    private val userTokenManagementPort: UserTokenManagementPort,
     private val userManagementPort: UserManagementPort,
     private val userAuthManagementPort: UserAuthManagementPort,
 ) {
     @Bean
-    fun userMockGenerator(): UserMockManager = UserMockManager(userTokenManagementPort, userManagementPort, userAuthManagementPort)
+    fun userMockGenerator(): UserMockManager = UserMockManager(userManagementPort, userAuthManagementPort)
 }
diff --git a/Application-Module/src/testFixtures/kotlin/com/asap/application/user/UserMockManager.kt b/Application-Module/src/testFixtures/kotlin/com/asap/application/user/UserMockManager.kt
@@ -2,7 +2,6 @@ package com.asap.application.user
 
 import com.asap.application.user.port.out.UserAuthManagementPort
 import com.asap.application.user.port.out.UserManagementPort
-import com.asap.application.user.port.out.UserTokenManagementPort
 import com.asap.domain.common.DomainId
 import com.asap.domain.user.entity.User
 import com.asap.domain.user.entity.UserAuth
@@ -11,7 +10,6 @@ import com.asap.domain.user.vo.UserPermission
 import java.time.LocalDate
 
 class UserMockManager(
-    private val tokenManagementPort: UserTokenManagementPort,
     private val userManagementPort: UserManagementPort,
     private val userAuthManagementPort: UserAuthManagementPort,
 ) {
@@ -35,6 +33,7 @@ class UserMockManager(
             permission = UserPermission(true, true, true),
             birthday = LocalDate.now(),
             email = "email",
+            onboardingAt = null,
         ),
     )
 
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/controller/AuthController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/controller/AuthController.kt
@@ -29,7 +29,8 @@ class AuthController(
             is SocialLoginUsecase.Success -> ResponseEntity.ok(
                 SocialLoginResponse.Success(
                     response.accessToken,
-                    response.refreshToken
+                    response.refreshToken,
+                    response.isProcessedOnboarding
                 )
             )
 
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginResponse.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/auth/dto/SocialLoginResponse.kt
@@ -9,14 +9,15 @@ import io.swagger.v3.oas.annotations.media.Schema
         SocialLoginResponse.NonRegistered::class
     ]
 )
-sealed class SocialLoginResponse{
+sealed class SocialLoginResponse {
 
     @Schema(description = "기존 회원 로그인 성공")
     data class Success(
         @Schema(description = "access token")
         val accessToken: String,
         @Schema(description = "refresh token")
-        val refreshToken: String
+        val refreshToken: String,
+        val isProcessedOnboarding: Boolean
     ) : SocialLoginResponse()
 
 
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/api/UserApi.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/api/UserApi.kt
@@ -100,4 +100,10 @@ interface UserApi {
         @AccessUser userId: String,
         @RequestBody request: UpdateBirthdayRequest,
     )
+
+    @Operation(summary = "온보딩 여부 저장")
+    @PutMapping("/info/onboarding")
+    fun updateOnboarding(
+        @AccessUser userId: String,
+    )
 }
diff --git a/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/controller/UserController.kt b/Bootstrap-Module/src/main/kotlin/com/asap/bootstrap/user/controller/UserController.kt
@@ -69,4 +69,12 @@ class UserController(
             ),
         )
     }
+
+    override fun updateOnboarding(userId: String) {
+        updateUserUsecase.executeFor(
+            UpdateUserUsecase.Command.Onboarding(
+                userId = userId,
+            ),
+        )
+    }
 }
diff --git a/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt b/Bootstrap-Module/src/test/kotlin/com/asap/bootstrap/acceptance/auth/controller/AuthControllerTest.kt
@@ -33,7 +33,7 @@ class AuthControllerTest : AcceptanceSupporter() {
         val command = SocialLoginUsecase.Command("KAKAO", "registered")
         BDDMockito
             .given(socialLoginUsecase.login(command))
-            .willReturn(SocialLoginUsecase.Success("accessToken", "refreshToken"))
+            .willReturn(SocialLoginUsecase.Success("accessToken", "refreshToken", false))
         // when
         val response =
             mockMvc.post("/api/v1/auth/login/{provider}", "KAKAO") {
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
@@ -5,6 +5,7 @@ import com.asap.domain.common.Aggregate
 import com.asap.domain.common.DomainId
 import com.asap.domain.user.vo.UserPermission
 import java.time.LocalDate
+import java.time.LocalDateTime
 
 class User(
     id: DomainId,
@@ -13,6 +14,7 @@ class User(
     var email: String,
     val permission: UserPermission,
     var birthday: LocalDate?,
+    var onboardingAt: LocalDateTime?,
 ) : Aggregate<User>(id) {
     companion object {
         fun create(
@@ -23,7 +25,7 @@ class User(
             permission: UserPermission,
             birthday: LocalDate?,
         ): User =
-            User(id, username, profileImage, email, permission, birthday).also {
+            User(id, username, profileImage, email, permission, birthday, null).also {
                 it.registerEvent(UserEvent.UserCreatedEvent(it))
             }
     }
@@ -40,4 +42,12 @@ class User(
     fun updateBirthday(birthday: LocalDate) {
         this.birthday = birthday
     }
+
+    fun updateOnboarding() {
+        this.onboardingAt = LocalDateTime.now()
+    }
+
+    fun isProcessedOnboarding(): Boolean {
+        return this.onboardingAt != null
+    }
 }
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/UserMapper.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/UserMapper.kt
@@ -25,6 +25,7 @@ object UserMapper {
                     marketingPermission = user.permission.marketingPermission,
                 ),
             email = user.email,
+            onboardingAt = user.onboardingAt,
         )
 
     fun toUser(userEntity: UserEntity): User =
@@ -40,6 +41,7 @@ object UserMapper {
                 ),
             birthday = userEntity.birthday,
             email = userEntity.email,
+            onboardingAt = userEntity.onboardingAt,
         )
 
     fun toUserAuthEntity(userAuth: UserAuth): UserAuthEntity =
diff --git a/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/entity/UserEntity.kt b/Infrastructure-Module/Persistence/src/main/kotlin/com/asap/persistence/jpa/user/entity/UserEntity.kt
@@ -3,6 +3,7 @@ package com.asap.persistence.jpa.user.entity
 import com.asap.persistence.jpa.common.AggregateRoot
 import jakarta.persistence.*
 import java.time.LocalDate
+import java.time.LocalDateTime
 
 @Entity
 @Table(name = "user")
@@ -13,6 +14,7 @@ class UserEntity(
     profileImage: String,
     userPermission: UserPermissionEntity,
     birthday: LocalDate?,
+    onboardingAt: LocalDateTime?,
 ) : AggregateRoot<UserEntity>(id) {
     @Column(nullable = false)
     val username: String = username
@@ -29,4 +31,6 @@ class UserEntity(
     val userPermission: UserPermissionEntity = userPermission
 
     val birthday: LocalDate? = birthday
+
+    val onboardingAt: LocalDateTime? = onboardingAt
 }
diff --git a/Infrastructure-Module/Persistence/src/main/resources/db/V1_13__alter_column_user.sql b/Infrastructure-Module/Persistence/src/main/resources/db/V1_13__alter_column_user.sql
@@ -0,0 +1 @@
+alter table user add column onboarding_at datetime null;

Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,14 @@ class UserCommandService(`
`87`	`87`	`userManagementPort.save(this)`
`88`	`88`	`}`
`89`	`89`	`}`
	`90`	`+`
	`91`	`+ override fun executeFor(command: UpdateUserUsecase.Command.Onboarding) {`
	`92`	`+ userManagementPort`
	`93`	`+ .getUserNotNull(DomainId(command.userId))`
	`94`	`+ .apply {`
	`95`	`+ this.updateOnboarding()`
	`96`	`+ userManagementPort.save(this)`
	`97`	`+ }`
	`98`	`+`
	`99`	`+ }`
`90`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,8 @@ class AuthController(`
`29`	`29`	`is SocialLoginUsecase.Success -> ResponseEntity.ok(`
`30`	`30`	`SocialLoginResponse.Success(`
`31`	`31`	`response.accessToken,`
`32`		`- response.refreshToken`
	`32`	`+ response.refreshToken,`
	`33`	`+ response.isProcessedOnboarding`
`33`	`34`	`)`
`34`	`35`	`)`
`35`	`36`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,10 @@ interface UserApi {`
`100`	`100`	`@AccessUser userId: String,`
`101`	`101`	`@RequestBody request: UpdateBirthdayRequest,`
`102`	`102`	`)`
	`103`	`+`
	`104`	`+ @Operation(summary = "온보딩 여부 저장")`
	`105`	`+ @PutMapping("/info/onboarding")`
	`106`	`+ fun updateOnboarding(`
	`107`	`+ @AccessUser userId: String,`
	`108`	`+ )`
`103`	`109`	`}`