Merge pull request #30 from prgrms-web-devcourse-final-project/QUZ-88-user-api

[QUZ-88][FEATURE] user-service api 작성

Author: HMWG

build.gradle.kts

@@ -1,80 +1,85 @@
 import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
-	kotlin("jvm") version "1.9.25"
-	kotlin("plugin.spring") version "1.9.25" apply false
-	id("org.springframework.boot") version "3.3.5" apply false
-	id("io.spring.dependency-management") version "1.1.6" apply false
-	id("com.diffplug.spotless") version "7.0.0.BETA4"
+    kotlin("jvm") version "1.9.25"
+    kotlin("plugin.spring") version "1.9.25" apply false
+    id("org.springframework.boot") version "3.3.5" apply false
+    id("io.spring.dependency-management") version "1.1.6" apply false
+    id("com.diffplug.spotless") version "7.0.0.BETA4"
 }
 
 group = "com.grepp"
 version = "0.0.1"
 
 tasks.named<Jar>("jar") {
-	enabled = true
+    enabled = true
 }
 
 allprojects {
-	group = "com.grepp.quizy"
-	version = "0.0.1"
-
-	repositories {
-		mavenCentral()
-		gradlePluginPortal()
-		maven {
-			url = uri("https://packages.confluent.io/maven")
-		}
-	}
+    group = "com.grepp.quizy"
+    version = "0.0.1"
+
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+        maven {
+            url = uri("https://packages.confluent.io/maven")
+        }
+    }
 }
 
 
 java {
-	toolchain {
-		languageVersion = JavaLanguageVersion.of(17)
-	}
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 subprojects {
-	apply(plugin = "org.jetbrains.kotlin.jvm")
-	apply(plugin = "org.jetbrains.kotlin.plugin.spring")
-	apply(plugin = "org.springframework.boot")
-	apply(plugin = "io.spring.dependency-management")
-	apply(plugin = "com.diffplug.spotless")
-
-	dependencies {
-		implementation("org.springframework.boot:spring-boot-starter")
-		implementation("org.jetbrains.kotlin:kotlin-reflect")
-		annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
-
-		testImplementation("org.springframework.boot:spring-boot-starter-test")
-		testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
-		testRuntimeOnly("org.junit.platform:junit-platform-launcher")
-
-		// kotest
-		testImplementation("io.kotest:kotest-runner-junit5:5.9.0")
-		testImplementation("io.kotest:kotest-assertions-core:5.9.0")
-		testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
-		// mockk
-		testImplementation("io.mockk:mockk:1.13.13")
-
-		//logging
-		implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
-	}
-
-	tasks.named<BootJar>("bootJar") {
-		enabled = false
-	}
-
-	tasks.withType<Test> {
-		useJUnitPlatform()
-	}
+    apply(plugin = "org.jetbrains.kotlin.jvm")
+    apply(plugin = "org.jetbrains.kotlin.plugin.spring")
+    apply(plugin = "org.springframework.boot")
+    apply(plugin = "io.spring.dependency-management")
+    apply(plugin = "com.diffplug.spotless")
+
+    dependencies {
+        implementation("org.springframework.boot:spring-boot-starter")
+        implementation("org.jetbrains.kotlin:kotlin-reflect")
+        annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
+
+        testImplementation("org.springframework.boot:spring-boot-starter-test")
+        testImplementation("org.jetbrains.kotlin:kotlin-test-junit5")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+        // kotest
+        testImplementation("io.kotest:kotest-runner-junit5:5.9.0")
+        testImplementation("io.kotest:kotest-assertions-core:5.9.0")
+        testImplementation("io.kotest.extensions:kotest-extensions-spring:1.3.0")
+        // mockk
+        testImplementation("io.mockk:mockk:1.13.13")
+
+        //logging
+        implementation("io.github.oshai:kotlin-logging-jvm:5.1.1")
+
+        // coroutines
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor")
+        implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j")
+    }
+
+    tasks.named<BootJar>("bootJar") {
+        enabled = false
+    }
+
+    tasks.withType<Test> {
+        useJUnitPlatform()
+    }
 }
 
 kotlin {
-	compilerOptions {
-		freeCompilerArgs.addAll("-Xjsr305=strict")
-	}
+    compilerOptions {
+        freeCompilerArgs.addAll("-Xjsr305=strict")
+    }
 }
 
 

gateway-service/src/main/kotlin/com/grepp/quizy/global/AuthGlobalFilter.kt

@@ -107,6 +107,7 @@ class RouteValidator {
         "/oauth2",
         "/api/quiz/feed",
         "/api/quiz/search",
+        "/api/user/info/"
     )
 
     fun isUnsecured(request: ServerHttpRequest): Boolean {

user-service/user-application/app-api/build.gradle.kts

@@ -22,7 +22,7 @@ dependencies {
 
     // OAuth2
     implementation("org.springframework.boot:spring-boot-starter-oauth2-client")
-    
+
 }
 
 tasks.named<BootJar>("bootJar") {

user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/HealthCheckApi.kt

@@ -1,8 +1,9 @@
 package com.grepp.quizy.user.api
 
 import com.grepp.quizy.common.api.ApiResponse
+import com.grepp.quizy.web.annotation.AuthUser
+import com.grepp.quizy.web.dto.UserPrincipal
 import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestHeader
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RestController
 
@@ -12,10 +13,10 @@ class HealthCheckApi {
 
     @GetMapping("/health")
     fun healthCheck(
-            @RequestHeader("X-Auth-Id") userId: String
+        @AuthUser principal: UserPrincipal
     ): ApiResponse<Unit> {
         return ApiResponse.success(
-                "I'm USER service. UserId : ${userId.toLong()}"
+            "I'm USER service. UserId : ${principal.value}"
         )
     }
 

user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/auth/AuthApi.kt

@@ -6,6 +6,8 @@ import com.grepp.quizy.user.api.global.util.CookieUtils
 import com.grepp.quizy.user.domain.user.UserId
 import com.grepp.quizy.user.domain.user.UserLogoutUseCase
 import com.grepp.quizy.user.domain.user.UserReissueUseCase
+import com.grepp.quizy.web.annotation.AuthUser
+import com.grepp.quizy.web.dto.UserPrincipal
 import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import org.springframework.web.bind.annotation.*
@@ -20,21 +22,21 @@ class AuthApi(
     @GetMapping("/logout")
     fun logout(
         @RequestHeader("Authorization") accessToken: String,
-        @RequestHeader("X-Auth-Id") userId: String,
+        @AuthUser principal: UserPrincipal,
         request: HttpServletRequest,
         response: HttpServletResponse
     ): ApiResponse<Unit> {
-        userLogoutUseCase.logout(UserId(userId.toLong()), accessToken.substring(7))
+        userLogoutUseCase.logout(UserId(principal.value), accessToken.substring(7))
         CookieUtils.deleteCookie(request, response, "refreshToken")
         return ApiResponse.success()
     }
 
     @PostMapping("/reissue")
     fun reissue(
-        @RequestHeader("X-Auth-Id") userId: String,
+        @AuthUser principal: UserPrincipal,
         response: HttpServletResponse
     ): ApiResponse<TokenResponse> {
-        val reissueToken = userReissueUseCase.reissue(UserId(userId.toLong()))
+        val reissueToken = userReissueUseCase.reissue(UserId(principal.value))
         CookieUtils.addCookie(
             response,
             "refreshToken",

user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/UserApi.kt

@@ -3,28 +3,56 @@ package com.grepp.quizy.user.api.user
 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.api.user.dto.UserResponse
+import com.grepp.quizy.user.domain.user.UserDeleteUseCase
 import com.grepp.quizy.user.domain.user.UserId
+import com.grepp.quizy.user.domain.user.UserReadUseCase
 import com.grepp.quizy.user.domain.user.UserUpdateUseCase
+import com.grepp.quizy.web.annotation.AuthUser
+import com.grepp.quizy.web.dto.UserPrincipal
 import org.springframework.web.bind.annotation.*
 import org.springframework.web.multipart.MultipartFile
 
 @RestController
 @RequestMapping("/api/user")
 class UserApi(
+    private val userReadUseCase: UserReadUseCase,
     private val userUpdateUseCase: UserUpdateUseCase,
+    private val userDeleteUseCase: UserDeleteUseCase
 ) {
+    @GetMapping("/me")
+    suspend fun getMe(
+        @AuthUser principal: UserPrincipal,
+    ): ApiResponse<UserResponse> {
+        return ApiResponse.success(UserResponse.from(userReadUseCase.getUserInfo(UserId(principal.value))))
+    }
+
+    @GetMapping("/info/{userId}")
+    suspend fun getUser(
+        @PathVariable userId: Long,
+    ): ApiResponse<UserResponse> {
+        return ApiResponse.success(UserResponse.from(userReadUseCase.getUserInfo(UserId(userId))))
+    }
 
     @PutMapping("/me")
     fun updateMe(
         @RequestPart("data", required = false) request: UpdateProfileRequest?,
         @RequestPart("profileImage", required = false) profileImage: MultipartFile?,
-        @RequestHeader("X-Auth-Id") userId: String,
+        @AuthUser principal: UserPrincipal,
     ): ApiResponse<Unit> {
         val image = profileImage?.let {
             toImageFile(it)
         }
 
-        userUpdateUseCase.updateProfile(UserId(userId.toLong()), request?.name, image)
+        userUpdateUseCase.updateProfile(UserId(principal.value), request?.name, image)
+        return ApiResponse.success()
+    }
+
+    @DeleteMapping("/me")
+    fun deleteMe(
+        @AuthUser principal: UserPrincipal,
+    ): ApiResponse<Unit> {
+        userDeleteUseCase.removeUser(UserId(principal.value))
         return ApiResponse.success()
     }
 

user-service/user-application/app-api/src/main/kotlin/com/grepp/quizy/user/api/user/dto/UserResponse.kt

@@ -0,0 +1,36 @@
+package com.grepp.quizy.user.api.user.dto
+
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.grepp.quizy.user.domain.user.AuthProvider
+import com.grepp.quizy.user.domain.user.UserInfo
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+data class UserResponse(
+    val id: Long,
+    val email: String,
+    val name: String,
+    val profileImageUrl: String,
+    val provider: AuthProvider,
+    val role: String,
+    val rating: Int?,
+    val solvedProblems: Int?,
+    val correctAnswerRate: Double?,
+    val achievements: List<String>?
+) {
+    companion object {
+        fun from(userInfo: UserInfo): UserResponse {
+            return UserResponse(
+                id = userInfo.id,
+                email = userInfo.email,
+                name = userInfo.name,
+                profileImageUrl = userInfo.profileImageUrl,
+                provider = userInfo.provider,
+                role = userInfo.role,
+                rating = userInfo.rating,
+                solvedProblems = userInfo.solvedProblems,
+                correctAnswerRate = userInfo.correctAnswerRate,
+                achievements = userInfo.achievements
+            )
+        }
+    }
+}

user-service/user-application/app-api/src/main/resources/application.yml

@@ -50,6 +50,13 @@ jwt:
   access-token-validity: 3600000  # 1시간
   refresh-token-validity: 604800000  # 7일
 
+springdoc:
+  api-docs:
+    version: openapi_3_1
+    enabled: true
+    path: api/user/api-docs
+  enable-spring-security: true
+
 server:
   port: 8085
 
@@ -101,7 +108,7 @@ springdoc:
   api-docs:
     version: openapi_3_1
     enabled: true
-    path: /api-docs
+    path: api/user/api-docs
   enable-spring-security: true
 
 logging:

user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/game/GameClient.kt

@@ -0,0 +1,5 @@
+package com.grepp.quizy.user.domain.game
+
+interface GameClient {
+    fun getUserRating(userId: Long): UserRating
+}

user-service/user-domain/src/main/kotlin/com/grepp/quizy/user/domain/game/RatingReader.kt

@@ -0,0 +1,24 @@
+package com.grepp.quizy.user.domain.game
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+
+@Component
+class RatingReader(
+    private val gameClient: GameClient,
+) {
+    private val logger = LoggerFactory.getLogger(RatingReader::class.java)
+
+    suspend fun getRating(userId: Long): UserRating? {
+        return try {
+            withContext(Dispatchers.IO) {
+                gameClient.getUserRating(userId)
+            }
+        } catch (ex: Exception) {
+            logger.error("Failed to fetch scores for user $userId", ex)
+            null
+        }
+    }
+}