feat: 약관동의여부 API 기능개발 (#51)

minwoo1999 · web-flow · commit 3706fcc3b848 · 2025-07-25T20:35:13.000+09:00
* [BOOK-162] feat: apis - 약관동의 여부상태 값 확인,상태변경로직 작성(#50) * [BOOK-162] feat: domain - 내 상태 조회 시 약관동의 컬럼 추가(#50) * [BOOK-162] feat: infra - userEntity 약관동의 컬럼추가 (#50) * [BOOK-162] fix: infra - BaseTimeEntity lateinit error 해결(#50) * [BOOK-162] refactor: �apis - dto valid 추가 (#50)
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/controller/AuthController.kt b/apis/src/main/kotlin/org/yapp/apis/auth/controller/AuthController.kt
@@ -5,6 +5,7 @@ import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.*
 import org.yapp.apis.auth.dto.request.SocialLoginRequest
+import org.yapp.apis.auth.dto.request.TermsAgreementRequest
 import org.yapp.apis.auth.dto.request.TokenRefreshRequest
 import org.yapp.apis.auth.dto.response.AuthResponse
 import org.yapp.apis.auth.dto.response.UserProfileResponse
@@ -43,4 +44,13 @@ class AuthController(
         val userProfile = authUseCase.getUserProfile(userId)
         return ResponseEntity.ok(userProfile)
     }
+
+    @PutMapping("/terms-agreement")
+    override fun updateTermsAgreement(
+        @AuthenticationPrincipal userId: UUID,
+        @Valid @RequestBody request: TermsAgreementRequest
+    ): ResponseEntity<UserProfileResponse> {
+        val userProfile = authUseCase.updateTermsAgreement(userId, request.validTermsAgreed())
+        return ResponseEntity.ok(userProfile)
+    }
 }
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/controller/AuthControllerApi.kt b/apis/src/main/kotlin/org/yapp/apis/auth/controller/AuthControllerApi.kt
@@ -11,8 +11,10 @@ import org.springframework.http.ResponseEntity
 import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.PutMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.yapp.apis.auth.dto.request.SocialLoginRequest
+import org.yapp.apis.auth.dto.request.TermsAgreementRequest
 import org.yapp.apis.auth.dto.request.TokenRefreshRequest
 import org.yapp.apis.auth.dto.response.AuthResponse
 import org.yapp.apis.auth.dto.response.UserProfileResponse
@@ -105,4 +107,25 @@ interface AuthControllerApi {
     )
     @GetMapping("/me")
     fun getUserProfile(@AuthenticationPrincipal userId: UUID): ResponseEntity<UserProfileResponse>
+
+    @Operation(summary = "Update terms agreement", description = "Updates the user's terms agreement status")
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "Terms agreement status updated successfully",
+                content = [Content(schema = Schema(implementation = UserProfileResponse::class))]
+            ),
+            ApiResponse(
+                responseCode = "404",
+                description = "User not found",
+                content = [Content(schema = Schema(implementation = ErrorResponse::class))]
+            )
+        ]
+    )
+    @PutMapping("/terms-agreement")
+    fun updateTermsAgreement(
+        @AuthenticationPrincipal userId: UUID,
+        @Valid @RequestBody request: TermsAgreementRequest
+    ): ResponseEntity<UserProfileResponse>
 }
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/dto/request/TermsAgreementRequest.kt b/apis/src/main/kotlin/org/yapp/apis/auth/dto/request/TermsAgreementRequest.kt
@@ -0,0 +1,14 @@
+package org.yapp.apis.auth.dto.request
+
+import io.swagger.v3.oas.annotations.media.Schema
+import jakarta.validation.constraints.NotNull
+
+@Schema(description = "Request to update terms agreement status")
+data class TermsAgreementRequest private constructor(
+    @Schema(description = "Whether the user agrees to the terms of service", example = "true", required = true)
+    val termsAgreed: Boolean? = null
+
+
+) {
+    fun validTermsAgreed(): Boolean = termsAgreed!!
+}
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/dto/response/UserProfileResponse.kt b/apis/src/main/kotlin/org/yapp/apis/auth/dto/response/UserProfileResponse.kt
@@ -33,15 +33,22 @@ data class UserProfileResponse(
         description = "Social login provider type",
         example = "KAKAO"
     )
-    val provider: ProviderType
+    val provider: ProviderType,
+
+    @Schema(
+        description = "Whether the user has agreed to the terms of service",
+        example = "false"
+    )
+    val termsAgreed: Boolean
 ) {
     companion object {
         fun from(userProfileVO: UserProfileVO): UserProfileResponse {
             return UserProfileResponse(
                 id = userProfileVO.id.value,
                 email = userProfileVO.email.value,
                 nickname = userProfileVO.nickname,
-                provider = userProfileVO.provider
+                provider = userProfileVO.provider,
+                termsAgreed = userProfileVO.termsAgreed
             )
         }
     }
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/service/UserAuthService.kt b/apis/src/main/kotlin/org/yapp/apis/auth/service/UserAuthService.kt
@@ -21,6 +21,12 @@ class UserAuthService(
         return UserProfileResponse.from(userProfile)
     }
 
+    fun updateTermsAgreement(userId: UUID, termsAgreed: Boolean): UserProfileResponse {
+        validateUserExists(userId)
+        val updatedUserProfile = userDomainService.updateTermsAgreement(userId, termsAgreed)
+        return UserProfileResponse.from(updatedUserProfile)
+    }
+
     fun validateUserExists(userId: UUID) {
         if (!userDomainService.existsActiveUserByIdAndDeletedAtIsNull(userId)) {
             throw AuthException(AuthErrorCode.USER_NOT_FOUND, "User not found: $userId")
diff --git a/apis/src/main/kotlin/org/yapp/apis/auth/usecase/AuthUseCase.kt b/apis/src/main/kotlin/org/yapp/apis/auth/usecase/AuthUseCase.kt
@@ -54,4 +54,9 @@ class AuthUseCase(
     fun getUserProfile(userId: UUID): UserProfileResponse {
         return userAuthService.findUserProfileByUserId(userId)
     }
+
+    @Transactional
+    fun updateTermsAgreement(userId: UUID, termsAgreed: Boolean): UserProfileResponse {
+        return userAuthService.updateTermsAgreement(userId, termsAgreed)
+    }
 }
diff --git a/apis/src/main/kotlin/org/yapp/apis/book/dto/request/UpsertUserBookRequest.kt b/apis/src/main/kotlin/org/yapp/apis/book/dto/request/UpsertUserBookRequest.kt
@@ -7,14 +7,22 @@ import java.util.UUID
 
 
 data class UpsertUserBookRequest private constructor(
-    val userId: UUID,
-    val bookIsbn: String,
-    val bookTitle: String,
-    val bookAuthor: String,
-    val bookPublisher: String,
-    val bookCoverImageUrl: String,
-    val status: BookStatus
+    val userId: UUID? = null,
+    val bookIsbn: String? = null,
+    val bookTitle: String? = null,
+    val bookAuthor: String? = null,
+    val bookPublisher: String? = null,
+    val bookCoverImageUrl: String? = null,
+    val status: BookStatus? = null
 ) {
+    fun validUserId(): UUID = userId!!
+    fun validBookIsbn(): String = bookIsbn!!
+    fun validBookTitle(): String = bookTitle!!
+    fun validBookAuthor(): String = bookAuthor!!
+    fun validBookPublisher(): String = bookPublisher!!
+    fun validBookCoverImageUrl(): String = bookCoverImageUrl!!
+    fun validStatus(): BookStatus = status!!
+
     companion object {
         fun of(
             userId: UUID,
diff --git a/apis/src/main/kotlin/org/yapp/apis/book/service/UserBookService.kt b/apis/src/main/kotlin/org/yapp/apis/book/service/UserBookService.kt
@@ -18,18 +18,18 @@ import java.util.UUID
 class UserBookService(
     private val userBookDomainService: UserBookDomainService
 ) {
-    fun upsertUserBook(upsertUserBookRequest: UpsertUserBookRequest): UserBookResponse =
-        UserBookResponse.from(
-            userBookDomainService.upsertUserBook(
-                upsertUserBookRequest.userId,
-                upsertUserBookRequest.bookIsbn,
-                upsertUserBookRequest.bookTitle,
-                upsertUserBookRequest.bookAuthor,
-                upsertUserBookRequest.bookPublisher,
-                upsertUserBookRequest.bookCoverImageUrl,
-                upsertUserBookRequest.status
-            )
+    fun upsertUserBook(upsertUserBookRequest: UpsertUserBookRequest): UserBookResponse {
+        val userBookInfoVO = userBookDomainService.upsertUserBook(
+            upsertUserBookRequest.validUserId(),
+            upsertUserBookRequest.validBookIsbn(),
+            upsertUserBookRequest.validBookTitle(),
+            upsertUserBookRequest.validBookAuthor(),
+            upsertUserBookRequest.validBookPublisher(),
+            upsertUserBookRequest.validBookCoverImageUrl(),
+            upsertUserBookRequest.validStatus()
         )
+        return UserBookResponse.from(userBookInfoVO)
+    }
 
     fun findAllUserBooks(userId: UUID): List<UserBookResponse> {
         val userBooks: List<UserBookInfoVO> = userBookDomainService.findAllUserBooks(userId)
@@ -39,12 +39,11 @@ class UserBookService(
     }
 
     fun findAllByUserIdAndBookIsbnIn(userBooksByIsbnsRequest: UserBooksByIsbnsRequest): List<UserBookResponse> {
-        return userBookDomainService
-            .findAllByUserIdAndBookIsbnIn(
-                userBooksByIsbnsRequest.validUserId(),
-                userBooksByIsbnsRequest.validIsbns(),
-            )
-            .map { UserBookResponse.from(it) }
+        val userBooks = userBookDomainService.findAllByUserIdAndBookIsbnIn(
+            userBooksByIsbnsRequest.validUserId(),
+            userBooksByIsbnsRequest.validIsbns(),
+        )
+        return userBooks.map { UserBookResponse.from(it) }
     }
 
     private fun findUserBooksByDynamicCondition(
@@ -53,8 +52,8 @@ class UserBookService(
         sort: String?,
         pageable: Pageable
     ): Page<UserBookResponse> {
-        return userBookDomainService.findUserBooksByDynamicCondition(userId, status, sort, pageable)
-            .map { UserBookResponse.from(it) }
+        val page = userBookDomainService.findUserBooksByDynamicCondition(userId, status, sort, pageable)
+        return page.map { UserBookResponse.from(it) }
     }
 
     fun findUserBooksByDynamicConditionWithStatusCounts(
diff --git a/domain/src/main/kotlin/org/yapp/domain/user/User.kt b/domain/src/main/kotlin/org/yapp/domain/user/User.kt
@@ -28,6 +28,7 @@ data class User private constructor(
     val providerType: ProviderType,
     val providerId: ProviderId,
     val role: Role,
+    val termsAgreed: Boolean = false,
     val createdAt: LocalDateTime? = null,
     val updatedAt: LocalDateTime? = null,
     val deletedAt: LocalDateTime? = null
@@ -40,13 +41,20 @@ data class User private constructor(
         )
     }
 
+    fun updateTermsAgreement(termsAgreed: Boolean): User {
+        return this.copy(
+            termsAgreed = termsAgreed
+        )
+    }
+
     companion object {
         fun create(
             email: String,
             nickname: String,
             profileImageUrl: String?,
             providerType: ProviderType,
-            providerId: String
+            providerId: String,
+            termsAgreed: Boolean = false
         ): User {
             return User(
                 id = Id.newInstance(UuidGenerator.create()),
@@ -55,7 +63,8 @@ data class User private constructor(
                 profileImageUrl = profileImageUrl,
                 providerType = providerType,
                 providerId = ProviderId.newInstance(providerId),
-                role = Role.USER
+                role = Role.USER,
+                termsAgreed = termsAgreed
             )
         }
 
@@ -66,7 +75,8 @@ data class User private constructor(
             profileImageUrl: String?,
             providerType: ProviderType,
             providerId: String,
-            role: Role
+            role: Role,
+            termsAgreed: Boolean = false
         ): User {
             return User(
                 id = Id.newInstance(UuidGenerator.create()),
@@ -75,7 +85,8 @@ data class User private constructor(
                 profileImageUrl = profileImageUrl,
                 providerType = providerType,
                 providerId = ProviderId.newInstance(providerId),
-                role = role
+                role = role,
+                termsAgreed = termsAgreed
             )
         }
 
@@ -87,6 +98,7 @@ data class User private constructor(
             providerType: ProviderType,
             providerId: ProviderId,
             role: Role,
+            termsAgreed: Boolean = false,
             createdAt: LocalDateTime? = null,
             updatedAt: LocalDateTime? = null,
             deletedAt: LocalDateTime? = null
@@ -99,6 +111,7 @@ data class User private constructor(
                 providerType = providerType,
                 providerId = providerId,
                 role = role,
+                termsAgreed = termsAgreed,
                 createdAt = createdAt,
                 updatedAt = updatedAt,
                 deletedAt = deletedAt
diff --git a/domain/src/main/kotlin/org/yapp/domain/user/UserDomainService.kt b/domain/src/main/kotlin/org/yapp/domain/user/UserDomainService.kt
@@ -69,4 +69,12 @@ class UserDomainService(
         val restoredUser = userRepository.save(deletedUser.restore())
         return UserIdentityVO.newInstance(restoredUser)
     }
+
+    fun updateTermsAgreement(userId: UUID, termsAgreed: Boolean): UserProfileVO {
+        val user = userRepository.findById(userId)
+            ?: throw UserNotFoundException(UserErrorCode.USER_NOT_FOUND)
+
+        val updatedUser = userRepository.save(user.updateTermsAgreement(termsAgreed))
+        return UserProfileVO.newInstance(updatedUser)
+    }
 }
diff --git a/domain/src/main/kotlin/org/yapp/domain/user/vo/UserProfileVO.kt b/domain/src/main/kotlin/org/yapp/domain/user/vo/UserProfileVO.kt
@@ -7,7 +7,8 @@ data class UserProfileVO private constructor(
     val id: User.Id,
     val email: User.Email,
     val nickname: String,
-    val provider: ProviderType
+    val provider: ProviderType,
+    val termsAgreed: Boolean
 ) {
     init {
         require(nickname.isNotBlank()) {"nickname은 비어 있을 수 없습니다."}
@@ -22,7 +23,8 @@ data class UserProfileVO private constructor(
                 id = user.id,
                 email = user.email,
                 nickname = user.nickname,
-                provider = user.providerType
+                provider = user.providerType,
+                termsAgreed = user.termsAgreed
             )
         }
     }
diff --git a/domain/src/main/kotlin/org/yapp/domain/userbook/UserBookDomainService.kt b/domain/src/main/kotlin/org/yapp/domain/userbook/UserBookDomainService.kt
@@ -36,8 +36,8 @@ class UserBookDomainService(
     }
 
     fun findAllUserBooks(userId: UUID): List<UserBookInfoVO> {
-        return userBookRepository.findAllByUserId(userId)
-            .map(UserBookInfoVO::newInstance)
+        val userBooks = userBookRepository.findAllByUserId(userId)
+        return userBooks.map { UserBookInfoVO.newInstance(it) }
     }
 
     fun findUserBooksByDynamicCondition(
@@ -46,16 +46,16 @@ class UserBookDomainService(
         sort: String?,
         pageable: Pageable
     ): Page<UserBookInfoVO> {
-        return userBookRepository.findUserBooksByDynamicCondition(userId, status, sort, pageable)
-            .map(UserBookInfoVO::newInstance)
+        val page = userBookRepository.findUserBooksByDynamicCondition(userId, status, sort, pageable)
+        return page.map { UserBookInfoVO.newInstance(it) }
     }
 
     fun findAllByUserIdAndBookIsbnIn(userId: UUID, isbns: List<String>): List<UserBookInfoVO> {
         if (isbns.isEmpty()) {
             return emptyList()
         }
-        return userBookRepository.findAllByUserIdAndBookIsbnIn(userId, isbns)
-            .map { UserBookInfoVO.newInstance(it) }
+        val userBooks = userBookRepository.findAllByUserIdAndBookIsbnIn(userId, isbns)
+        return userBooks.map { UserBookInfoVO.newInstance(it) }
     }
 
     fun getUserBookStatusCounts(userId: UUID): UserBookStatusCountsVO {
diff --git a/infra/src/main/kotlin/org/yapp/infra/common/BaseTimeEntity.kt b/infra/src/main/kotlin/org/yapp/infra/common/BaseTimeEntity.kt
@@ -14,12 +14,12 @@ abstract class BaseTimeEntity {
 
     @CreatedDate
     @Column(name = "created_at", nullable = false, updatable = false)
-    lateinit var createdAt: LocalDateTime
+    var createdAt: LocalDateTime = LocalDateTime.now()
         protected set
 
     @LastModifiedDate
     @Column(name = "updated_at", nullable = false)
-    lateinit var updatedAt: LocalDateTime
+    var updatedAt: LocalDateTime = LocalDateTime.now()
         protected set
 
     @Column(name = "deleted_at")
diff --git a/infra/src/main/kotlin/org/yapp/infra/user/entity/UserEntity.kt b/infra/src/main/kotlin/org/yapp/infra/user/entity/UserEntity.kt

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,9 @@ class AuthUseCase(`
`54`	`54`	`fun getUserProfile(userId: UUID): UserProfileResponse {`
`55`	`55`	`return userAuthService.findUserProfileByUserId(userId)`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+ @Transactional`
	`59`	`+ fun updateTermsAgreement(userId: UUID, termsAgreed: Boolean): UserProfileResponse {`
	`60`	`+ return userAuthService.updateTermsAgreement(userId, termsAgreed)`
	`61`	`+ }`
`57`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,12 @@ class UserDomainService(`
`69`	`69`	`val restoredUser = userRepository.save(deletedUser.restore())`
`70`	`70`	`return UserIdentityVO.newInstance(restoredUser)`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ fun updateTermsAgreement(userId: UUID, termsAgreed: Boolean): UserProfileVO {`
	`74`	`+ val user = userRepository.findById(userId)`
	`75`	`+ ?: throw UserNotFoundException(UserErrorCode.USER_NOT_FOUND)`
	`76`	`+`
	`77`	`+ val updatedUser = userRepository.save(user.updateTermsAgreement(termsAgreed))`
	`78`	`+ return UserProfileVO.newInstance(updatedUser)`
	`79`	`+ }`
`72`	`80`	`}`