improve onboarding status response structure

Author: jeyongsong

…m/moa/common/auth/AuthenticatedMember.kt …/main/kotlin/com/moa/common/auth/Auth.ktsrc/main/kotlin/com/moa/common/auth/AuthenticatedMember.kt renamed to src/main/kotlin/com/moa/common/auth/Auth.kt src/main/kotlin/com/moa/common/auth/AuthenticatedMember.kt renamed to src/main/kotlin/com/moa/common/auth/Auth.kt

@@ -2,7 +2,7 @@ package com.moa.common.auth
 
 @Target(AnnotationTarget.VALUE_PARAMETER)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class AuthenticatedMember
+annotation class Auth
 
 data class AuthenticatedMemberInfo(
     val id: Long,

src/main/kotlin/com/moa/common/auth/AuthenticatedMemberResolver.kt

@@ -14,7 +14,7 @@ import org.springframework.web.method.support.ModelAndViewContainer
 class AuthenticatedMemberResolver : HandlerMethodArgumentResolver {
 
     override fun supportsParameter(parameter: MethodParameter): Boolean {
-        return parameter.hasParameterAnnotation(AuthenticatedMember::class.java) &&
+        return parameter.hasParameterAnnotation(Auth::class.java) &&
                 parameter.parameterType == AuthenticatedMemberInfo::class.java
     }
 

src/main/kotlin/com/moa/common/config/SwaggerConfig.kt

@@ -1,6 +1,6 @@
 package com.moa.common.config
 
-import com.moa.common.auth.AuthenticatedMember
+import com.moa.common.auth.Auth
 import io.swagger.v3.oas.models.Components
 import io.swagger.v3.oas.models.OpenAPI
 import io.swagger.v3.oas.models.info.Info
@@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration
 class SwaggerConfig {
 
     init {
-        SpringDocUtils.getConfig().addAnnotationsToIgnore(AuthenticatedMember::class.java)
+        SpringDocUtils.getConfig().addAnnotationsToIgnore(Auth::class.java)
     }
 
     @Bean

src/main/kotlin/com/moa/controller/AuthController.kt

@@ -4,6 +4,7 @@ import com.moa.common.response.ApiResponse
 import com.moa.service.AuthService
 import com.moa.service.dto.KaKaoSignInUpRequest
 import com.moa.service.dto.KakaoSignInUpResponse
+import jakarta.validation.Valid
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -15,7 +16,7 @@ class AuthController(
 ) {
 
     @PostMapping("/api/v1/auth/kakao")
-    fun kakaoSignInUp(@RequestBody kaKaoSignInUpRequest: KaKaoSignInUpRequest): ResponseEntity<ApiResponse<KakaoSignInUpResponse>> {
+    fun kakaoSignInUp(@RequestBody @Valid kaKaoSignInUpRequest: KaKaoSignInUpRequest): ResponseEntity<ApiResponse<KakaoSignInUpResponse>> {
         return ResponseEntity.ok(ApiResponse.success(authService.kakaoSignInUp(kaKaoSignInUpRequest)))
     }
 }

src/main/kotlin/com/moa/controller/OnboardingController.kt

@@ -1,6 +1,6 @@
 package com.moa.controller
 
-import com.moa.common.auth.AuthenticatedMember
+import com.moa.common.auth.Auth
 import com.moa.common.auth.AuthenticatedMemberInfo
 import com.moa.common.response.ApiResponse
 import com.moa.service.*
@@ -22,24 +22,24 @@ class OnboardingController(
 ) {
 
     @GetMapping("/status")
-    fun status(@AuthenticatedMember member: AuthenticatedMemberInfo) =
+    fun status(@Auth member: AuthenticatedMemberInfo) =
         ApiResponse.success(onboardingStatusService.getStatus(member.id))
 
     @PatchMapping("/profile")
     fun upsertProfile(
-        @AuthenticatedMember member: AuthenticatedMemberInfo,
+        @Auth member: AuthenticatedMemberInfo,
         @RequestBody @Valid req: ProfileUpsertRequest,
     ) = ApiResponse.success(profileService.upsertProfile(member.id, req))
 
     @PatchMapping("/payroll")
     fun upsertPayroll(
-        @AuthenticatedMember member: AuthenticatedMemberInfo,
+        @Auth member: AuthenticatedMemberInfo,
         @RequestBody @Valid req: PayrollUpsertRequest,
     ) = ApiResponse.success(payrollService.upsert(member.id, req))
 
     @PatchMapping("/work-policy")
     fun upsertWorkPolicy(
-        @AuthenticatedMember member: AuthenticatedMemberInfo,
+        @Auth member: AuthenticatedMemberInfo,
         @RequestBody @Valid req: WorkPolicyUpsertRequest,
     ) = ApiResponse.success(workPolicyService.upsert(member.id, req))
 
@@ -48,12 +48,12 @@ class OnboardingController(
         ApiResponse.success(termsService.getTerms())
 
     @GetMapping("/terms/agreements")
-    fun agreements(@AuthenticatedMember member: AuthenticatedMemberInfo) =
+    fun agreements(@Auth member: AuthenticatedMemberInfo) =
         ApiResponse.success(termsService.getAgreements(member.id))
 
     @PutMapping("/terms/agreements")
     fun agree(
-        @AuthenticatedMember member: AuthenticatedMemberInfo,
+        @Auth member: AuthenticatedMemberInfo,
         @RequestBody @Valid req: TermsAgreementRequest,
     ) = ApiResponse.success(termsService.upsertAgreements(member.id, req))
 }

src/main/kotlin/com/moa/entity/Profile.kt

@@ -11,7 +11,7 @@ class Profile(
     var nickname: String,
 
     @Column(nullable = false)
-    var workplaceName: String,
+    var workplace: String,
 ) : BaseEntity() {
 
     @Id

src/main/kotlin/com/moa/service/OnboardingStatusService.kt

@@ -2,6 +2,9 @@ package com.moa.service
 
 import com.moa.repository.*
 import com.moa.service.dto.OnboardingStatusResponse
+import com.moa.service.dto.PayrollResponse
+import com.moa.service.dto.ProfileResponse
+import com.moa.service.dto.WorkPolicyResponse
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDate
@@ -17,6 +20,43 @@ class OnboardingStatusService(
 
     @Transactional(readOnly = true)
     fun getStatus(memberId: Long, today: LocalDate = LocalDate.now()): OnboardingStatusResponse {
+        // 프로필 완료 여부
+        val profile = profileRepository.findByMemberId(memberId)
+            ?.takeIf { it.nickname.isNotBlank() && it.workplace.isNotBlank() }
+            ?.let {
+                ProfileResponse(
+                    nickname = it.nickname,
+                    workplace = it.workplace,
+                )
+            }
+
+        // 급여 완료 여부
+        val payroll = payrollVersionRepository
+            .findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today)
+            ?.let {
+                PayrollResponse(
+                    effectiveFrom = it.effectiveFrom,
+                    salaryInputType = it.salaryInputType,
+                    salaryAmount = it.salaryAmount,
+                    paydayDay = it.paydayDay,
+                )
+            }
+
+        // 근무정책 완료 여부
+        val workPolicy = workPolicyVersionRepository
+            .findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today)
+            ?.takeIf { it.workdays.isNotEmpty() }
+            ?.let {
+                WorkPolicyResponse(
+                    effectiveFrom = it.effectiveFrom,
+                    workdays = it.workdays.sorted(),
+                    clockInTime = it.clockInTime,
+                    clockOutTime = it.clockOutTime,
+                    breakStartTime = it.breakStartTime,
+                    breakEndTime = it.breakEndTime,
+                )
+            }
+
         // 필수 약관 동의 여부
         val requiredCodes = termRepository.findAll()
             .filter { it.required }
@@ -28,29 +68,11 @@ class OnboardingStatusService(
 
         val hasRequiredTermsAgreed = requiredCodes.all { agreements[it] == true }
 
-        // 프로필 완료 여부
-        val profile = profileRepository.findByMemberId(memberId)
-        val profileCompleted =
-            profile != null && profile.nickname.isNotBlank() && profile.workplaceName.isNotBlank()
-
-        // 급여 완료 여부
-        val payrollCompleted =
-            payrollVersionRepository
-                .findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today) != null
-
-        // 근무정책 완료 여부
-        val version =
-            workPolicyVersionRepository
-                .findTopByMemberIdAndEffectiveFromLessThanEqualOrderByEffectiveFromDesc(memberId, today)
-
-        val workPolicyCompleted =
-            version != null && version.workdays.isNotEmpty()
-
         return OnboardingStatusResponse(
+            profile = profile,
+            payroll = payroll,
+            workPolicy = workPolicy,
             hasRequiredTermsAgreed = hasRequiredTermsAgreed,
-            profileCompleted = profileCompleted,
-            payrollCompleted = payrollCompleted,
-            workPolicyCompleted = workPolicyCompleted,
         )
     }
 }

src/main/kotlin/com/moa/service/ProfileService.kt

@@ -4,7 +4,6 @@ import com.moa.entity.Profile
 import com.moa.repository.ProfileRepository
 import com.moa.service.dto.ProfileResponse
 import com.moa.service.dto.ProfileUpsertRequest
-import com.moa.service.dto.WorkplaceDto
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -16,22 +15,22 @@ class ProfileService(
     @Transactional
     fun upsertProfile(memberId: Long, req: ProfileUpsertRequest): ProfileResponse {
         val nickname = req.nickname
-        val workplaceName = req.workplace.name
+        val workplace = req.workplace
 
         val profile = profileRepository.findByMemberId(memberId)?.apply {
             this.nickname = nickname
-            this.workplaceName = workplaceName
+            this.workplace = workplace
         } ?: profileRepository.save(
             Profile(
                 memberId = memberId,
                 nickname = nickname,
-                workplaceName = workplaceName,
+                workplace = workplace,
             )
         )
 
         return ProfileResponse(
             nickname = profile.nickname,
-            workplace = WorkplaceDto(profile.workplaceName),
+            workplace = profile.workplace,
         )
     }
 }

src/main/kotlin/com/moa/service/dto/KaKaoSignInUpRequest.kt

@@ -1,6 +1,9 @@
 package com.moa.service.dto
 
+import jakarta.validation.constraints.NotBlank
+
 data class KaKaoSignInUpRequest(
+    @field:NotBlank
     val idToken: String,
     val fcmDeviceToken: String? = null,
 ) {

src/main/kotlin/com/moa/service/dto/OnboardingStatusResponse.kt

@@ -1,8 +1,8 @@
 package com.moa.service.dto
 
 data class OnboardingStatusResponse(
+    val profile: ProfileResponse?,
+    val payroll: PayrollResponse?,
+    val workPolicy: WorkPolicyResponse?,
     val hasRequiredTermsAgreed: Boolean,
-    val profileCompleted: Boolean,
-    val payrollCompleted: Boolean,
-    val workPolicyCompleted: Boolean,
 )