[Feat] 내 정보 조회/수정 화면 기능 구현

composeApp/src/commonMain/kotlin/org/whosin/client/core/navigation/Route.kt

@@ -29,7 +29,7 @@ sealed interface Route {
     data object NicknameInput: Route
 
     @Serializable
-    data object ClubCodeInput: Route
+    data class ClubCodeInput(val returnToMyPage: Boolean = false): Route
 
     /* 메인 화면 */
     @Serializable
@@ -38,8 +38,4 @@ sealed interface Route {
     /* 마이 페이지 */
     @Serializable
     data object MyPage: Route
-
-    /* 내 정보 수정하기 */
-    @Serializable
-    data object UpdateMyInfo: Route
 }

composeApp/src/commonMain/kotlin/org/whosin/client/core/navigation/WhosInNavGraph.kt

@@ -6,6 +6,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.navigation
+import androidx.navigation.toRoute
 import org.whosin.client.presentation.auth.clubcode.ClubCodeInputScreen
 import org.whosin.client.presentation.auth.login.EmailVerificationScreen
 import org.whosin.client.presentation.auth.login.LoginScreen
@@ -15,7 +16,6 @@ import org.whosin.client.presentation.auth.login.PasswordInputScreen
 import org.whosin.client.presentation.auth.login.SignupScreen
 import org.whosin.client.presentation.auth.login.SplashScreen
 import org.whosin.client.presentation.home.HomeScreen
-import org.whosin.client.presentation.mypage.EditMyInfoScreen
 import org.whosin.client.presentation.mypage.MyPageScreen
 
 @Composable
@@ -105,18 +105,25 @@ fun WhosInNavGraph(
                     modifier = modifier,
                     onNavigateBack = { navController.navigateUp() },
                     onNavigateToClubCode = {
-                        navController.navigate(Route.ClubCodeInput)
+                        navController.navigate(Route.ClubCodeInput(returnToMyPage = false))
                     }
                 )
             }
 
-            composable<Route.ClubCodeInput> {
+            composable<Route.ClubCodeInput> { backStackEntry ->
+                val route = backStackEntry.toRoute<Route.ClubCodeInput>()
                 ClubCodeInputScreen(
                     modifier = modifier,
                     onNavigateBack = { navController.navigateUp() },
                     onNavigateToHome = {
-                        navController.navigate(Route.Home) {
-                            popUpTo(Route.AuthGraph) { inclusive = true }
+                        if (route.returnToMyPage) {
+                            // MyPage에서 온 경우 단순히 뒤로가기
+                            navController.navigateUp()
+                        } else {
+                            // 회원가입 플로우에서 온 경우 Home으로 이동
+                            navController.navigate(Route.Home) {
+                                popUpTo(Route.AuthGraph) { inclusive = true }
+                            }
                         }
                     }
                 )
@@ -139,23 +146,7 @@ fun WhosInNavGraph(
                 modifier = modifier,
                 onNavigateBack = { navController.navigateUp() },
                 onNavigateToAddClub = {
-
-                },
-                onNavigateToEdit = {
-                    navController.navigate(Route.UpdateMyInfo)
-                },
-            )
-        }
-
-        composable<Route.UpdateMyInfo> {
-            EditMyInfoScreen(
-                modifier = modifier,
-                onNavigateBack = { navController.navigateUp() },
-                onNavigateToMyPage = {
-                    navController.navigate(Route.MyPage) {
-                        popUpTo(Route.UpdateMyInfo) { inclusive = true }
-                        launchSingleTop = true
-                    }
+                    navController.navigate(Route.ClubCodeInput(returnToMyPage = true))
                 }
             )
         }

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/request/UpdateMyInfoRequestDto.kt

@@ -0,0 +1,12 @@
+package org.whosin.client.data.dto.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateMyInfoRequestDto(
+    @SerialName("nickName")
+    val nickName: String,
+    @SerialName("clubList")
+    val clubList: List<Int>?
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/MyInfoResponseDto.kt

@@ -0,0 +1,32 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MyInfoResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: MyInfoData
+)
+
+@Serializable
+data class MyInfoData(
+    @SerialName("nickName")
+    val nickName: String,
+    @SerialName("clubList")
+    val clubList: List<MyClubData>
+)
+
+@Serializable
+data class MyClubData(
+    @SerialName("id")
+    val id: Int,
+    @SerialName("name")
+    val name: String
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/dto/response/UpdateMyInfoResponseDto.kt

@@ -0,0 +1,16 @@
+package org.whosin.client.data.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateMyInfoResponseDto(
+    @SerialName("success")
+    val success: Boolean,
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: MyInfoData
+)

composeApp/src/commonMain/kotlin/org/whosin/client/data/remote/RemoteMemberDataSource.kt

@@ -3,13 +3,18 @@ package org.whosin.client.data.remote
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
 import io.ktor.client.request.get
+import io.ktor.client.request.patch
 import io.ktor.client.request.post
 import io.ktor.client.request.setBody
 import io.ktor.client.statement.HttpResponse
 import io.ktor.http.isSuccess
 import org.whosin.client.core.network.ApiResult
 import org.whosin.client.data.dto.request.LoginRequestDto
+import org.whosin.client.data.dto.request.UpdateMyInfoRequestDto
+import org.whosin.client.data.dto.response.ErrorResponseDto
 import org.whosin.client.data.dto.response.LoginResponseDto
+import org.whosin.client.data.dto.response.MyInfoResponseDto
+import org.whosin.client.data.dto.response.UpdateMyInfoResponseDto
 
 class RemoteMemberDataSource(
     private val client: HttpClient
@@ -38,4 +43,73 @@ class RemoteMemberDataSource(
             ApiResult.Error(message = t.message, cause = t)
         }
     }
+
+    // 내 정보 조회
+    suspend fun getMyInfo(): ApiResult<MyInfoResponseDto> {
+        return try {
+            val response: HttpResponse = client.get(urlString = "users/myPage")
+
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                // 에러 응답 파싱 시도
+                try {
+                    val errorResponse: ErrorResponseDto = response.body()
+                    ApiResult.Error(
+                        code = response.status.value,
+                        message = errorResponse.message
+                    )
+                } catch (e: Exception) {
+                    // 파싱 실패 시 기본 에러 메시지
+                    ApiResult.Error(
+                        code = response.status.value,
+                        message = "HTTP Error: ${response.status.value}"
+                    )
+                }
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
+
+    // 내 정보 수정
+    suspend fun updateMyInfo(
+        newNickName: String,
+        clubList: List<Int>?
+    ): ApiResult<UpdateMyInfoResponseDto> {
+        return try {
+            val response: HttpResponse = client.patch(urlString = "users/myPage/update") {
+                setBody(
+                    UpdateMyInfoRequestDto(nickName = newNickName, clubList = clubList)
+                )
+            }
+
+            if (response.status.isSuccess()) {
+                ApiResult.Success(
+                    data = response.body(),
+                    statusCode = response.status.value
+                )
+            } else {
+                // 에러 응답 파싱 시도
+                try {
+                    val errorResponse: ErrorResponseDto = response.body()
+                    ApiResult.Error(
+                        code = response.status.value,
+                        message = errorResponse.message
+                    )
+                } catch (e: Exception) {
+                    // 파싱 실패 시 기본 에러 메시지
+                    ApiResult.Error(
+                        code = response.status.value,
+                        message = "HTTP Error: ${response.status.value}"
+                    )
+                }
+            }
+        } catch (t: Throwable) {
+            ApiResult.Error(message = t.message, cause = t)
+        }
+    }
 }

composeApp/src/commonMain/kotlin/org/whosin/client/data/repository/MemberRepository.kt

@@ -3,11 +3,19 @@ package org.whosin.client.data.repository
 import org.whosin.client.data.remote.RemoteMemberDataSource
 import org.whosin.client.core.network.ApiResult
 import org.whosin.client.data.dto.response.LoginResponseDto
+import org.whosin.client.data.dto.response.MyInfoResponseDto
+import org.whosin.client.data.dto.response.UpdateMyInfoResponseDto
 
 class MemberRepository(
     private val dataSource: RemoteMemberDataSource
 ) {
     suspend fun login(email: String, password: String): ApiResult<LoginResponseDto> =
         dataSource.login(email, password)
 
+    suspend fun getMyInfo(): ApiResult<MyInfoResponseDto> =
+        dataSource.getMyInfo()
+
+    suspend fun updateMyInfo(newNickName: String, clubList: List<Int>?): ApiResult<UpdateMyInfoResponseDto> =
+        dataSource.updateMyInfo(newNickName = newNickName, clubList = clubList)
+
 }