[Week7] 7주차 필수과제

app/build.gradle.kts

@@ -85,4 +85,7 @@ dependencies {
     // Network
     implementation(platform(libs.okhttp.bom))
     implementation(libs.bundles.network)
+
+    //timer
+    implementation(libs.timber)
 }

app/src/main/java/org/sopt/and/component/AuthTextField.kt → app/src/main/java/org/sopt/and/core/component/AuthTextField.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box

app/src/main/java/org/sopt/and/component/ExpandedButton.kt → app/src/main/java/org/sopt/and/core/component/ExpandedButton.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

app/src/main/java/org/sopt/and/component/RoundedButton.kt → app/src/main/java/org/sopt/and/core/component/RoundedButton.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable

app/src/main/java/org/sopt/and/component/TopBar.kt → app/src/main/java/org/sopt/and/core/component/TopBar.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.component
+package org.sopt.and.core.component
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize

app/src/main/java/org/sopt/and/Extension.kt → app/src/main/java/org/sopt/and/core/extension/ContextExtension.kt

@@ -1,4 +1,4 @@
-package org.sopt.and
+package org.sopt.and.core.extension
 
 import android.content.Context
 import android.widget.Toast

app/src/main/java/org/sopt/and/core/navigation/MainTabRoute.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core.navigation
+
+interface MainTabRoute : Route

app/src/main/java/org/sopt/and/core/navigation/Route.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core.navigation
+
+interface Route

app/src/main/java/org/sopt/and/core/util/BaseViewModel.kt

@@ -0,0 +1,52 @@
+package org.sopt.and.core.util
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.receiveAsFlow
+import kotlinx.coroutines.launch
+
+abstract class BaseViewModel<State : UiState, SideEffect : UiSideEffect, Intent : UiEvent>() :
+    ViewModel() {
+    private val initialState: State by lazy { createInitialState() }
+    abstract fun createInitialState(): State
+
+    private val _state = MutableStateFlow<State>(initialState)
+    val uiState: StateFlow<State>
+        get() = _state.asStateFlow()
+    val currentState: State
+        get() = uiState.value
+
+    private val _event: MutableSharedFlow<Intent> = MutableSharedFlow()
+    val event: SharedFlow<Intent>
+        get() = _event.asSharedFlow()
+
+    private val _sideEffect: Channel<SideEffect> = Channel()
+    val sideEffect: Flow<SideEffect>
+        get() = _sideEffect.receiveAsFlow()
+
+    fun setState(reduce: State.() -> State) {
+        _state.value = currentState.reduce()
+    }
+
+    open fun setIntent(intent: Intent) {
+        dispatchIntent(intent)
+    }
+
+    private fun dispatchIntent(intent: Intent) = viewModelScope.launch {
+        handleEvent(intent)
+    }
+
+    protected abstract suspend fun handleEvent(intent: Intent)
+
+    fun setSideEffect(sideEffect: () -> SideEffect) {
+        viewModelScope.launch { _sideEffect.send(sideEffect()) }
+    }
+}

app/src/main/java/org/sopt/and/core/util/LoadState.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.core.util
+
+enum class LoadState {
+    Idle,
+    Loading,
+    Success,
+    Failure
+}

app/src/main/java/org/sopt/and/core/util/UiEvent.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core.util
+
+interface UiEvent

app/src/main/java/org/sopt/and/core/util/UiSideEffect.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core.util
+
+interface UiSideEffect

app/src/main/java/org/sopt/and/core/util/UiState.kt

@@ -0,0 +1,3 @@
+package org.sopt.and.core.util
+
+interface UiState

app/src/main/java/org/sopt/and/data/datasource/WavveDataSource.kt → app/src/main/java/org/sopt/and/data/datasource/AuthDataSource.kt

@@ -3,12 +3,10 @@ package org.sopt.and.data.datasource
 import org.sopt.and.data.dto.request.RequestSignInDto
 import org.sopt.and.data.dto.request.RequestSignUpDto
 import org.sopt.and.data.dto.response.BaseResponse
-import org.sopt.and.data.dto.response.ResponseUserHobbyDto
 import org.sopt.and.data.dto.response.ResponseSignInDto
 import org.sopt.and.data.dto.response.ResponseSignUpDto
 
-interface WavveDataSource {
+interface AuthDataSource {
     suspend fun postSignUp(requestSignUpDto: RequestSignUpDto): BaseResponse<ResponseSignUpDto>
     suspend fun postSignIn(requestSignInDto: RequestSignInDto): BaseResponse<ResponseSignInDto>
-    suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto>
 }

app/src/main/java/org/sopt/and/data/datasource/MyDataSource.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseUserHobbyDto
+
+interface MyDataSource {
+    suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto>
+}

app/src/main/java/org/sopt/and/data/datasourceimpl/WavveDataSourceImpl.kt → app/src/main/java/org/sopt/and/data/datasourceimpl/AuthDataSourceImpl.kt

@@ -1,25 +1,20 @@
 package org.sopt.and.data.datasourceimpl
 
-import org.sopt.and.data.datasource.WavveDataSource
+import org.sopt.and.data.datasource.AuthDataSource
 import org.sopt.and.data.dto.request.RequestSignInDto
 import org.sopt.and.data.dto.request.RequestSignUpDto
 import org.sopt.and.data.dto.response.BaseResponse
-import org.sopt.and.data.dto.response.ResponseUserHobbyDto
 import org.sopt.and.data.dto.response.ResponseSignInDto
 import org.sopt.and.data.dto.response.ResponseSignUpDto
-import org.sopt.and.data.service.WavveService
+import org.sopt.and.data.service.AuthService
 import javax.inject.Inject
 
-class WavveDataSourceImpl @Inject constructor(
-    private val wavveService: WavveService
-) : WavveDataSource {
+class AuthDataSourceImpl @Inject constructor(
+    private val authService: AuthService
+) : AuthDataSource {
     override suspend fun postSignUp(requestSignUpDto: RequestSignUpDto): BaseResponse<ResponseSignUpDto> =
-        wavveService.postSignUp(requestSignUpDto)
+        authService.postSignUp(requestSignUpDto)
 
     override suspend fun postSignIn(requestSignInDto: RequestSignInDto): BaseResponse<ResponseSignInDto> =
-        wavveService.postSignIn(requestSignInDto)
-
-    override suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto> =
-        wavveService.getUserHobby()
-
+        authService.postSignIn(requestSignInDto)
 }

app/src/main/java/org/sopt/and/data/datasourceimpl/MyDataSourceImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.data.datasourceimpl
+
+import org.sopt.and.data.datasource.MyDataSource
+import org.sopt.and.data.dto.response.BaseResponse
+import org.sopt.and.data.dto.response.ResponseUserHobbyDto
+import org.sopt.and.data.service.MyService
+import javax.inject.Inject
+
+class MyDataSourceImpl @Inject constructor(
+    private val myService: MyService
+) : MyDataSource {
+    override suspend fun getUserHobby(): BaseResponse<ResponseUserHobbyDto> =
+        myService.getUserHobby()
+}

app/src/main/java/org/sopt/and/data/di/DataSourceModule.kt

@@ -4,15 +4,21 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.sopt.and.data.datasource.WavveDataSource
-import org.sopt.and.data.datasourceimpl.WavveDataSourceImpl
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.datasource.MyDataSource
+import org.sopt.and.data.datasourceimpl.AuthDataSourceImpl
+import org.sopt.and.data.datasourceimpl.MyDataSourceImpl
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal abstract class DataSourceModule {
     @Binds
     @Singleton
-    abstract fun bindsDataSource(myDataSourceImpl: WavveDataSourceImpl): WavveDataSource
+    abstract fun bindsAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindsMyDataSource(MyDataSourceImpl: MyDataSourceImpl): MyDataSource
 }
 

app/src/main/java/org/sopt/and/data/di/NetworkModule.kt

@@ -13,6 +13,7 @@ import okhttp3.logging.HttpLoggingInterceptor
 import org.sopt.and.BuildConfig
 import org.sopt.and.sharedpreference.User
 import retrofit2.Retrofit
+import timber.log.Timber
 import javax.inject.Singleton
 
 @Module
@@ -36,13 +37,12 @@ object NetworkModule {
     @Provides
     fun provideLoggingInterceptor(): HttpLoggingInterceptor {
         return HttpLoggingInterceptor { message ->
-            Log.d("Retrofit2", "CONNECTION INFO -> $message")
+            Timber.tag("Retrofit2").d("CONNECTION INFO -> $message")
         }.apply {
             level = HttpLoggingInterceptor.Level.BODY
         }
     }
 
-
     @Singleton
     @Provides
     fun provideAuthInterceptor(user: User): AuthInterceptor {

app/src/main/java/org/sopt/and/data/di/RepositoryModule.kt

@@ -4,16 +4,32 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.sopt.and.data.repositoryimpl.WavveRepositoryImpl
-import org.sopt.and.domain.repository.WavveRepository
+import org.sopt.and.data.repositoryimpl.MyRepositoryImpl
+import org.sopt.and.data.repositoryimpl.SignInRepositoryImpl
+import org.sopt.and.data.repositoryimpl.SignUpRepositoryImpl
+import org.sopt.and.domain.repository.MyRepository
+import org.sopt.and.domain.repository.SignInRepository
+import org.sopt.and.domain.repository.SignUpRepository
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 internal abstract class RepositoryModule {
     @Binds
     @Singleton
-    abstract fun bindsRepository(
-        myRepositoryImpl: WavveRepositoryImpl
-    ): WavveRepository
+    abstract fun bindsSignInRepository(
+        signInRepositoryImpl: SignInRepositoryImpl
+    ): SignInRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsSignUpRepository(
+        signUpRepositoryImpl: SignUpRepositoryImpl
+    ): SignUpRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindsMyRepository(
+        myRepositoryImpl: MyRepositoryImpl
+    ): MyRepository
 }

app/src/main/java/org/sopt/and/data/di/ServiceModule.kt

@@ -4,7 +4,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.sopt.and.data.service.WavveService
+import org.sopt.and.data.service.AuthService
+import org.sopt.and.data.service.MyService
 import retrofit2.Retrofit
 import javax.inject.Singleton
 
@@ -13,6 +14,11 @@ import javax.inject.Singleton
 object ServiceModule {
     @Provides
     @Singleton
-    fun providerService(retrofit: Retrofit): WavveService =
-        retrofit.create(WavveService::class.java)
+    fun providerAuthService(retrofit: Retrofit): AuthService =
+        retrofit.create(AuthService::class.java)
+
+    @Provides
+    @Singleton
+    fun providerMyService(retrofit: Retrofit): MyService =
+        retrofit.create(MyService::class.java)
 }

app/src/main/java/org/sopt/and/data/repositoryimpl/MyRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.MyDataSource
+import org.sopt.and.domain.entity.response.ResponseHobbyEntity
+import org.sopt.and.domain.repository.MyRepository
+import javax.inject.Inject
+
+class MyRepositoryImpl @Inject constructor(
+    private val myDataSource: MyDataSource
+) : MyRepository {
+    override suspend fun getHobby(): Result<ResponseHobbyEntity> = runCatching {
+        myDataSource.getUserHobby().result.toEntity()
+    }
+}

app/src/main/java/org/sopt/and/data/repositoryimpl/SignInRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.dto.request.toDto
+import org.sopt.and.domain.entity.request.RequestSignInEntity
+import org.sopt.and.domain.entity.response.ResponseSignInEntity
+import org.sopt.and.domain.repository.SignInRepository
+import javax.inject.Inject
+
+class SignInRepositoryImpl @Inject constructor(
+    private val authDataSource: AuthDataSource
+) : SignInRepository {
+    override suspend fun signIn(body: RequestSignInEntity): Result<ResponseSignInEntity> =
+        runCatching {
+            authDataSource.postSignIn(body.toDto()).result.toEntity()
+        }
+}

app/src/main/java/org/sopt/and/data/repositoryimpl/SignUpRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.AuthDataSource
+import org.sopt.and.data.dto.request.toDto
+import org.sopt.and.domain.entity.request.RequestSignUpEntity
+import org.sopt.and.domain.entity.response.ResponseSignUpEntity
+import org.sopt.and.domain.repository.SignUpRepository
+import javax.inject.Inject
+
+class SignUpRepositoryImpl @Inject constructor(
+    private val authDataSource: AuthDataSource
+) : SignUpRepository {
+    override suspend fun signUp(body: RequestSignUpEntity): Result<ResponseSignUpEntity> =
+        runCatching {
+            authDataSource.postSignUp(body.toDto()).result.toEntity()
+        }
+}