[Delete/#9] 반환 타입에서 Response 객체 제거

GO-SOPT-ANDROID · Jun 28, 2023 · ad7c49b · ad7c49b
1 parent ba4fb60
commit ad7c49b
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 41 deletions.
diff --git a/app/src/main/java/org/android/go/sopt/remote/domain/LoginPageRepo.kt b/app/src/main/java/org/android/go/sopt/remote/domain/LoginPageRepo.kt
@@ -5,13 +5,11 @@ import org.android.go.sopt.ResponseSignUpDto
 import org.android.go.sopt.remote.remoteData.model.MyProfileDto
 import org.android.go.sopt.remote.remoteData.model.RequestLogInDto
 import org.android.go.sopt.remote.remoteData.model.ResponseLogInDto
-import retrofit2.Response
 
 interface LoginPageRepo {
-    suspend fun login(request: RequestLogInDto): Response<ResponseLogInDto>
+    suspend fun login(request: RequestLogInDto): ResponseLogInDto
 
-    suspend fun signUp(request: RequestSignUpDto) : Response<ResponseSignUpDto>
+    suspend fun signUp(request: RequestSignUpDto): ResponseSignUpDto
 
-    suspend fun myProfile(userId : String):Response<MyProfileDto>
-
-}
+    suspend fun myProfile(userId: String): MyProfileDto
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/remoteData/datasource/LoginPageDataSource.kt b/app/src/main/java/org/android/go/sopt/remote/remoteData/datasource/LoginPageDataSource.kt
@@ -7,20 +7,17 @@ import org.android.go.sopt.remote.remoteData.model.MyProfileDto
 import org.android.go.sopt.remote.remoteData.model.RequestLogInDto
 import org.android.go.sopt.remote.remoteData.model.ResponseLogInDto
 import org.android.go.sopt.remote.service.LogInPageService
-import retrofit2.Response
 
-class LoginPageDataSource(private val apiService:LogInPageService):LoginPageRepo{
-    override suspend fun login(request: RequestLogInDto): Response<ResponseLogInDto> {
+class LoginPageDataSource(private val apiService: LogInPageService) : LoginPageRepo {
+    override suspend fun login(request: RequestLogInDto): ResponseLogInDto {
         return apiService.login(request)
     }
 
-    override suspend fun signUp(request: RequestSignUpDto): Response<ResponseSignUpDto> {
+    override suspend fun signUp(request: RequestSignUpDto): ResponseSignUpDto {
         return apiService.signUp(request)
     }
 
-    override suspend fun myProfile(userId: String): Response<MyProfileDto> {
+    override suspend fun myProfile(userId: String): MyProfileDto {
         return apiService.myProfile(userId)
     }
-
-
-}
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/remoteData/datasource/MainPageDataSource.kt b/app/src/main/java/org/android/go/sopt/remote/remoteData/datasource/MainPageDataSource.kt
@@ -3,10 +3,9 @@ package org.android.go.sopt.remote.remoteData.datasource
 import org.android.go.sopt.remote.domain.MainPageRepo
 import org.android.go.sopt.remote.remoteData.model.ResponseListUsersDto
 import org.android.go.sopt.remote.service.MainPageService
-import retrofit2.Response
 
-class MainPageDataSource(private val apiService:MainPageService):MainPageRepo {
-    override suspend fun getUserList(): Response<ResponseListUsersDto> {
+class MainPageDataSource(private val apiService: MainPageService) : MainPageRepo {
+    override suspend fun getUserList(): ResponseListUsersDto {
         return apiService.getListUsers()
     }
-}
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/remoteData/repoImpl/LoginPageRepoImpl.kt b/app/src/main/java/org/android/go/sopt/remote/remoteData/repoImpl/LoginPageRepoImpl.kt
@@ -6,19 +6,18 @@ import org.android.go.sopt.remote.remoteData.datasource.LoginPageDataSource
 import org.android.go.sopt.remote.remoteData.model.MyProfileDto
 import org.android.go.sopt.remote.remoteData.model.RequestLogInDto
 import org.android.go.sopt.remote.remoteData.model.ResponseLogInDto
-import retrofit2.Response
 
 class LoginPageRepoImpl(private val loginPageDataSource: LoginPageDataSource) {
 
-    suspend fun login(request:RequestLogInDto):Response<ResponseLogInDto>{
+    suspend fun login(request: RequestLogInDto): ResponseLogInDto {
         return loginPageDataSource.login(request)
     }
 
-    suspend fun signUp(request:RequestSignUpDto):Response<ResponseSignUpDto>{
+    suspend fun signUp(request: RequestSignUpDto): ResponseSignUpDto {
         return loginPageDataSource.signUp(request)
     }
 
-    suspend fun myProfile(userId:String):Response<MyProfileDto>{
+    suspend fun myProfile(userId: String): MyProfileDto {
         return loginPageDataSource.myProfile(userId)
     }
-}
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/remoteData/repoImpl/MainPageRepoImpl.kt b/app/src/main/java/org/android/go/sopt/remote/remoteData/repoImpl/MainPageRepoImpl.kt
@@ -2,12 +2,11 @@ package org.android.go.sopt.remote.remoteData.repoImpl
 
 import org.android.go.sopt.remote.remoteData.datasource.MainPageDataSource
 import org.android.go.sopt.remote.remoteData.model.ResponseListUsersDto
-import retrofit2.Response
 
 class MainPageRepoImpl(
-    private val mainPagerDataSource: MainPageDataSource
+    private val mainPagerDataSource: MainPageDataSource,
 ) {
-    suspend fun getUserList():Response<ResponseListUsersDto>{
+    suspend fun getUserList(): ResponseListUsersDto {
         return mainPagerDataSource.getUserList()
     }
-}
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/service/LogInPageService.kt b/app/src/main/java/org/android/go/sopt/remote/service/LogInPageService.kt
@@ -5,26 +5,22 @@ import org.android.go.sopt.ResponseSignUpDto
 import org.android.go.sopt.remote.remoteData.model.MyProfileDto
 import org.android.go.sopt.remote.remoteData.model.RequestLogInDto
 import org.android.go.sopt.remote.remoteData.model.ResponseLogInDto
-import retrofit2.Call
-import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface LogInPageService {
     @POST("sign-in")
-    fun login(
+    suspend fun login(
         @Body request: RequestLogInDto,
-    ): Response<ResponseLogInDto>
+    ): ResponseLogInDto
 
     @POST("sign-up")
-    fun signUp(
+    suspend fun signUp(
         @Body request: RequestSignUpDto,
-    ): Response<ResponseSignUpDto>
-
+    ): ResponseSignUpDto
 
     @GET("info/{userId}")
-    fun myProfile(@Path("userId") userId: String):Response<MyProfileDto>
-
-}
+    suspend fun myProfile(@Path("userId") userId: String): MyProfileDto
+}
diff --git a/app/src/main/java/org/android/go/sopt/remote/service/MainPageService.kt b/app/src/main/java/org/android/go/sopt/remote/service/MainPageService.kt
@@ -1,12 +1,10 @@
 package org.android.go.sopt.remote.service
 
 import org.android.go.sopt.remote.remoteData.model.ResponseListUsersDto
-import retrofit2.Response
 import retrofit2.http.GET
 
 interface MainPageService {
 
     @GET("users")
-    fun getListUsers(
-    ): Response<ResponseListUsersDto>
-}
+    fun getListUsers(): ResponseListUsersDto
+}