diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/MemberDefaultRepository.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/TokenDefaultRepository.kt similarity index 90% rename from android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/MemberDefaultRepository.kt rename to android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/TokenDefaultRepository.kt index 1abc20294..303daf475 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/MemberDefaultRepository.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/TokenDefaultRepository.kt @@ -5,14 +5,14 @@ import com.on.staccato.data.ResponseResult import com.on.staccato.data.ResponseResult.Exception import com.on.staccato.data.ResponseResult.ServerError import com.on.staccato.data.ResponseResult.Success -import com.on.staccato.domain.repository.MemberRepository +import com.on.staccato.domain.repository.TokenRepository import javax.inject.Inject -class MemberDefaultRepository +class TokenDefaultRepository @Inject constructor( private val memberApiService: MemberApiService, - ) : MemberRepository { + ) : TokenRepository { override suspend fun fetchTokenWithRecoveryCode(recoveryCode: String): ResponseResult { val responseResult = handleApiResponse { memberApiService.postRecoveryCode(recoveryCode) } return when (responseResult) { diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/module/RepositoryModule.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/module/RepositoryModule.kt index 1cbcc3482..057d775b9 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/module/RepositoryModule.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/module/RepositoryModule.kt @@ -3,19 +3,19 @@ package com.on.staccato.data.module import com.on.staccato.data.comment.CommentDefaultRepository import com.on.staccato.data.image.ImageDefaultRepository import com.on.staccato.data.login.LoginDefaultRepository -import com.on.staccato.data.member.MemberDefaultRepository +import com.on.staccato.data.member.TokenDefaultRepository import com.on.staccato.data.memory.MemoryDefaultRepository -import com.on.staccato.data.mypage.MyPageDefaultRepository +import com.on.staccato.data.mypage.MemberProfileDefaultRepository import com.on.staccato.data.staccato.StaccatoDefaultRepository import com.on.staccato.data.timeline.TimelineDefaultRepository import com.on.staccato.domain.repository.CommentRepository import com.on.staccato.domain.repository.ImageRepository import com.on.staccato.domain.repository.LoginRepository -import com.on.staccato.domain.repository.MemberRepository +import com.on.staccato.domain.repository.MemberProfileRepository import com.on.staccato.domain.repository.MemoryRepository -import com.on.staccato.domain.repository.MyPageRepository import com.on.staccato.domain.repository.StaccatoRepository import com.on.staccato.domain.repository.TimelineRepository +import com.on.staccato.domain.repository.TokenRepository import dagger.Binds import dagger.Module import dagger.hilt.InstallIn @@ -43,8 +43,8 @@ abstract class RepositoryModule { abstract fun bindTimelineRepository(timelineDefaultRepository: TimelineDefaultRepository): TimelineRepository @Binds - abstract fun bindMemberRepository(memberRepository: MemberDefaultRepository): MemberRepository + abstract fun bindTokenRepository(tokenRepository: TokenDefaultRepository): TokenRepository @Binds - abstract fun bindMyPageRepository(myPageRepository: MyPageDefaultRepository): MyPageRepository + abstract fun bindMemberProfileRepository(memberProfileRepository: MemberProfileDefaultRepository): MemberProfileRepository } diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MyPageDefaultRepository.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MemberProfileDefaultRepository.kt similarity index 94% rename from android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MyPageDefaultRepository.kt rename to android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MemberProfileDefaultRepository.kt index 5dfa60749..26f690fc1 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MyPageDefaultRepository.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/data/mypage/MemberProfileDefaultRepository.kt @@ -5,15 +5,15 @@ import com.on.staccato.data.ResponseResult import com.on.staccato.data.dto.mapper.toDomain import com.on.staccato.data.dto.mypage.ProfileImageResponse import com.on.staccato.domain.model.MemberProfile -import com.on.staccato.domain.repository.MyPageRepository +import com.on.staccato.domain.repository.MemberProfileRepository import okhttp3.MultipartBody import javax.inject.Inject -class MyPageDefaultRepository +class MemberProfileDefaultRepository @Inject constructor( private val myPageApiService: MyPageApiService, - ) : MyPageRepository { + ) : MemberProfileRepository { override suspend fun getMemberProfile(): ResponseResult { val responseResult = handleApiResponse { myPageApiService.getMemberProfile() } return when (responseResult) { diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MyPageRepository.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberProfileRepository.kt similarity index 91% rename from android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MyPageRepository.kt rename to android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberProfileRepository.kt index 50ceecf68..cad4f714a 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MyPageRepository.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberProfileRepository.kt @@ -5,7 +5,7 @@ import com.on.staccato.data.dto.mypage.ProfileImageResponse import com.on.staccato.domain.model.MemberProfile import okhttp3.MultipartBody -interface MyPageRepository { +interface MemberProfileRepository { suspend fun getMemberProfile(): ResponseResult suspend fun changeProfileImage(profileImageFile: MultipartBody.Part): ResponseResult diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberRepository.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/TokenRepository.kt similarity index 85% rename from android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberRepository.kt rename to android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/TokenRepository.kt index 34de90590..c65e6a416 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberRepository.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/TokenRepository.kt @@ -2,6 +2,6 @@ package com.on.staccato.domain.repository import com.on.staccato.data.ResponseResult -interface MemberRepository { +interface TokenRepository { suspend fun fetchTokenWithRecoveryCode(recoveryCode: String): ResponseResult } diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/main/viewmodel/SharedViewModel.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/main/viewmodel/SharedViewModel.kt index 61cc40553..6e840673e 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/main/viewmodel/SharedViewModel.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/main/viewmodel/SharedViewModel.kt @@ -9,7 +9,7 @@ import com.on.staccato.data.ApiResponseHandler.onServerError import com.on.staccato.data.ApiResponseHandler.onSuccess import com.on.staccato.data.dto.Status import com.on.staccato.domain.model.MemberProfile -import com.on.staccato.domain.repository.MyPageRepository +import com.on.staccato.domain.repository.MemberProfileRepository import com.on.staccato.presentation.common.MutableSingleLiveData import com.on.staccato.presentation.common.SingleLiveData import dagger.hilt.android.lifecycle.HiltViewModel @@ -19,7 +19,7 @@ import javax.inject.Inject @HiltViewModel class SharedViewModel @Inject - constructor(private val myPageRepository: MyPageRepository) : ViewModel() { + constructor(private val memberProfileRepository: MemberProfileRepository) : ViewModel() { private val _memberProfile = MutableLiveData() val memberProfile: LiveData get() = _memberProfile @@ -42,7 +42,7 @@ class SharedViewModel fun fetchMemberProfile() { viewModelScope.launch { - val result = myPageRepository.getMemberProfile() + val result = memberProfileRepository.getMemberProfile() result.onException(::handleException) .onServerError(::handleServerError) .onSuccess(::setMemberProfile) diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/mypage/viewmodel/MyPageViewModel.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/mypage/viewmodel/MyPageViewModel.kt index 73f7453e3..74c3de496 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/mypage/viewmodel/MyPageViewModel.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/mypage/viewmodel/MyPageViewModel.kt @@ -9,7 +9,7 @@ import com.on.staccato.data.ApiResponseHandler.onServerError import com.on.staccato.data.ApiResponseHandler.onSuccess import com.on.staccato.data.dto.Status import com.on.staccato.domain.model.MemberProfile -import com.on.staccato.domain.repository.MyPageRepository +import com.on.staccato.domain.repository.MemberProfileRepository import com.on.staccato.presentation.common.MutableSingleLiveData import com.on.staccato.presentation.common.SingleLiveData import com.on.staccato.presentation.mypage.MemberProfileHandler @@ -21,7 +21,7 @@ import javax.inject.Inject @HiltViewModel class MyPageViewModel @Inject - constructor(private val repository: MyPageRepository) : + constructor(private val repository: MemberProfileRepository) : ViewModel(), MemberProfileHandler { private val _memberProfile = MutableLiveData() diff --git a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/recovery/viewmodel/RecoveryViewModel.kt b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/recovery/viewmodel/RecoveryViewModel.kt index 534e3962e..8c4810170 100644 --- a/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/recovery/viewmodel/RecoveryViewModel.kt +++ b/android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/recovery/viewmodel/RecoveryViewModel.kt @@ -8,7 +8,7 @@ import com.on.staccato.data.ApiResponseHandler.onException import com.on.staccato.data.ApiResponseHandler.onServerError import com.on.staccato.data.ApiResponseHandler.onSuccess import com.on.staccato.data.dto.Status -import com.on.staccato.domain.repository.MemberRepository +import com.on.staccato.domain.repository.TokenRepository import com.on.staccato.presentation.common.MutableSingleLiveData import com.on.staccato.presentation.common.SingleLiveData import com.on.staccato.presentation.recovery.RecoveryHandler @@ -20,7 +20,7 @@ import javax.inject.Inject class RecoveryViewModel @Inject constructor( - private val repository: MemberRepository, + private val repository: TokenRepository, ) : ViewModel(), RecoveryHandler { val recoveryCode = MutableLiveData("")