fix : week4 충돌 해결 #7

GO-SOPT-ANDROID · May 17, 2023 · a9da8e5 · a9da8e5
2 parents b16d5d6 + 0662d0e
commit a9da8e5
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 43 deletions.
diff --git a/app/src/main/java/org/android/go/sopt/data/remote/model/BaseResponseDto.kt b/app/src/main/java/org/android/go/sopt/data/remote/model/BaseResponseDto.kt
@@ -0,0 +1,15 @@
+package org.android.go.sopt.data.remote.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class BaseResponseDto<T>(
+    @SerialName("status")
+    val status: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: T? = null
+)
diff --git a/app/src/main/java/org/android/go/sopt/data/remote/model/SignInDto.kt b/app/src/main/java/org/android/go/sopt/data/remote/model/SignInDto.kt
@@ -13,20 +13,10 @@ data class RequestSignInDto(
 
 @Serializable
 data class ResponseSignInDto(
-    @SerialName("status")
-    val status: Int,
-    @SerialName("message")
-    val message: String,
-    @SerialName("data")
-    val data: SignInData
-){
-    @Serializable
-    data class SignInData(
-        @SerialName("id")
-        val id: String,
-        @SerialName("name")
-        val name: String,
-        @SerialName("skill")
-        val skill: String
-    )
-}
+    @SerialName("id")
+    val id: String,
+    @SerialName("name")
+    val name: String,
+    @SerialName("skill")
+    val skill: String
+)
diff --git a/app/src/main/java/org/android/go/sopt/data/remote/model/SignUpDto.kt b/app/src/main/java/org/android/go/sopt/data/remote/model/SignUpDto.kt
@@ -17,18 +17,8 @@ data class RequestSignUpDto(
 
 @Serializable
 data class ResponseSignUpDto(
-    @SerialName("status")
-    val status: Int,
-    @SerialName("message")
-    val message: String,
-    @SerialName("data")
-    val data: SignUpData,
-){
-    @Serializable
-    data class SignUpData(
-        @SerialName("name")
-        val name: String,
-        @SerialName("skill")
-        val skill: String,
-    )
-}
+    @SerialName("name")
+    val name: String,
+    @SerialName("skill")
+    val skill: String,
+)
diff --git a/app/src/main/java/org/android/go/sopt/data/remote/service/SignInService.kt b/app/src/main/java/org/android/go/sopt/data/remote/service/SignInService.kt
@@ -1,5 +1,6 @@
 package org.android.go.sopt.data.remote.service
 
+import org.android.go.sopt.data.remote.model.BaseResponseDto
 import org.android.go.sopt.data.remote.model.RequestSignInDto
 import org.android.go.sopt.data.remote.model.ResponseSignInDto
 import retrofit2.Call
@@ -11,5 +12,5 @@ interface SignInService {
     fun signIn(
         @Body
         request: RequestSignInDto,
-    ): Call<ResponseSignInDto>
+    ): Call<BaseResponseDto<ResponseSignInDto>>
 }
diff --git a/app/src/main/java/org/android/go/sopt/data/remote/service/SignUpService.kt b/app/src/main/java/org/android/go/sopt/data/remote/service/SignUpService.kt
@@ -1,5 +1,6 @@
 package org.android.go.sopt.data.remote.service
 
+import org.android.go.sopt.data.remote.model.BaseResponseDto
 import org.android.go.sopt.data.remote.model.RequestSignUpDto
 import org.android.go.sopt.data.remote.model.ResponseSignUpDto
 import retrofit2.Call
@@ -12,5 +13,5 @@ interface SignUpService {
     fun signUp(
         @Body
         request: RequestSignUpDto,
-    ): Call<ResponseSignUpDto>
+    ): Call<BaseResponseDto<ResponseSignUpDto>>
 }
diff --git a/app/src/main/java/org/android/go/sopt/presentation/login/LoginViewModel.kt b/app/src/main/java/org/android/go/sopt/presentation/login/LoginViewModel.kt
@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModel
 import org.android.go.sopt.R
 import org.android.go.sopt.SoptApplication
 import org.android.go.sopt.data.remote.ServicePool
+import org.android.go.sopt.data.remote.model.BaseResponseDto
 import org.android.go.sopt.data.remote.model.RequestSignInDto
 import org.android.go.sopt.data.remote.model.ResponseSignInDto
 import org.android.go.sopt.presentation.main.MainActivity
@@ -19,8 +20,8 @@ class LoginViewModel: ViewModel() {
     val id = MutableLiveData("")
     val password = MutableLiveData("")
 
-    private val _signIn = MutableLiveData<ResponseSignInDto>()
-    val signIn: LiveData<ResponseSignInDto> get() = _signIn
+    private val _signIn = MutableLiveData<BaseResponseDto<ResponseSignInDto>>()
+    val signIn: LiveData<BaseResponseDto<ResponseSignInDto>> get() = _signIn
 
     fun onClickLogin(){
         signIn()
@@ -31,10 +32,10 @@ class LoginViewModel: ViewModel() {
             RequestSignInDto(
                 id.value.toString(), password.value.toString()
             )
-        ).enqueue(object : retrofit2.Callback<ResponseSignInDto> {
+        ).enqueue(object : retrofit2.Callback<BaseResponseDto<ResponseSignInDto>> {
             override fun onResponse(
-                call: Call<ResponseSignInDto>,
-                response: Response<ResponseSignInDto>
+                call: Call<BaseResponseDto<ResponseSignInDto>>,
+                response: Response<BaseResponseDto<ResponseSignInDto>>
             ) {
                 if (response.isSuccessful) {
                     SoptApplication.prefs.setBoolean(KEY_ISLOGIN, true)
@@ -44,7 +45,7 @@ class LoginViewModel: ViewModel() {
                 }
             }
 
-            override fun onFailure(call: Call<ResponseSignInDto>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponseDto<ResponseSignInDto>>, t: Throwable) {
                 Log.d("errrr", t.message.toString())
             }
         })

diff --git a/app/src/main/java/org/android/go/sopt/presentation/signup/SignUpActivity.kt b/app/src/main/java/org/android/go/sopt/presentation/signup/SignUpActivity.kt
@@ -11,6 +11,7 @@ import org.android.go.sopt.data.local.User
 import org.android.go.sopt.databinding.ActivitySignUpBinding
 import org.android.go.sopt.SoptApplication
 import org.android.go.sopt.data.remote.ServicePool
+import org.android.go.sopt.data.remote.model.BaseResponseDto
 import org.android.go.sopt.data.remote.model.RequestSignUpDto
 import org.android.go.sopt.data.remote.model.ResponseSignUpDto
 import org.android.go.sopt.presentation.login.LoginActivity
@@ -46,9 +47,9 @@ class SignUpActivity : AppCompatActivity() {
                         etSignupName.text.toString(),
                         etSignupSpecialty.text.toString()
                     )
-                ).enqueue(object : retrofit2.Callback<ResponseSignUpDto> {
+                ).enqueue(object : retrofit2.Callback<BaseResponseDto<ResponseSignUpDto>> {
                     override fun onResponse(
-                        call: Call<ResponseSignUpDto>, response: Response<ResponseSignUpDto>
+                        call: Call<BaseResponseDto<ResponseSignUpDto>>, response: Response<BaseResponseDto<ResponseSignUpDto>>
                     ) {
                         if (response.isSuccessful) {
                             response.body()?.message?.let { showShortToast(it) }
@@ -61,7 +62,7 @@ class SignUpActivity : AppCompatActivity() {
                         }
                     }
 
-                    override fun onFailure(call: Call<ResponseSignUpDto>, t: Throwable) {
+                    override fun onFailure(call: Call<BaseResponseDto<ResponseSignUpDto>>, t: Throwable) {
                         t.message?.let { showShortToast(it) }
                     }