[7주차/필수] Repository 활용_compose

app/src/main/AndroidManifest.xml

@@ -16,13 +16,13 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".feature.changePwd.ChangePwdActivity"
+            android:name=".presentation.changePwd.ChangePwdActivity"
             android:exported="false" />
         <activity
-            android:name=".feature.signup.SignUpActivity"
+            android:name=".presentation.signup.SignUpActivity"
             android:exported="false" />
         <activity
-            android:name=".feature.login.LoginActivity"
+            android:name=".presentation.login.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,7 +31,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".feature.main.MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="false"
             android:label="@string/app_name"
             android:theme="@style/Theme.NOWSOPTAndroid"></activity>

app/src/main/java/com/sopt/now/compose/ApiFactory.kt → app/src/main/java/com/sopt/now/compose/data/remote/ApiFactory.kt

@@ -1,11 +1,12 @@
-package com.sopt.now.compose
+package com.sopt.now.compose.data.remote
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.sopt.now.compose.BuildConfig
 import com.sopt.now.compose.BuildConfig.AUTH_BASE_URL
 import com.sopt.now.compose.BuildConfig.FRIEND_BASE_URL
-import com.sopt.now.compose.remote.service.AuthService
-import com.sopt.now.compose.remote.service.FriendService
-import com.sopt.now.compose.remote.service.UserService
+import com.sopt.now.compose.data.remote.service.AuthService
+import com.sopt.now.compose.data.remote.service.FriendService
+import com.sopt.now.compose.data.remote.service.UserService
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
 import retrofit2.Retrofit
@@ -27,7 +28,7 @@ object ApiFactory {
 }
 
 object ServicePool {
-    val userService = ApiFactory.create<UserService>(AUTH_BASE_URL)
-    val authService = ApiFactory.create<AuthService>(AUTH_BASE_URL)
-    val friendService = ApiFactory.create<FriendService>(FRIEND_BASE_URL)
+    val userService by lazy { ApiFactory.create<UserService>(AUTH_BASE_URL) }
+    val authService by lazy { ApiFactory.create<AuthService>(AUTH_BASE_URL) }
+    val friendService by lazy { ApiFactory.create<FriendService>(FRIEND_BASE_URL) }
 }

app/src/main/java/com/sopt/now/compose/remote/request/RequestChangePwdDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/request/RequestChangePwdDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.request
+package com.sopt.now.compose.data.remote.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/request/RequestLoginDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/request/RequestLoginDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.request
+package com.sopt.now.compose.data.remote.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/request/RequestSignUpDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/request/RequestSignUpDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.request
+package com.sopt.now.compose.data.remote.request
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/response/ResponseChangePwdDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/response/ResponseChangePwdDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.response
+package com.sopt.now.compose.data.remote.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/response/ResponseFriendsDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/response/ResponseFriendsDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.response
+package com.sopt.now.compose.data.remote.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/response/ResponseLoginDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/response/ResponseLoginDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.response
+package com.sopt.now.compose.data.remote.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/response/ResponseSignUpDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/response/ResponseSignUpDto.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.remote.response
+package com.sopt.now.compose.data.remote.response
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

app/src/main/java/com/sopt/now/compose/remote/response/ResponseUserInfoDto.kt → app/src/main/java/com/sopt/now/compose/data/remote/response/ResponseUserInfoDto.kt

@@ -1,6 +1,6 @@
-package com.sopt.now.compose.remote.response
+package com.sopt.now.compose.data.remote.response
 
-import com.sopt.now.compose.data.User
+import com.sopt.now.compose.presentation.home.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/com/sopt/now/compose/remote/service/AuthService.kt → app/src/main/java/com/sopt/now/compose/data/remote/service/AuthService.kt

@@ -1,9 +1,9 @@
-package com.sopt.now.compose.remote.service
+package com.sopt.now.compose.data.remote.service
 
-import com.sopt.now.compose.remote.request.RequestLoginDto
-import com.sopt.now.compose.remote.request.RequestSignUpDto
-import com.sopt.now.compose.remote.response.ResponseLoginDto
-import com.sopt.now.compose.remote.response.ResponseSignUpDto
+import com.sopt.now.compose.data.remote.request.RequestLoginDto
+import com.sopt.now.compose.data.remote.request.RequestSignUpDto
+import com.sopt.now.compose.data.remote.response.ResponseLoginDto
+import com.sopt.now.compose.data.remote.response.ResponseSignUpDto
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST

app/src/main/java/com/sopt/now/compose/remote/service/FriendService.kt → app/src/main/java/com/sopt/now/compose/data/remote/service/FriendService.kt

@@ -1,6 +1,6 @@
-package com.sopt.now.compose.remote.service
+package com.sopt.now.compose.data.remote.service
 
-import com.sopt.now.compose.remote.response.ResponseFriendsDto
+import com.sopt.now.compose.data.remote.response.ResponseFriendsDto
 import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query

app/src/main/java/com/sopt/now/compose/remote/service/UserService.kt → app/src/main/java/com/sopt/now/compose/data/remote/service/UserService.kt

@@ -1,8 +1,8 @@
-package com.sopt.now.compose.remote.service
+package com.sopt.now.compose.data.remote.service
 
-import com.sopt.now.compose.remote.request.RequestChangePwdDto
-import com.sopt.now.compose.remote.response.ResponseChangePwdDto
-import com.sopt.now.compose.remote.response.ResponseUserInfoDto
+import com.sopt.now.compose.data.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseUserInfoDto
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET

app/src/main/java/com/sopt/now/compose/data/repositoryImpl/AuthRepositoryImpl.kt

@@ -0,0 +1,19 @@
+package com.sopt.now.compose.data.repositoryImpl
+
+import com.sopt.now.compose.data.remote.request.RequestLoginDto
+import com.sopt.now.compose.data.remote.request.RequestSignUpDto
+import com.sopt.now.compose.data.remote.response.ResponseLoginDto
+import com.sopt.now.compose.data.remote.response.ResponseSignUpDto
+import com.sopt.now.compose.data.remote.service.AuthService
+import com.sopt.now.compose.domain.AuthRepository
+import retrofit2.Response
+
+class AuthRepositoryImpl(private val authService: AuthService) : AuthRepository {
+    override suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto> {
+        return authService.signUp(request)
+    }
+
+    override suspend fun login(request: RequestLoginDto): Response<ResponseLoginDto> {
+        return authService.login(request)
+    }
+}

app/src/main/java/com/sopt/now/compose/data/repositoryImpl/FollowerRepositoryImpl.kt

@@ -0,0 +1,30 @@
+package com.sopt.now.compose.data.repositoryImpl
+
+import com.sopt.now.compose.data.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseFriendsDto
+import com.sopt.now.compose.data.remote.response.ResponseUserInfoDto
+import com.sopt.now.compose.data.remote.service.FriendService
+import com.sopt.now.compose.data.remote.service.UserService
+import com.sopt.now.compose.domain.FollowerRepository
+import retrofit2.Response
+
+class FollowerRepositoryImpl(
+    private val userService: UserService,
+    private val friendService: FriendService
+) : FollowerRepository {
+    override suspend fun getUserInfo(userId: Int): Response<ResponseUserInfoDto> {
+        return userService.getUserInfo(userId)
+    }
+
+    override suspend fun changeUserPwd(
+        userId: Int,
+        request: RequestChangePwdDto
+    ): Response<ResponseChangePwdDto> {
+        return userService.changeUserPwd(userId, request)
+    }
+
+    override suspend fun getFriends(page: Int): Response<ResponseFriendsDto> {
+        return friendService.getFriends(page)
+    }
+}

app/src/main/java/com/sopt/now/compose/domain/AuthRepository.kt

@@ -0,0 +1,12 @@
+package com.sopt.now.compose.domain
+
+import com.sopt.now.compose.data.remote.request.RequestLoginDto
+import com.sopt.now.compose.data.remote.request.RequestSignUpDto
+import com.sopt.now.compose.data.remote.response.ResponseLoginDto
+import com.sopt.now.compose.data.remote.response.ResponseSignUpDto
+import retrofit2.Response
+
+interface AuthRepository {
+    suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto>
+    suspend fun login(request: RequestLoginDto): Response<ResponseLoginDto>
+}

app/src/main/java/com/sopt/now/compose/domain/FollowerRepository.kt

@@ -0,0 +1,17 @@
+package com.sopt.now.compose.domain
+
+import com.sopt.now.compose.data.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseChangePwdDto
+import com.sopt.now.compose.data.remote.response.ResponseFriendsDto
+import com.sopt.now.compose.data.remote.response.ResponseUserInfoDto
+import retrofit2.Response
+
+interface FollowerRepository {
+    suspend fun getUserInfo(userId: Int): Response<ResponseUserInfoDto>
+    suspend fun changeUserPwd(
+        userId: Int,
+        request: RequestChangePwdDto
+    ): Response<ResponseChangePwdDto>
+
+    suspend fun getFriends(page: Int): Response<ResponseFriendsDto>
+}

app/src/main/java/com/sopt/now/compose/feature/changePwd/ChangePwdActivity.kt → app/src/main/java/com/sopt/now/compose/presentation/changePwd/ChangePwdActivity.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.feature.changePwd
+package com.sopt.now.compose.presentation.changePwd
 
 import android.os.Bundle
 import android.widget.Toast
@@ -23,11 +23,16 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.sopt.now.compose.R
-import com.sopt.now.compose.feature.main.MainViewModel.Companion.LOGIN_INFO
-import com.sopt.now.compose.remote.request.RequestChangePwdDto
-import com.sopt.now.compose.ui.theme.LabeledTextField
-import com.sopt.now.compose.ui.theme.NOWSOPTAndroidTheme
-import com.sopt.now.compose.ui.theme.RoundedCornerButton
+import com.sopt.now.compose.data.remote.ServicePool.friendService
+import com.sopt.now.compose.data.remote.ServicePool.userService
+import com.sopt.now.compose.data.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.data.repositoryImpl.FollowerRepositoryImpl
+import com.sopt.now.compose.domain.FollowerRepository
+import com.sopt.now.compose.presentation.main.MainViewModel.Companion.LOGIN_INFO
+import com.sopt.now.compose.util.BaseViewModelFactory
+import com.sopt.now.compose.util.LabeledTextField
+import com.sopt.now.compose.util.NOWSOPTAndroidTheme
+import com.sopt.now.compose.util.RoundedCornerButton
 
 class ChangePwdActivity : ComponentActivity() {
 
@@ -54,7 +59,14 @@ fun ChangePwdScreen(userId: Int) {
     var newPwd by remember { mutableStateOf("") }
     var newPwdVerification by remember { mutableStateOf("") }
     val context = LocalContext.current
-    val changePwdViewModel: ChangePwdViewModel = viewModel()
+    val followerRepository: FollowerRepository by lazy {
+        FollowerRepositoryImpl(
+            userService,
+            friendService
+        )
+    }
+    val changePwdViewModel: ChangePwdViewModel =
+        viewModel(factory = BaseViewModelFactory { ChangePwdViewModel(followerRepository) })
     val changePwdState = changePwdViewModel.changePwdState.observeAsState()
     changePwdState.value?.let {
         if (it.isSuccess) {

app/src/main/java/com/sopt/now/compose/feature/changePwd/ChangePwdState.kt → app/src/main/java/com/sopt/now/compose/presentation/changePwd/ChangePwdState.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.feature.changePwd
+package com.sopt.now.compose.presentation.changePwd
 
 data class ChangePwdState(
     val isSuccess: Boolean,

app/src/main/java/com/sopt/now/compose/feature/changePwd/ChangePwdViewModel.kt → app/src/main/java/com/sopt/now/compose/presentation/changePwd/ChangePwdViewModel.kt

@@ -1,24 +1,24 @@
-package com.sopt.now.compose.feature.changePwd
+package com.sopt.now.compose.presentation.changePwd
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.sopt.now.compose.ServicePool
-import com.sopt.now.compose.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.data.remote.request.RequestChangePwdDto
+import com.sopt.now.compose.domain.FollowerRepository
 import kotlinx.coroutines.launch
 
-class ChangePwdViewModel : ViewModel() {
+class ChangePwdViewModel(
+    private val followerRepository: FollowerRepository
+) : ViewModel() {
     private val _changePwdState = MutableLiveData<ChangePwdState>()
     val changePwdState: LiveData<ChangePwdState>
         get() = _changePwdState
 
-    private val userService by lazy { ServicePool.userService }
-
     fun changePwd(userId: Int, request: RequestChangePwdDto) {
         viewModelScope.launch {
             runCatching {
-                userService.changeUserPwd(userId, request)
+                followerRepository.changeUserPwd(userId, request)
             }.onSuccess {
                 if (it.code() in 200..299) {
                     _changePwdState.value = ChangePwdState(true, "비밀번호 변경 성공")

app/src/main/java/com/sopt/now/compose/data/Friend.kt → app/src/main/java/com/sopt/now/compose/presentation/home/Friend.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.data
+package com.sopt.now.compose.presentation.home
 
 data class Friend(
     val profileImage: String,

app/src/main/java/com/sopt/now/compose/profileItem/FriendProfileItem.kt → app/src/main/java/com/sopt/now/compose/presentation/home/FriendProfileItem.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.compose.profileItem
+package com.sopt.now.compose.presentation.home
 
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
@@ -17,7 +17,6 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
 import com.bumptech.glide.integration.compose.GlideImage
-import com.sopt.now.compose.data.Friend
 
 @OptIn(ExperimentalGlideComposeApi::class)
 @Composable