[FEAT] 마이 프로필 및 회원 탈퇴 #33
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.alarmy.near.data.mapper | ||
|
|
||
| import com.alarmy.near.model.member.MemberInfo | ||
| import com.alarmy.near.presentation.feature.myprofile.model.LoginType | ||
| import com.alarmy.near.presentation.feature.myprofile.model.MyProfileInfo | ||
|
|
||
| /** | ||
| * Member 관련 데이터 변환 매퍼 | ||
| * Data 계층 모델을 Presentation 계층 모델로 변환 | ||
| */ | ||
| fun MemberInfo.toMyProfileInfo(): MyProfileInfo = | ||
stopstone marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| MyProfileInfo( | ||
| nickname = nickname, | ||
| imageUrl = imageUrl, | ||
| notificationAgreedAt = notificationAgreedAt, | ||
| providerType = mapProviderType(providerType), | ||
| ) | ||
|
|
||
| /** | ||
| * ProviderType 문자열을 LoginType enum으로 변환 | ||
| */ | ||
| private fun mapProviderType(providerType: String): LoginType = | ||
| when (providerType.uppercase()) { | ||
| "KAKAO" -> LoginType.KAKAO | ||
| else -> LoginType.ETC | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.alarmy.near.data.repository | ||
|
|
||
| import com.alarmy.near.model.member.MemberInfo | ||
| import com.alarmy.near.model.member.WithdrawRequest | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| interface MemberRepository { | ||
| // 현재 로그인한 회원의 정보를 조회 | ||
| fun getMyInfo(): Flow<MemberInfo> | ||
|
|
||
| // 회원 탈퇴 | ||
| suspend fun withdraw(request: WithdrawRequest): Result<Unit> | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| package com.alarmy.near.data.repository | ||
|
|
||
| import com.alarmy.near.model.member.MemberInfo | ||
| import com.alarmy.near.model.member.WithdrawRequest | ||
| import com.alarmy.near.network.service.MemberApiService | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.flow | ||
| import javax.inject.Inject | ||
| import javax.inject.Singleton | ||
|
|
||
| /** | ||
| * 회원 정보 Repository 구현체 | ||
| */ | ||
| @Singleton | ||
| class MemberRepositoryImpl | ||
| @Inject | ||
| constructor( | ||
| private val memberApiService: MemberApiService, | ||
| ) : MemberRepository { | ||
| // 현재 로그인한 회원의 정보를 조회 | ||
| override fun getMyInfo(): Flow<MemberInfo> = | ||
| flow { | ||
| emit( | ||
| runCatching { | ||
stopstone marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| val response = memberApiService.getMyInfo() | ||
|
|
||
| if (response.isSuccessful) { | ||
| response.body() ?: throw Exception("회원 정보가 null입니다.") | ||
| } else { | ||
| val errorMessage = | ||
|
||
| when (response.code()) { | ||
| 404 -> "해당 회원을 찾을 수 없습니다." | ||
| 401 -> "인증이 필요합니다." | ||
| else -> "회원 정보 조회에 실패했습니다. (${response.code()})" | ||
| } | ||
| throw Exception(errorMessage) | ||
| } | ||
| }.getOrThrow(), | ||
| ) | ||
| } | ||
|
|
||
| // 회원 탈퇴 | ||
| override suspend fun withdraw(request: WithdrawRequest): Result<Unit> = | ||
| runCatching { | ||
| val response = memberApiService.withdraw(request) | ||
|
|
||
| if (response.isSuccessful) { | ||
| Unit | ||
| } else { | ||
| val errorMessage = when (response.code()) { | ||
| 401 -> "인증이 필요합니다." | ||
| 404 -> "해당 회원을 찾을 수 없습니다." | ||
| else -> "회원 탈퇴에 실패했습니다. (${response.code()})" | ||
| } | ||
| throw Exception(errorMessage) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.alarmy.near.model.member | ||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| /** | ||
| * 회원 정보 응답 모델 | ||
| */ | ||
| @Serializable | ||
| data class MemberInfo( | ||
| val memberId: String, | ||
| val username: String, | ||
| val nickname: String, | ||
| val imageUrl: String?, | ||
| val notificationAgreedAt: String?, | ||
| val providerType: String, | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.alarmy.near.model.member | ||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| /** | ||
| * 회원 탈퇴 요청 데이터 모델 | ||
| */ | ||
| @Serializable | ||
| data class WithdrawRequest( | ||
| val reasonType: String, | ||
| val customReason: String? = null | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package com.alarmy.near.network.service | ||
|
|
||
| import com.alarmy.near.model.member.MemberInfo | ||
| import com.alarmy.near.model.member.WithdrawRequest | ||
| import retrofit2.Response | ||
| import retrofit2.http.Body | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.HTTP | ||
| import retrofit2.http.Header | ||
|
|
||
| /** | ||
| * 회원 관련 API 서비스 | ||
| */ | ||
| interface MemberApiService { | ||
| // 현재 로그인한 회원의 정보를 조회 | ||
| @GET("member/me") | ||
| suspend fun getMyInfo(): Response<MemberInfo> | ||
|
|
||
| // 회원 탈퇴 | ||
| @HTTP(method = "DELETE", path = "member/withdraw", hasBody = true) | ||
stopstone marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| suspend fun withdraw( | ||
| @Body request: WithdrawRequest, | ||
| ): Response<Unit> | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
release와debug빌드 유형 모두에서 동일한buildConfigField가 반복적으로 선언되고 있습니다. 코드를 더 간결하게 유지하고 중복을 줄이기 위해 이 필드들을defaultConfig블록으로 옮기는 것을 고려해 보세요.NEAR_URL과 같이 빌드 유형에 따라 다른 값을 가져야 하는 경우에만 각buildType에 남겨두는 것이 좋습니다.