Feat/week xml 07

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

@@ -0,0 +1,19 @@
+package com.sopt.now.data
+
+import com.sopt.now.data.api.AuthService
+import com.sopt.now.data.dto.response.BaseResponse
+import com.sopt.now.domain.entity.request.AuthRequestModel
+import com.sopt.now.domain.repository.AuthRepository
+import retrofit2.Response
+
+class AuthRepositoryImpl(private val authService: AuthService) : AuthRepository {
+    override suspend fun logIn(authData: AuthRequestModel): Result<Response<BaseResponse<Unit>>> =
+        runCatching {
+            authService.login(authData.toRequestLogin())
+        }
+
+    override suspend fun signUp(authData: AuthRequestModel): Result<Response<BaseResponse<Unit>>> =
+        runCatching {
+            authService.signUp(authData.toRequestSignup())
+        }
+}

app/src/main/java/com/sopt/now/data/api/AuthService.kt

@@ -1,11 +1,8 @@
 package com.sopt.now.data.api
 
-import com.sopt.now.data.datasouce.request.RequestLoginDto
-import com.sopt.now.data.datasouce.request.RequestSignUpDto
-import com.sopt.now.data.datasouce.response.BaseResponse
-import com.sopt.now.data.datasouce.response.ResponseLoginDto
-import com.sopt.now.data.datasouce.response.ResponseSignUpDto
-import retrofit2.Call
+import com.sopt.now.data.dto.request.RequestLoginDto
+import com.sopt.now.data.dto.request.RequestSignUpDto
+import com.sopt.now.data.dto.response.BaseResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -18,7 +15,7 @@ interface AuthService {
 
 
     @POST("member/login")
-    fun login(
+    suspend fun login(
         @Body request: RequestLoginDto,
-    ): Call<BaseResponse<Unit>>
+    ): Response<BaseResponse<Unit>>
 }

app/src/main/java/com/sopt/now/data/api/InfoService.kt

@@ -1,13 +1,13 @@
 package com.sopt.now.data.api
 
-import com.sopt.now.data.datasouce.response.ResponseInfoDto
-import retrofit2.Call
+import com.sopt.now.data.dto.response.ResponseInfoDto
+import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Header
 
 interface InfoService {
     @GET("/member/info")
-    fun getUserInfo(
+    suspend fun getUserInfo(
         @Header("memberid") userId: String,
-    ): Call<ResponseInfoDto>
+    ): Response<ResponseInfoDto>
 }

app/src/main/java/com/sopt/now/data/datasouce/request/RequestLoginDto.kt → app/src/main/java/com/sopt/now/data/dto/request/RequestLoginDto.kt

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

app/src/main/java/com/sopt/now/data/datasouce/request/RequestSignUpDto.kt → app/src/main/java/com/sopt/now/data/dto/request/RequestSignUpDto.kt

@@ -1,6 +1,5 @@
-package com.sopt.now.data.datasouce.request
+package com.sopt.now.data.dto.request
 
-import com.sopt.now.data.model.User
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -14,7 +13,4 @@ data class RequestSignUpDto(
     val nickname: String,
     @SerialName("phone")
     val phone: String,
-) {
-    fun toUserWithUserId(userid: String): User =
-        User(id = authenticationId, password = password, nickname = nickname, phoneNumber = phone, userId = userid)
-}
+)

app/src/main/java/com/sopt/now/data/datasouce/response/BaseResponse.kt → app/src/main/java/com/sopt/now/data/dto/response/BaseResponse.kt

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

app/src/main/java/com/sopt/now/data/dto/response/ResponseInfoDto.kt

@@ -0,0 +1,28 @@
+package com.sopt.now.data.dto.response
+
+import com.sopt.now.data.model.User
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ResponseInfoDto(
+    @SerialName("code")
+    val code: Int,
+    @SerialName("message")
+    val message: String,
+    @SerialName("data")
+    val data: UserData
+){
+    @Serializable
+    data class UserData(
+        @SerialName("authenticationId")
+        val authenticationId: String,
+        @SerialName("nickname")
+        val nickname: String,
+        @SerialName("phone")
+        val phone: String,
+    ) {
+        fun toUser() = User(id = authenticationId, password = "", nickname = nickname, phoneNumber = phone)
+    }
+}
+

app/src/main/java/com/sopt/now/domain/entity/request/AuthRequestModel.kt

@@ -0,0 +1,25 @@
+package com.sopt.now.domain.entity.request
+
+import com.sopt.now.data.dto.request.RequestLoginDto
+import com.sopt.now.data.dto.request.RequestSignUpDto
+import com.sopt.now.data.model.User
+
+data class AuthRequestModel(
+    val authenticationId: String,
+    val password: String,
+    val nickname: String,
+    val phone: String,
+) {
+    fun toRequestSignup(): RequestSignUpDto =
+        RequestSignUpDto(authenticationId, password, nickname, phone)
+
+    fun toRequestLogin(): RequestLoginDto = RequestLoginDto(authenticationId, password)
+    fun toUserWithUserId(userid: String): User =
+        User(
+            id = authenticationId,
+            password = password,
+            nickname = nickname,
+            phoneNumber = phone,
+            userId = userid
+        )
+}

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

@@ -0,0 +1,10 @@
+package com.sopt.now.domain.repository
+
+import com.sopt.now.data.dto.response.BaseResponse
+import com.sopt.now.domain.entity.request.AuthRequestModel
+import retrofit2.Response
+
+interface AuthRepository {
+    suspend fun logIn(authData: AuthRequestModel): Result<Response<BaseResponse<Unit>>>
+    suspend fun signUp(authData: AuthRequestModel): Result<Response<BaseResponse<Unit>>>
+}

app/src/main/java/com/sopt/now/domain/usecase/LogInUseCase.kt

@@ -0,0 +1,54 @@
+package com.sopt.now.domain.usecase
+
+import com.sopt.now.data.dto.request.RequestLoginDto
+import com.sopt.now.data.model.User
+import com.sopt.now.domain.entity.request.AuthRequestModel
+import com.sopt.now.domain.repository.AuthRepository
+import com.sopt.now.util.UiState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import retrofit2.HttpException
+
+class LogInUseCase(private val authRepository: AuthRepository) {
+    suspend fun execute(request: AuthRequestModel): UiState<User> {
+        return withContext(Dispatchers.IO) {
+            try {
+                val result = authRepository.logIn(request)
+                result.fold(
+                    onSuccess = { response ->
+                        if (response.isSuccessful) {
+                            UiState.Success(
+                                User(
+                                    request.authenticationId,
+                                    request.password,
+                                    "",
+                                    "",
+                                    userId = response.headers()[LOCATION].toString()
+                                )
+                            )
+                        } else {
+                            val errorMessage =
+                                JSONObject(response.errorBody()?.string()).getString(MESSAGE)
+                            UiState.Error(errorMessage.toString())
+                        }
+                    },
+                    onFailure = { e ->
+                        if (e is HttpException) {
+                            UiState.Error(e.message())
+                        } else {
+                            UiState.Error(e.message.toString())
+                        }
+                    }
+                )
+            } catch (e: Exception) {
+                UiState.Error(e.message.toString())
+            }
+        }
+    }
+
+    companion object {
+        const val MESSAGE = "message"
+        const val LOCATION = "location"
+    }
+}

app/src/main/java/com/sopt/now/domain/usecase/SignUpUseCase.kt

@@ -0,0 +1,45 @@
+package com.sopt.now.domain.usecase
+
+import com.sopt.now.data.model.User
+import com.sopt.now.domain.entity.request.AuthRequestModel
+import com.sopt.now.domain.repository.AuthRepository
+import com.sopt.now.util.UiState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import retrofit2.HttpException
+
+class SignUpUseCase(private val authRepository: AuthRepository) {
+    suspend fun execute(request: AuthRequestModel): UiState<User> {
+        return withContext(Dispatchers.IO) {
+            try {
+                val result = authRepository.signUp(request)
+                result.fold(
+                    onSuccess = { response ->
+                        if (response.isSuccessful) {
+                            UiState.Success(request.toUserWithUserId(response.headers()[LOCATION].toString()))
+                        } else {
+                            val errorMessage =
+                                JSONObject(response.errorBody()?.string()).getString(MESSAGE)
+                            UiState.Error(errorMessage.toString())
+                        }
+                    },
+                    onFailure = { e ->
+                        if (e is HttpException) {
+                            UiState.Error(e.message())
+                        } else {
+                            UiState.Error(e.message.toString())
+                        }
+                    }
+                )
+            } catch (e: Exception) {
+                UiState.Error(e.message.toString())
+            }
+        }
+    }
+
+    companion object {
+        const val MESSAGE = "message"
+        const val LOCATION = "location"
+    }
+}

app/src/main/java/com/sopt/now/ui/login/LoginActivity.kt

@@ -7,8 +7,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import com.sopt.now.R
 import com.sopt.now.data.model.User
-import com.sopt.now.data.datasouce.request.RequestLoginDto
 import com.sopt.now.databinding.ActivityLoginBinding
+import com.sopt.now.domain.entity.request.AuthRequestModel
 import com.sopt.now.ui.main.MainActivity
 import com.sopt.now.ui.signup.SignUpActivity
 import com.sopt.now.util.BindingActivity
@@ -18,7 +18,7 @@ import com.sopt.now.util.toast
 
 class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_login) {
     private lateinit var resultLauncher: ActivityResultLauncher<Intent>
-    private val viewModel by viewModels<LoginViewModel>()
+    private val viewModel: LoginViewModel by viewModels { LoginViewModelFactory() }
     private lateinit var user: User
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -79,14 +79,16 @@ class LoginActivity : BindingActivity<ActivityLoginBinding>(R.layout.activity_lo
 
     private fun initLoginBtnClickListener() {
         binding.btnLogin.setOnClickListener {
-            viewModel.login(getLoginRequestDto())
+            viewModel.login(getLoginRequest())
         }
     }
 
-    private fun getLoginRequestDto() =
-        RequestLoginDto(
+    private fun getLoginRequest() =
+        AuthRequestModel(
             authenticationId = binding.etLoginId.text.toString(),
-            password = binding.etLoginPassword.text.toString()
+            password = binding.etLoginPassword.text.toString(),
+            nickname = "",
+            phone = ""
         )
 
     companion object {