[Feat] 1차 QA Onboarding feature 수정

core/common/src/main/java/com/example/common/constant/Url.kt

@@ -0,0 +1,21 @@
+package com.example.common.constant
+
+object Url {
+    // 서비스 이용 약관
+    const val TERMS_OF_SERVICE = "https://www.notion.so/2d13aeb558c9801fb8c2db2ae6ac2c3e?source=copy_link"
+
+    // 개인정보 처리 방침
+    const val PRIVACY_POLICY = "https://www.notion.so/2d13aeb558c98003b480f83b06245430?source=copy_link"
+
+    // 공지사항
+    const val ANNOUNCEMENT = "https://www.notion.so/2d13aeb558c980919796c2b4d7109369?source=copy_link"
+
+    // 커뮤니티 가이드
+    const val COMMUNITY_GUIDE = "https://www.notion.so/2d13aeb558c980c7915bf540db799aac?source=copy_link"
+
+    // 문의/제안하기
+    const val INQUIRY = "https://forms.gle/reQb2nmhjSqXVvnq7"
+
+    // 에러 뷰
+    const val ERROR = ""
+}

core/common/src/main/java/com/example/common/type/TermType.kt

@@ -1,10 +1,13 @@
 package com.example.common.type
 
+import com.example.common.constant.Url
+
 enum class TermType(
     val isMandatory: Boolean,
+    val url: String,
 ) {
-    TERMS_OF_SERVICE(isMandatory = true), // 서비스 이용약관 (필수)
-    PRIVACY_POLICY(isMandatory = true), // 개인정보 처리방침 (필수)
+    TERMS_OF_SERVICE(isMandatory = true, url = Url.TERMS_OF_SERVICE), // 서비스 이용약관 (필수)
+    PRIVACY_POLICY(isMandatory = true, url = Url.PRIVACY_POLICY), // 개인정보 처리방침 (필수)
     ;
 
     companion object {

core/data/src/main/java/com/example/data/constant/ErrorCode.kt

@@ -3,4 +3,5 @@ package com.example.data.constant
 object ErrorCode {
     const val USER_NOT_FOUND = 4041
     const val EXPIRED_ACCESS_TOKEN = 4012
+    const val DUPLICATED_NICKNAME = 4090
 }

core/data/src/main/java/com/example/data/datasource/remote/AuthRemoteDataSource.kt

@@ -15,6 +15,7 @@ import okhttp3.MultipartBody
 import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import retrofit2.HttpException
+import timber.log.Timber
 import java.io.File
 import java.net.HttpURLConnection
 import javax.inject.Inject
@@ -84,7 +85,25 @@ class AuthRemoteDataSource
                     )
 
                 return response.data ?: throw Exception("Data is null")
-            } catch (e: Exception) {
+            } catch (e: HttpException) {
+                if (e.code() == HttpURLConnection.HTTP_CONFLICT) {
+                    val errorString = e.response()?.errorBody()?.string()
+                    Timber.d("errorString : $errorString")
+
+                    if (errorString != null) {
+                        try {
+                            val errorResponse = json.decodeFromString<BaseResponse<String?>>(errorString)
+                            Timber.d("errorResponse : $errorResponse")
+                            if (errorResponse.code == ErrorCode.DUPLICATED_NICKNAME) {
+                                throw NetworkException(ErrorCode.DUPLICATED_NICKNAME, errorResponse.message)
+                            }
+                        } catch (e: SerializationException) {
+                            // JSON 형식이 잘못됨 (괄호 누락 등)
+                        } catch (e: IllegalArgumentException) {
+                            // 데이터 타입 불일치
+                        }
+                    }
+                }
                 throw e
             }
         }

core/data/src/main/java/com/example/data/datasource/remote/UserRemoteDataSource.kt

@@ -1,6 +1,7 @@
 package com.example.data.datasource.remote
 
 import com.example.data.model.request.NotificationRequest
+import com.example.data.model.request.PatchProfileRequest
 import com.example.data.model.response.UserInfoResponse
 import com.example.data.service.UserService
 import kotlinx.serialization.InternalSerializationApi
@@ -32,7 +33,10 @@ class UserRemoteDataSource
 
                 userService.patchProfile(
                     profileImg = imagePart,
-                    request = nickname,
+                    request =
+                        PatchProfileRequest(
+                            nickname,
+                        ),
                 )
             } catch (e: Exception) {
                 Timber.e(e)

core/data/src/main/java/com/example/data/mapper/todomain/UserResponseMapper.kt

@@ -7,5 +7,5 @@ fun UserResponse.toDomain(): Writer =
     Writer(
         userId = this.userId,
         nickname = this.nickname,
-        profileImg = this.profileImg ?: "",
+        profileImg = this.profileImg,
     )

core/data/src/main/java/com/example/data/model/request/PatchProfileRequest.kt

@@ -0,0 +1,8 @@
+package com.example.data.model.request
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PatchProfileRequest(
+    val nickname: String?,
+)

core/data/src/main/java/com/example/data/repository/AuthRepositoryImpl.kt

@@ -10,6 +10,7 @@ import com.example.data.datasource.remote.KakaoLoginDataSource
 import com.example.data.datasource.remote.UserRemoteDataSource
 import com.example.data.model.request.LoginRequest
 import com.example.data.model.request.SignupRequest
+import com.example.domain.model.NicknameValidationResult
 import com.example.domain.model.User
 import com.example.domain.repository.AuthRepository
 import com.example.network.NetworkException
@@ -64,21 +65,27 @@ class AuthRepositoryImpl
             kakaoAccessToken: String?,
             profileImage: String?,
             nickname: String,
-        ): Result<Unit> =
+        ): Result<NicknameValidationResult> =
             runCatching {
                 val profileFile = fileLocalDataSource.createAndGetFile(profileImage)
 
                 val response =
-                    authRemoteDataSource.signup(
-                        kakaoAccessToken = kakaoAccessToken,
-                        imageFile = profileFile,
-                        signupRequest =
-                            SignupRequest(
-                                platform = KAKAO_PLATFORM,
-                                nickname = nickname,
-                            ),
-                    )
-
+                    try {
+                        authRemoteDataSource.signup(
+                            kakaoAccessToken = kakaoAccessToken,
+                            imageFile = profileFile,
+                            signupRequest =
+                                SignupRequest(
+                                    platform = KAKAO_PLATFORM,
+                                    nickname = nickname,
+                                ),
+                        )
+                    } catch (e: NetworkException) {
+                        if (e.code == ErrorCode.DUPLICATED_NICKNAME) {
+                            return Result.success(NicknameValidationResult.Error.Duplicated)
+                        }
+                        throw e
+                    }
                 tokenLocalDataSource.saveTokens(
                     accessToken = response.accessToken,
                     refreshToken = response.refreshToken,
@@ -91,6 +98,8 @@ class AuthRepositoryImpl
                         profileImagePath = profileFile?.absolutePath,
                     ),
                 )
+
+                return Result.success(NicknameValidationResult.Success)
             }
 
         override suspend fun withdraw(): Result<Unit> =

core/data/src/main/java/com/example/data/service/UserService.kt

@@ -8,6 +8,7 @@ import com.example.data.constant.ApiConstants.SCRAPS
 import com.example.data.constant.ApiConstants.USERS
 import com.example.data.constant.ApiConstants.VERSIONS
 import com.example.data.model.request.NotificationRequest
+import com.example.data.model.request.PatchProfileRequest
 import com.example.data.model.response.BaseResponse
 import com.example.data.model.response.NotificationResponse
 import com.example.data.model.response.RegisteredTracksResponse
@@ -30,7 +31,7 @@ interface UserService {
     @PATCH("$API/$VERSIONS/$USERS/$ME")
     suspend fun patchProfile(
         @Part profileImg: MultipartBody.Part?,
-        @Part("nickname") request: String?,
+        @Part("changeProfileRequest") request: PatchProfileRequest,
     ): BaseResponse<Unit>
 
     @GET("$API/$VERSIONS/$USERS/{userId}")

core/designsystem/src/main/java/com/example/designsystem/component/DPlayLargeCover.kt

@@ -40,7 +40,7 @@ fun DPlayLargeCover(
     isBookmarkChecked: Boolean,
     isLikeChecked: Boolean,
     likeCount: Int,
-    writerProfileImageUrl: String,
+    writerProfileImageUrl: String?,
     writerNickname: String,
     content: String,
     musicImageUrl: String,
@@ -130,7 +130,7 @@ fun DPlayLargeCover(
                     modifier = Modifier.noRippleClickable(onClick = onWriterProfileClick),
                 ) {
                     AsyncImage(
-                        model = writerProfileImageUrl,
+                        model = writerProfileImageUrl ?: R.drawable.base_profile_image,
                         contentDescription = null,
                         modifier =
                             Modifier

core/designsystem/src/main/java/com/example/designsystem/component/DPlayProfileImageArea.kt

@@ -0,0 +1,50 @@
+package com.example.designsystem.component
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.dplay.designsystem.R
+import com.example.designsystem.theme.DPlayTheme
+import com.example.designsystem.util.noRippleClickable
+
+@Composable
+fun DPlayProfileImageArea(
+    onProfileImageClick: () -> Unit,
+    profileImagePath: String?,
+    modifier: Modifier = Modifier,
+    content: @Composable () -> Unit = {},
+) {
+    Box(
+        modifier =
+            modifier
+                .noRippleClickable(
+                    onClick = { onProfileImageClick() },
+                ),
+        contentAlignment = Alignment.BottomEnd,
+    ) {
+        AsyncImage(
+            model = profileImagePath ?: R.drawable.base_profile_image,
+            contentDescription = null,
+            modifier =
+                Modifier
+                    .fillMaxSize()
+                    .clip(CircleShape)
+                    .border(
+                        width = 1.dp,
+                        color = DPlayTheme.colors.gray200,
+                        shape = CircleShape,
+                    ),
+            contentScale = ContentScale.Crop,
+        )
+
+        content()
+    }
+}

core/designsystem/src/main/res/values/strings.xml

@@ -31,7 +31,7 @@
 
     <string name="nickname_error_not_enough_length">%d자 이상 입력해주세요</string>
     <string name="nickname_error_invalid_format">특수문자, 띄어쓰기는 사용 불가능해요</string>
-    <string name="nickname_error_already_exists">이미 사용 중인 값입니다</string>
+    <string name="nickname_error_already_exists">이미 사용 중인 닉네임이에요</string>
     <string name="nickname_error_forbidden_word">비속어, 금칙어가 포함되어 있습니다</string>
     <string name="nickname_success_message">사용 가능한 닉네임이에요</string>
 

core/domain/src/main/java/com/example/domain/model/NicknameValidationResult.kt

@@ -6,5 +6,6 @@ sealed interface NicknameValidationResult {
     sealed interface Error : NicknameValidationResult {
         data object TooShort : Error
         data object InvalidFormat : Error
+        data object Duplicated : Error
     }
 }

core/domain/src/main/java/com/example/domain/model/Writer.kt

@@ -3,5 +3,5 @@ package com.example.domain.model
 data class Writer(
     val userId: Long,
     val nickname: String,
-    val profileImg: String,
+    val profileImg: String?,
 )

core/domain/src/main/java/com/example/domain/repository/AuthRepository.kt

@@ -1,13 +1,15 @@
 package com.example.domain.repository
 
+import com.example.domain.model.NicknameValidationResult
+
 interface AuthRepository {
     suspend fun kakaoLogin(): Result<String>
 
     suspend fun signupWithKakao(
         kakaoAccessToken: String?,
         profileImage: String?,
         nickname: String,
-    ): Result<Unit>
+    ): Result<NicknameValidationResult>
 
     suspend fun logout(): Result<Unit>
 

core/ui/src/main/java/com/example/ui/controller/BottomNavigationController.kt

@@ -0,0 +1,24 @@
+package com.example.ui.controller
+
+import androidx.compose.runtime.compositionLocalOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+class BottomNavigationController {
+    var bottomNavigationVisible by mutableStateOf(true)
+        private set
+
+    fun show() {
+        bottomNavigationVisible = true
+    }
+
+    fun hide() {
+        bottomNavigationVisible = false
+    }
+}
+
+val LocalBottomNavigationController =
+    compositionLocalOf<BottomNavigationController> {
+        error("BottomNavigationController not provided")
+    }

core/ui/src/main/java/com/example/ui/mapper/NicknameValidationMapper.kt

@@ -9,4 +9,5 @@ fun NicknameValidationResult.toUiState(): InputState =
         NicknameValidationResult.Success -> NicknameInputState.Success
         NicknameValidationResult.Error.TooShort -> NicknameInputState.Error.NotEnoughLength
         NicknameValidationResult.Error.InvalidFormat -> NicknameInputState.Error.InvalidFormat
+        NicknameValidationResult.Error.Duplicated -> NicknameInputState.Error.AlreadyExists
     }

feature/comment/src/main/java/com/example/comment/CommentContract.kt

@@ -37,5 +37,9 @@ class CommentContract {
         data object NavigateToBack : CommentSideEffect
 
         data object NavigateToHome : CommentSideEffect
+
+        data class OpenWebView(
+            val url: String,
+        ) : CommentSideEffect
     }
 }

feature/comment/src/main/java/com/example/comment/CommentScreen.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.layout
 import androidx.compose.ui.layout.onGloballyPositioned
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -47,6 +48,8 @@ fun CommentRoute(
 ) {
     val state by viewModel.uiState.collectAsStateWithLifecycle()
 
+    val uriHandler = LocalUriHandler.current
+
     LaunchedEffect(track) {
         viewModel.handleIntent(CommentContract.CommentIntent.Initialize(track))
     }
@@ -60,6 +63,9 @@ fun CommentRoute(
                 CommentContract.CommentSideEffect.NavigateToHome -> {
                     navigator.clearAndNavigateTo(Home)
                 }
+                is CommentContract.CommentSideEffect.OpenWebView -> {
+                    uriHandler.openUri(sideEffect.url)
+                }
             }
         }
     }

feature/comment/src/main/java/com/example/comment/CommentViewModel.kt

@@ -1,6 +1,7 @@
 package com.example.comment
 
 import androidx.lifecycle.viewModelScope
+import com.example.common.constant.Url
 import com.example.domain.repository.PostRepository
 import com.example.ui.base.BaseViewModel
 import com.example.ui.model.TrackState
@@ -42,7 +43,7 @@ class CommentViewModel
                     }
                 }
                 CommentContract.CommentIntent.OnMoreGuideClick -> {
-                    // 가이드 노션으로 이동
+                    setSideEffect(CommentContract.CommentSideEffect.OpenWebView(Url.COMMUNITY_GUIDE))
                 }
                 CommentContract.CommentIntent.OnRegisterButtonClick -> {
                     registerPost()
@@ -59,7 +60,7 @@ class CommentViewModel
                         track = track,
                         comment = currentState.commentInput,
                     ).onSuccess {
-                        setSideEffect(CommentContract.CommentSideEffect.NavigateToBack)
+                        setSideEffect(CommentContract.CommentSideEffect.NavigateToHome)
                     }.onFailure {
                     }
             }