YAPP-Github
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/auth/AuthController.kt
Lines changed: 0 additions & 3 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/auth/AuthController.kt
Lines changed: 0 additions & 3 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/auth/dto/LoginResponse.kt
Lines changed: 0 additions & 2 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/auth/dto/LoginResponse.kt
Lines changed: 0 additions & 2 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/group/GroupController.kt
Lines changed: 12 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/group/GroupController.kt
Lines changed: 12 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/group/dto/LeaderBoardResponse.kt
Lines changed: 29 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/group/dto/LeaderBoardResponse.kt
Lines changed: 29 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/setting/SettingController.kt
Lines changed: 21 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/setting/SettingController.kt
Lines changed: 21 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/TermsController.kt
Lines changed: 54 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/TermsController.kt
Lines changed: 54 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/dto/AgreeTermsRequest.kt
Lines changed: 8 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/dto/AgreeTermsRequest.kt
Lines changed: 8 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/dto/TermsResponse.kt
Lines changed: 21 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/terms/dto/TermsResponse.kt
Lines changed: 21 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/user/UserController.kt
Lines changed: 12 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/user/UserController.kt
Lines changed: 12 additions & 0 deletions
diff --git a/‎adapter-in/web/src/main/kotlin/com/yapp/bol/user/dto/CheckOnboardResponse.kt
Lines changed: 7 additions & 0 deletions b/‎adapter-in/web/src/main/kotlin/com/yapp/bol/user/dto/CheckOnboardResponse.kt
Lines changed: 7 additions & 0 deletions
@@ -2,7 +2,6 @@ package com.yapp.bol.auth
 
 import com.yapp.bol.auth.dto.LoginRequest
 import com.yapp.bol.auth.dto.LoginResponse
-import com.yapp.bol.onboarding.OnboardingService
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
 import org.springframework.web.bind.annotation.RequestMapping
@@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.RestController
 @RequestMapping("/v1/auth")
 class AuthController(
     private val authService: AuthService,
-    private val onboardingService: OnboardingService,
 ) {
     @PostMapping("/login")
     fun login(@RequestBody request: LoginRequest): LoginResponse {
@@ -21,7 +19,6 @@ class AuthController(
         return LoginResponse(
             accessToken = authToken.accessToken.value,
             refreshToken = authToken.refreshToken?.value,
-            onboarding = onboardingService.getRemainOnboarding(authToken.accessToken.userId)
         )
     }
 }
@@ -1,11 +1,9 @@
 package com.yapp.bol.auth.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
-import com.yapp.bol.onboarding.OnboardingType
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class LoginResponse(
     val accessToken: String,
     val refreshToken: String?,
-    val onboarding: List<OnboardingType>,
 )
@@ -3,15 +3,18 @@ package com.yapp.bol.group
 import com.yapp.bol.auth.getSecurityUserIdOrThrow
 import com.yapp.bol.file.FileService
 import com.yapp.bol.file.dto.FileResponse
+import com.yapp.bol.game.GameId
 import com.yapp.bol.group.dto.CheckAccessCodeRequest
 import com.yapp.bol.group.dto.CheckAccessCodeResponse
 import com.yapp.bol.group.dto.CreateGroupRequest
 import com.yapp.bol.group.dto.CreateGroupResponse
 import com.yapp.bol.group.dto.GroupDetailResponse
 import com.yapp.bol.group.dto.GroupListResponse
+import com.yapp.bol.group.dto.LeaderBoardResponse
 import com.yapp.bol.group.dto.toCreateGroupResponse
 import com.yapp.bol.group.dto.toDto
 import com.yapp.bol.group.dto.toListResponse
+import com.yapp.bol.group.dto.toResponse
 import com.yapp.bol.pagination.offset.PaginationOffsetResponse
 import org.springframework.security.access.prepost.PreAuthorize
 import org.springframework.web.bind.annotation.GetMapping
@@ -61,6 +64,15 @@ class GroupController(
             pageSize = pageSize,
         ).mapContents { it.toListResponse() }
 
+    @GetMapping("/{groupId}/game/{gameId}")
+    fun getLeaderboard(
+        @PathVariable groupId: GroupId,
+        @PathVariable gameId: GameId,
+    ): LeaderBoardResponse {
+        val list = groupService.getLeaderBoard(groupId, gameId).mapIndexed { index, it -> it.toResponse(index + 1) }
+        return LeaderBoardResponse(list)
+    }
+
     @PreAuthorize("isAuthenticated()")
     @GetMapping("/{groupId}")
     fun getGroup(
 
@@ -0,0 +1,29 @@
+package com.yapp.bol.group.dto
+
+import com.yapp.bol.group.LeaderBoardMember
+import com.yapp.bol.group.member.MemberId
+import com.yapp.bol.group.member.MemberRole
+
+data class LeaderBoardResponse(
+    val contents: List<RankMemberResponse>
+)
+
+data class RankMemberResponse(
+    val id: MemberId,
+    val nickname: String,
+    val role: MemberRole,
+    val rank: Int?,
+    val score: Int?,
+    val matchCount: Int?,
+    val isChangeRecent: Boolean,
+)
+
+fun LeaderBoardMember.toResponse(rank: Int): RankMemberResponse = RankMemberResponse(
+    id = this.member.id,
+    nickname = this.member.nickname,
+    role = this.member.role,
+    rank = if (this.score == null) null else rank,
+    score = this.score,
+    matchCount = this.matchCount,
+    isChangeRecent = this.isChangeRecent,
+)
@@ -0,0 +1,21 @@
+package com.yapp.bol.setting
+
+import com.yapp.bol.terms.TermsService
+import com.yapp.bol.terms.dto.TermsResponse
+import com.yapp.bol.terms.dto.toResponse
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/v1/setting")
+class SettingController(
+    @Value("\${bol.server.host}") private val host: String,
+    private val termsService: TermsService,
+) {
+    @GetMapping("/terms")
+    fun getSetting(): TermsResponse {
+        return TermsResponse(termsService.getWholeTerms().map { it.toResponse(host) })
+    }
+}
@@ -0,0 +1,54 @@
+package com.yapp.bol.terms
+
+import com.yapp.bol.EmptyResponse
+import com.yapp.bol.auth.getSecurityUserIdOrThrow
+import com.yapp.bol.terms.dto.AgreeTermsRequest
+import com.yapp.bol.terms.dto.TermsResponse
+import com.yapp.bol.terms.dto.toResponse
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.security.access.prepost.PreAuthorize
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+
+@RestController
+@RequestMapping("/v1/terms")
+class TermsController(
+    @Value("\${bol.server.host}") private val host: String,
+    private val termsService: TermsService,
+) {
+
+    @GetMapping
+    @PreAuthorize("isAuthenticated()")
+    fun getTerms(): TermsResponse {
+        val userId = getSecurityUserIdOrThrow()
+        val list = termsService.getNeedTermsAgreeList(userId)
+        return TermsResponse(
+            list.map { it.toResponse(host) }
+        )
+    }
+
+    @PostMapping
+    @PreAuthorize("isAuthenticated()")
+    fun agreeTerms(
+        @RequestBody request: AgreeTermsRequest,
+    ): EmptyResponse {
+        val userId = getSecurityUserIdOrThrow()
+
+        val termsInfo = mutableListOf<TermsAgreeInfo>()
+
+        request.agree?.forEach {
+            termsInfo.add(TermsAgreeInfo(it, true))
+        }
+
+        request.disagree?.forEach {
+            termsInfo.add(TermsAgreeInfo(it, false))
+        }
+
+        termsService.agreeTerms(userId, termsInfo)
+
+        return EmptyResponse
+    }
+}
@@ -0,0 +1,8 @@
+package com.yapp.bol.terms.dto
+
+import com.yapp.bol.terms.TermsCode
+
+data class AgreeTermsRequest(
+    val agree: List<TermsCode>?,
+    val disagree: List<TermsCode>?,
+)
@@ -0,0 +1,21 @@
+package com.yapp.bol.terms.dto
+
+import com.yapp.bol.terms.TermsCode
+
+data class TermsResponse(
+    val contents: List<TermsItemResponse>
+)
+
+data class TermsItemResponse(
+    val code: TermsCode,
+    val title: String,
+    val url: String,
+    val isRequired: Boolean,
+)
+
+fun TermsCode.toResponse(host: String): TermsItemResponse = TermsItemResponse(
+    code = this,
+    title = this.title,
+    url = "$host/${this.path}",
+    isRequired = this.isRequired,
+)
@@ -5,6 +5,8 @@ import com.yapp.bol.UnknownException
 import com.yapp.bol.auth.getSecurityUserIdOrThrow
 import com.yapp.bol.group.GroupService
 import com.yapp.bol.group.dto.toResponse
+import com.yapp.bol.onboarding.OnboardingService
+import com.yapp.bol.user.dto.CheckOnboardResponse
 import com.yapp.bol.user.dto.JoinedGroupResponse
 import com.yapp.bol.user.dto.MyInfoResponse
 import com.yapp.bol.user.dto.PutUserInfoRequest
@@ -21,8 +23,18 @@ import org.springframework.web.bind.annotation.RestController
 class UserController(
     private val userService: UserService,
     private val groupService: GroupService,
+    private val onboardingService: OnboardingService
 ) {
 
+    @PreAuthorize("isAuthenticated()")
+    @GetMapping("/me/onboarding")
+    fun checkOnboard(): CheckOnboardResponse {
+        val userId = getSecurityUserIdOrThrow()
+        val onboardList = onboardingService.getRemainOnboarding(userId)
+
+        return CheckOnboardResponse(onboardList)
+    }
+
     @PreAuthorize("isAuthenticated()")
     @GetMapping("/me")
     fun getMe(): MyInfoResponse {
 
@@ -0,0 +1,7 @@
+package com.yapp.bol.user.dto
+
+import com.yapp.bol.onboarding.OnboardingType
+
+data class CheckOnboardResponse(
+    val onboarding: List<OnboardingType>
+)