Refactor/#117 mypage

app/src/main/java/com/toyou/toyouandroid/data/emotion/service/EmotionService.kt

@@ -5,6 +5,7 @@ import com.toyou.toyouandroid.data.emotion.dto.EmotionRequest
 import com.toyou.toyouandroid.data.emotion.dto.EmotionResponse
 import com.toyou.toyouandroid.data.emotion.dto.YesterdayFriendsResponse
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
@@ -17,6 +18,11 @@ interface EmotionService {
         @Body emotion: EmotionRequest
     ): Call<EmotionResponse>
 
+    @POST("users/emotions")
+    suspend fun patchEmotionSuspend(
+        @Body emotion: EmotionRequest
+    ): Response<EmotionResponse>
+
     @GET("diarycards/yesterday")
     fun getYesterdayFriendCard(): Call<YesterdayFriendsResponse>
 

app/src/main/java/com/toyou/toyouandroid/data/mypage/service/MypageService.kt

@@ -2,10 +2,14 @@ package com.toyou.toyouandroid.data.mypage.service
 
 import com.toyou.toyouandroid.data.mypage.dto.MypageResponse
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.GET
 
 interface MypageService {
 
     @GET("/users/mypage")
     fun getMypage(): Call<MypageResponse>
+
+    @GET("/users/mypage")
+    suspend fun getMypageSuspend(): Response<MypageResponse>
 }

app/src/main/java/com/toyou/toyouandroid/data/onboarding/service/AuthService.kt

@@ -3,6 +3,7 @@ package com.toyou.toyouandroid.data.onboarding.service
 import com.toyou.toyouandroid.data.onboarding.dto.request.SignUpRequest
 import com.toyou.toyouandroid.data.onboarding.dto.response.SignUpResponse
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.DELETE
 import retrofit2.http.Header
@@ -25,6 +26,11 @@ interface AuthService {
         @Header("refreshToken") refreshToken: String
     ): Call<SignUpResponse>
 
+    @POST("auth/logout")
+    suspend fun logoutSuspend(
+        @Header("refreshToken") refreshToken: String
+    ): Response<SignUpResponse>
+
     @POST("auth/kakao")
     fun kakaoLogin(
         @Header("oauthAccessToken") accessToken: String
@@ -34,4 +40,9 @@ interface AuthService {
     fun signOut(
         @Header("refreshToken") refreshToken: String
     ): Call<SignUpResponse>
+
+    @DELETE("auth/unlink")
+    suspend fun signOutSuspend(
+        @Header("refreshToken") refreshToken: String
+    ): Response<SignUpResponse>
 }

app/src/main/java/com/toyou/toyouandroid/data/onboarding/service/OnboardingService.kt

@@ -5,6 +5,7 @@ import com.toyou.toyouandroid.data.onboarding.dto.PatchNicknameRequest
 import com.toyou.toyouandroid.data.onboarding.dto.PatchNicknameResponse
 import com.toyou.toyouandroid.data.onboarding.dto.PatchStatusRequest
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
@@ -18,13 +19,29 @@ interface OnboardingService {
         @Query("userId") userId: Int
     ): Call<NicknameCheckResponse>
 
+    @GET("users/nickname/check")
+    suspend fun getNicknameCheckSuspend(
+        @Query("nickname") nickname: String,
+        @Query("userId") userId: Int
+    ): Response<NicknameCheckResponse>
+
     @PATCH("users/nickname")
     fun patchNickname(
         @Body request: PatchNicknameRequest
     ): Call<PatchNicknameResponse>
 
+    @PATCH("users/nickname")
+    suspend fun patchNicknameSuspend(
+        @Body request: PatchNicknameRequest
+    ): Response<PatchNicknameResponse>
+
     @PATCH("users/status")
     fun patchStatus(
         @Body request: PatchStatusRequest
     ): Call<PatchNicknameResponse>
+
+    @PATCH("users/status")
+    suspend fun patchStatusSuspend(
+        @Body request: PatchStatusRequest
+    ): Response<PatchNicknameResponse>
 }

app/src/main/java/com/toyou/toyouandroid/di/AppModule.kt

@@ -0,0 +1,32 @@
+package com.toyou.toyouandroid.di
+
+import android.content.Context
+import com.toyou.toyouandroid.data.onboarding.service.AuthService
+import com.toyou.toyouandroid.utils.TokenManager
+import com.toyou.toyouandroid.utils.TokenStorage
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object AppModule {
+
+    @Provides
+    @Singleton
+    fun provideTokenStorage(@ApplicationContext context: Context): TokenStorage {
+        return TokenStorage(context)
+    }
+
+    @Provides
+    @Singleton
+    fun provideTokenManager(
+        authService: AuthService,
+        tokenStorage: TokenStorage
+    ): TokenManager {
+        return TokenManager(authService, tokenStorage)
+    }
+}

app/src/main/java/com/toyou/toyouandroid/di/NetworkModule.kt

@@ -0,0 +1,64 @@
+package com.toyou.toyouandroid.di
+
+import com.toyou.toyouandroid.data.onboarding.service.AuthService
+import com.toyou.toyouandroid.data.onboarding.service.OnboardingService
+import com.toyou.toyouandroid.data.emotion.service.EmotionService
+import com.toyou.toyouandroid.data.mypage.service.MypageService
+import com.toyou.toyouandroid.data.home.service.HomeService
+import com.toyou.toyouandroid.network.AuthNetworkModule
+import com.toyou.toyouandroid.network.NetworkModule
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import retrofit2.Retrofit
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    @Provides
+    @Singleton
+    @AuthRetrofit
+    fun provideRetrofit(): Retrofit {
+        return AuthNetworkModule.getClient()
+    }
+
+    @Provides
+    @Singleton
+    @NonAuthRetrofit
+    fun provideNonAuthRetrofit(): Retrofit {
+        return NetworkModule.getClient()
+    }
+
+    @Provides
+    @Singleton
+    fun provideOnboardingService(@NonAuthRetrofit retrofit: Retrofit): OnboardingService {
+        return retrofit.create(OnboardingService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthService(@AuthRetrofit retrofit: Retrofit): AuthService {
+        return retrofit.create(AuthService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideEmotionService(@AuthRetrofit retrofit: Retrofit): EmotionService {
+        return retrofit.create(EmotionService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMypageService(@AuthRetrofit retrofit: Retrofit): MypageService {
+        return retrofit.create(MypageService::class.java)
+    }
+
+    @Provides
+    @Singleton
+    fun provideHomeService(@AuthRetrofit retrofit: Retrofit): HomeService {
+        return retrofit.create(HomeService::class.java)
+    }
+}

app/src/main/java/com/toyou/toyouandroid/di/Qualifiers.kt

@@ -0,0 +1,11 @@
+package com.toyou.toyouandroid.di
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AuthRetrofit
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class NonAuthRetrofit

app/src/main/java/com/toyou/toyouandroid/di/RepositoryModule.kt

@@ -0,0 +1,22 @@
+package com.toyou.toyouandroid.di
+
+import com.toyou.toyouandroid.data.onboarding.service.OnboardingService
+import com.toyou.toyouandroid.domain.profile.repository.ProfileRepository
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+
+    @Provides
+    @Singleton
+    fun provideProfileRepository(
+        onboardingService: OnboardingService
+    ): ProfileRepository {
+        return ProfileRepository(onboardingService)
+    }
+}

app/src/main/java/com/toyou/toyouandroid/domain/home/repository/HomeRepository.kt

@@ -1,14 +1,14 @@
 package com.toyou.toyouandroid.domain.home.repository
 
-import com.toyou.toyouandroid.data.home.dto.response.YesterdayCardResponse
 import com.toyou.toyouandroid.data.home.service.HomeService
-import com.toyou.toyouandroid.network.AuthNetworkModule
-import com.toyou.toyouandroid.network.BaseResponse
+import javax.inject.Inject
+import javax.inject.Singleton
 
-class HomeRepository {
-    private val client = AuthNetworkModule.getClient().create(HomeService::class.java)
+@Singleton
+class HomeRepository @Inject constructor(
+    private val homeService: HomeService
+) {
+    suspend fun getCardDetail(id: Long) = homeService.getCardDetail(id)
 
-    suspend fun getCardDetail(id : Long)=client.getCardDetail(id)
-
-    suspend fun getYesterdayCard() = client.getCardYesterday()
+    suspend fun getYesterdayCard() = homeService.getCardYesterday()
 }

app/src/main/java/com/toyou/toyouandroid/domain/profile/repository/ProfileRepository.kt

@@ -0,0 +1,24 @@
+package com.toyou.toyouandroid.domain.profile.repository
+
+import com.toyou.toyouandroid.data.onboarding.dto.NicknameCheckResponse
+import com.toyou.toyouandroid.data.onboarding.dto.PatchNicknameRequest
+import com.toyou.toyouandroid.data.onboarding.dto.PatchNicknameResponse
+import com.toyou.toyouandroid.data.onboarding.dto.PatchStatusRequest
+import com.toyou.toyouandroid.data.onboarding.service.OnboardingService
+import retrofit2.Response
+
+class ProfileRepository(
+    private val onboardingService: OnboardingService
+) {
+    suspend fun checkNickname(nickname: String, userId: Int): Response<NicknameCheckResponse> {
+        return onboardingService.getNicknameCheckSuspend(nickname, userId)
+    }
+
+    suspend fun updateNickname(nickname: String): Response<PatchNicknameResponse> {
+        return onboardingService.patchNicknameSuspend(PatchNicknameRequest(nickname))
+    }
+
+    suspend fun updateStatus(status: String): Response<PatchNicknameResponse> {
+        return onboardingService.patchStatusSuspend(PatchStatusRequest(status))
+    }
+}

app/src/main/java/com/toyou/toyouandroid/presentation/base/MainActivity.kt

@@ -16,8 +16,10 @@ import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.setupWithNavController
 import com.toyou.toyouandroid.R
 import com.toyou.toyouandroid.databinding.ActivityMainBinding
+import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 
+@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityMainBinding