Merge pull request #27 from prgrms-web-devcourse-final-project/QUZ-82-user-update

HMWG · web-flow · commit 7e2d27167b55 · 2024-11-26T15:32:53.000+09:00
[QUZ-82][FEATURE] 프로필 업데이트
diff --git a/gateway-service/src/main/kotlin/com/grepp/quizy/exception/JwtErrorCode.kt b/gateway-service/src/main/kotlin/com/grepp/quizy/exception/JwtErrorCode.kt
@@ -17,7 +17,7 @@ enum class JwtErrorCode(
     TOKEN_EXPIRED(UNAUTHORIZED, "TOKEN_401", "만료된 토큰"),
     TOKEN_NOT_VALIDATE(UNAUTHORIZED, "TOKEN_401", "유효하지 않은 토큰"),
     TOKEN_BAD_SIGNATURE(UNAUTHORIZED, "TOKEN_401", "서명 불일치"),
-    TOKEN_NOT_FOUNT(NOT_FOUND, "TOKEN_404", "토큰이 존재하지 않음"),
+    TOKEN_NOT_FOUNT(BAD_REQUEST, "TOKEN_400", "토큰이 존재하지 않음"),
     UNKNOWN_EXCEPTION(INTERNAL_SERVER, "TOKEN_900", "알 수 없는 오류 발생"),
     LOGGED_OUT_USER(UNAUTHORIZED, "TOKEN_401", "로그아웃된 사용자"),
     USER_NOT_FOUND(NOT_FOUND, "TOKEN_404", "존재하지 않는 사용자"),
diff --git a/gateway-service/src/main/resources/application.yml b/gateway-service/src/main/resources/application.yml
@@ -77,8 +77,17 @@ spring:
 springdoc:
   swagger-ui:
     urls[0]:
+      name: Game API
+      url: http://localhost:8080/api/game/api-docs
+    urls[1]:
       name: Quiz API
       url: http://localhost:8080/api/quiz/api-docs
+    urls[2]:
+      name: Matching API
+      url: http://localhost:8080/api/matching/api-docs
+    urls[3]:
+      name: User API
+      url: http://localhost:8080/api/user/api-docs
 
 jwt:
   secret: ${JWT_SECRET}
diff --git a/user-service/user-application/app-api/build.gradle.kts b/user-service/user-application/app-api/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
 
     // OAuth2
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
+    
 }
 
 tasks.named<BootJar>("bootJar") {
diff --git a/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/global/oauth2/CustomOAuth2UserService.kt b/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/global/oauth2/CustomOAuth2UserService.kt
@@ -55,7 +55,7 @@ class CustomOAuth2UserService(
     private fun createNewUser(attributes: OAuth2Attributes) {
         val newUser = User(
             id = UserId(0),
-            userProfile = UserProfile(
+            _userProfile = UserProfile(
                 name = attributes.name,
                 email = attributes.email,
                 profileImageUrl = attributes.profileImageUrl
diff --git a/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/global/util/FileMapper.kt b/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/global/util/FileMapper.kt
@@ -0,0 +1,9 @@
+package com.grepp.quizy.user.api.global.util
+
+import com.grepp.quizy.user.domain.user.ImageFile
+import org.springframework.web.multipart.MultipartFile
+
+fun toImageFile(file: MultipartFile): ImageFile {
+    val contentType = file.contentType ?: throw IllegalArgumentException("File content type is null")
+    return ImageFile(contentType, file.bytes, file.originalFilename, file.size)
+}
diff --git a/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/UserApi.kt b/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/UserApi.kt
@@ -1,11 +1,31 @@
 package com.grepp.quizy.user.api.user
 
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import com.grepp.quizy.common.api.ApiResponse
+import com.grepp.quizy.user.api.global.util.toImageFile
+import com.grepp.quizy.user.api.user.dto.UpdateProfileRequest
+import com.grepp.quizy.user.domain.user.UserId
+import com.grepp.quizy.user.domain.user.UserUpdateUseCase
+import org.springframework.web.bind.annotation.*
+import org.springframework.web.multipart.MultipartFile
 
 @RestController
 @RequestMapping("/api/user")
-class UserApi {
+class UserApi(
+    private val userUpdateUseCase: UserUpdateUseCase,
+) {
 
+    @PutMapping("/me")
+    fun updateMe(
+        @RequestPart("data", required = false) request: UpdateProfileRequest?,
+        @RequestPart("profileImage", required = false) profileImage: MultipartFile?,
+        @RequestHeader("X-Auth-Id") userId: String,
+    ): ApiResponse<Unit> {
+        val image = profileImage?.let {
+            toImageFile(it)
+        }
+
+        userUpdateUseCase.updateProfile(UserId(userId.toLong()), request?.name, image)
+        return ApiResponse.success()
+    }
 
 }
diff --git a/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/dto/UpdateProfileRequest.kt b/user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/dto/UpdateProfileRequest.kt
@@ -0,0 +1,10 @@
+package com.grepp.quizy.user.api.user.dto
+
+import jakarta.validation.constraints.Size
+
+data class UpdateProfileRequest(
+    @field:Size(min = 2, max = 50, message = "이름은 2자 이상 50자 이하여야 합니다.")
+    val name: String?,
+) {
+    constructor() : this(null)
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/DeleteUserEvent.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/DeleteUserEvent.kt
@@ -0,0 +1,16 @@
+package com.grepp.quizy.user.domain.user
+
+class DeleteUserEvent(
+    private val userId: Long,
+) : UserEvent {
+    override fun getUserId(): Long {
+        return userId
+    }
+
+    companion object {
+        fun from(user: User): DeleteUserEvent {
+            return DeleteUserEvent(user.id.value)
+        }
+    }
+
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/ImageFile.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/ImageFile.kt
@@ -0,0 +1,11 @@
+package com.grepp.quizy.user.domain.user
+
+data class ImageFile(
+    val contentType: String,
+    val bytes: ByteArray,
+    val originalFilename: String?,
+    val size: Long
+) {
+
+
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/ProfileImageUploader.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/ProfileImageUploader.kt
@@ -0,0 +1,5 @@
+package com.grepp.quizy.user.domain.user
+
+interface ProfileImageUploader {
+    fun uploadFile(file: ImageFile, directory: String = "images"): String
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UpdateUserEvent.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UpdateUserEvent.kt
@@ -0,0 +1,21 @@
+package com.grepp.quizy.user.domain.user
+
+class UpdateUserEvent(
+    private val userId: Long,
+    val name: String,
+    val profileImageUrl: String,
+) : UserEvent {
+    override fun getUserId(): Long {
+        return userId
+    }
+
+    companion object {
+        fun from(user: User): UpdateUserEvent {
+            return UpdateUserEvent(
+                userId = user.id.value,
+                name = user.userProfile.name,
+                profileImageUrl = user.userProfile.profileImageUrl,
+            )
+        }
+    }
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/User.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/User.kt
@@ -3,17 +3,24 @@ package com.grepp.quizy.user.domain.user
 
 class User(
     val id: UserId,
-    val userProfile: UserProfile,
+    private var _userProfile: UserProfile,
     private var _role: Role = Role.USER,
     val provider: ProviderType,
 ) {
     val role: Role
         get() = _role
 
-    fun changeRole(){
+    val userProfile: UserProfile
+        get() = _userProfile
+
+    fun changeRole() {
         this._role = Role.USER
     }
 
+    fun updateProfile(userProfile: UserProfile) {
+        this._userProfile = userProfile
+    }
+
     fun isGuest(): Boolean {
         return this._role == Role.GUEST
     }
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserRemover.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserRemover.kt
@@ -5,10 +5,12 @@ import org.springframework.stereotype.Component
 @Component
 class UserRemover(
     private val userRepository: UserRepository,
-    private val redisTokenRepository: RedisTokenRepository
+    private val redisTokenRepository: RedisTokenRepository,
+    private val userMessageSender: UserMessageSender
 ) {
     fun remove(user: User) {
         userRepository.delete(user)
         redisTokenRepository.removeUser(user.id)
+        userMessageSender.send(DeleteUserEvent.from(user))
     }
 }
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserService.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserService.kt
@@ -9,9 +9,11 @@ class UserService(
     private val userRemover: UserRemover,
     private val userLogoutManager: UserLogoutManager,
     private val userReissueManager: UserReissueManager,
-    private val userValidator: UserValidator
+    private val userValidator: UserValidator,
+    private val userUpdater: UserUpdater
 
-) : UserCreateUseCase, UserReadUseCase, UserDeleteUseCase, UserLogoutUseCase, UserReissueUseCase, UserValidUseCase {
+) : UserCreateUseCase, UserReadUseCase, UserDeleteUseCase, UserLogoutUseCase, UserReissueUseCase, UserValidUseCase,
+    UserUpdateUseCase {
     override fun appendUser(user: User): User {
         return userAppender.append(user)
     }
@@ -32,6 +34,10 @@ class UserService(
         return userReissueManager.reissue(userId)
     }
 
+    override fun updateProfile(userId: UserId, name: String?, imageFile: ImageFile?) {
+        userUpdater.updateProfile(userId, name, imageFile)
+    }
+
     override fun isValidUser(userId: UserId): Boolean {
         return userValidator.isValid(userId)
     }
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserUpdateUseCase.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserUpdateUseCase.kt
@@ -0,0 +1,5 @@
+package com.grepp.quizy.user.domain.user
+
+interface UserUpdateUseCase {
+    fun updateProfile(userId: UserId, name: String?, imageFile: ImageFile?)
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserUpdater.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserUpdater.kt
@@ -0,0 +1,30 @@
+package com.grepp.quizy.user.domain.user
+
+import com.grepp.quizy.user.domain.user.exception.CustomUserException
+import org.springframework.stereotype.Component
+
+@Component
+class UserUpdater(
+    private val userRepository: UserRepository,
+    private val userMessageSender: UserMessageSender,
+    private val profileImageUploader: ProfileImageUploader,
+) {
+    fun updateProfile(userId: UserId, name: String?, imageFile: ImageFile?) {
+        if (name == null && imageFile == null) {
+            throw IllegalArgumentException("변경 할 프로필 정보가 없습니다.")
+        }
+
+        val profileImageUrl = imageFile?.let { profileImageUploader.uploadFile(it, "profiles") }
+
+        val user = userRepository.findById(userId.value) ?: throw CustomUserException.UserNotFoundException
+        user.updateProfile(
+            UserProfile(
+                name = name ?: user.userProfile.name,
+                email = user.userProfile.email,
+                profileImageUrl = profileImageUrl ?: user.userProfile.profileImageUrl,
+            )
+        )
+        userRepository.save(user)
+        userMessageSender.send(UpdateUserEvent.from(user))
+    }
+}
diff --git a/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserVO.kt b/user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/user/UserVO.kt
@@ -6,7 +6,7 @@ value class UserId(val value: Long)
 data class UserProfile(
     val name: String,
     val email: String,
-    val profileImageUrl: String = "https://cdn.pixabay.com/photo/2015/10/05/22/37/blank-profile-picture-973460_1280.png" // TODO : S3 기본 썸네일 등록하기
+    val profileImageUrl: String = "https://storage.googleapis.com/quizy_bucket-1/profiles/Default-Profile-Picture-Download-PNG-Image.png"
 ) {
 }
 
diff --git a/user-service/user-infra/build.gradle.kts b/user-service/user-infra/build.gradle.kts
@@ -26,5 +26,9 @@ dependencies {
 
     // H2 Database
     runtimeOnly("com.h2database:h2")
+
+    // GCS
+    implementation("org.springframework.cloud", "spring-cloud-gcp-starter", "1.2.5.RELEASE")
+    implementation("org.springframework.cloud", "spring-cloud-gcp-storage", "1.2.5.RELEASE")
 }
 
diff --git a/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/gcs/GcsConfig.kt b/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/gcs/GcsConfig.kt
@@ -0,0 +1,37 @@
+package com.grepp.quizy.user.infra.gcs
+
+import com.google.auth.oauth2.GoogleCredentials
+import com.google.cloud.storage.Storage
+import com.google.cloud.storage.StorageOptions
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import java.io.ByteArrayInputStream
+import java.io.IOException
+import java.util.*
+
+@Configuration
+class GcsConfig(
+    @Value("\${spring.cloud.gcp.storage.credentials.encoded-key}")
+    private val gcpKey: String,
+    @Value("\${spring.cloud.gcp.storage.project-id}")
+    private val projectId: String
+) {
+
+    @Bean
+    @Throws(IOException::class)
+    fun storage(): Storage {
+        val credentials: GoogleCredentials = getDecodedCredentials(gcpKey)
+        return StorageOptions.newBuilder()
+            .setProjectId(projectId)
+            .setCredentials(credentials)
+            .build()
+            .service
+    }
+
+    @Throws(IOException::class)
+    private fun getDecodedCredentials(encodedKey: String?): GoogleCredentials {
+        val decodedKey = Base64.getDecoder().decode(encodedKey)
+        return GoogleCredentials.fromStream(ByteArrayInputStream(decodedKey))
+    }
+}
diff --git a/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/gcs/GcsFileUploader.kt b/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/gcs/GcsFileUploader.kt
@@ -0,0 +1,49 @@
+package com.grepp.quizy.user.infra.gcs
+
+import com.google.cloud.storage.BlobInfo
+import com.google.cloud.storage.Storage
+import com.grepp.quizy.user.domain.user.ImageFile
+import com.grepp.quizy.user.domain.user.ProfileImageUploader
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.stereotype.Component
+import java.util.*
+
+@Component
+class GcsFileUploader(
+    private val storage: Storage,
+    @Value("\${spring.cloud.gcp.storage.bucket}")
+    private val bucketName: String,
+    @Value("\${spring.cloud.gcp.storage.url}")
+    private val storagePath: String
+) : ProfileImageUploader {
+    override fun uploadFile(file: ImageFile, directory: String): String {
+        validateProfileImage(file)
+
+        val fileName = generateFileName(file.originalFilename)
+        val blobInfo = BlobInfo.newBuilder(bucketName, "$directory/$fileName")
+            .setContentType(file.contentType)
+            .build()
+
+        storage.create(blobInfo, file.bytes)
+
+        return "$storagePath$directory/$fileName"
+    }
+
+    private fun generateFileName(originalFileName: String?): String {
+        val extension = originalFileName?.substringAfterLast('.', "")
+        return "${UUID.randomUUID()}.$extension"
+    }
+
+    private fun validateProfileImage(file: ImageFile) {
+        // 파일 크기 검증 (예: 5MB 제한)
+        if (file.size > 5 * 1024 * 1024) {
+            throw IllegalArgumentException("프로필 이미지는 5MB를 초과할 수 없습니다.")
+        }
+
+        // 파일 형식 검증
+        val allowedContentTypes = listOf("image/jpeg", "image/png", "image/gif")
+        if (!allowedContentTypes.contains(file.contentType)) {
+            throw IllegalArgumentException("지원하지 않는 이미지 형식입니다. (지원 형식: JPEG, PNG, GIF)")
+        }
+    }
+}
diff --git a/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/user/entity/UserEntity.kt b/user-service/user-infra/src/main/kotlin/com/grepp/quizy/user/infra/user/entity/UserEntity.kt
@@ -1,9 +1,9 @@
 package com.grepp.quizy.user.infra.user.entity
 
+import com.grepp.quizy.jpa.BaseTimeEntity
 import com.grepp.quizy.user.domain.user.Role
 import com.grepp.quizy.user.domain.user.User
 import com.grepp.quizy.user.domain.user.UserId
-import com.grepp.quizy.jpa.BaseTimeEntity
 import jakarta.persistence.*
 
 @Entity
@@ -31,7 +31,7 @@ class UserEntity(
     fun toDomain(): User {
         return User(
             id = UserId(id),
-            userProfile = userProfile.toDomain(),
+            _userProfile = userProfile.toDomain(),
             provider = provider.toDomain(),
             _role = role
         )
diff --git a/user-service/user-infra/src/main/resources/application-infra.yml b/user-service/user-infra/src/main/resources/application-infra.yml

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ dependencies {`
`21`	`21`
`22`	`22`	`// OAuth2`
`23`	`23`	`implementation("org.springframework.boot:spring-boot-starter-oauth2-client")`
	`24`	`+`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`tasks.named<BootJar>("bootJar") {`