Feat/week xml 06

app/build.gradle

@@ -71,5 +71,5 @@ dependencies {
 // define any required OkHttp artifacts without version
     implementation("com.squareup.okhttp3:okhttp")
     implementation("com.squareup.okhttp3:logging-interceptor")
-
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9")
 }

app/src/main/AndroidManifest.xml

@@ -15,7 +15,7 @@
         tools:targetApi="31"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.Login.LoginActivity"
             android:exported="true">
 
             <intent-filter>
@@ -26,10 +26,10 @@
         </activity>
 
         <activity
-            android:name=".MainActivity"
-            android:exported="false"></activity>
+            android:name=".presentation.MainActivity"
+            android:exported="false"/>
         <activity
-            android:name=".SignUpActivity"
+            android:name=".presentation.SignUpActivity"
             android:exported="false" />
     </application>
 

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

@@ -0,0 +1,33 @@
+package com.sopt.now.data
+
+import com.sopt.now.data.api.AuthService
+import com.sopt.now.data.dto.LoginDto.RequestLogInDto
+import com.sopt.now.data.dto.SignUp.RequestSignUpDto
+import com.sopt.now.domain.AuthRepository
+import com.sopt.now.domain.model.AuthData
+import retrofit2.Response
+
+class AuthRepoImpl(
+    private val authService: AuthService,
+) : AuthRepository {
+    override suspend fun logIn(authData: AuthData): Result<Response<Unit>> = runCatching  {
+        authService.logIn(
+            request = RequestLogInDto(
+                authenticationId = authData.id,
+                password = authData.pw
+            )
+        )
+    }
+    override suspend fun signUp(authData: AuthData): Result<Response<Unit>> = runCatching {
+        authService.signUp(
+            RequestSignUpDto(
+                authenticationId = authData.id,
+                password = authData.pw,
+                nickname = authData.name ?: "",
+                phone = authData.phone ?: ""
+            )
+        )
+    }
+
+
+}

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

@@ -1,16 +1,27 @@
-package com.sopt.now.api
+package com.sopt.now.data.api
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import com.sopt.now.BuildConfig
 import kotlinx.serialization.json.Json
 import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.OkHttpClient
+import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 
 object ApiFactory {
     private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
 
+    val loggingInterceptor = HttpLoggingInterceptor().apply {
+        level = HttpLoggingInterceptor.Level.BODY
+    }
+
+    val client = OkHttpClient.Builder()
+        .addInterceptor(loggingInterceptor)
+        .build()
+
     val retrofit: Retrofit by lazy {
         Retrofit.Builder()
+            .client(client)
             .baseUrl(BASE_URL)
             .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
             .build()

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

@@ -1,26 +1,27 @@
-package com.sopt.now.api
+package com.sopt.now.data.api
 
-import com.sopt.now.dto.LoginDto.RequestLogInDto
-import com.sopt.now.dto.SignUp.RequestSignUpDto
-import com.sopt.now.dto.LoginDto.ResponseLogInDto
-import com.sopt.now.dto.SignUp.ResponseSignUpDto
-import com.sopt.now.dto.ResponseUserProfile
+import com.sopt.now.data.dto.LoginDto.RequestLogInDto
+import com.sopt.now.data.dto.SignUp.RequestSignUpDto
+import com.sopt.now.data.dto.LoginDto.ResponseLogInDto
+import com.sopt.now.data.dto.SignUp.ResponseSignUpDto
+import com.sopt.now.data.dto.ResponseUserProfile
 import retrofit2.Call
+import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("member/join")
-    fun signUp(
+    suspend fun signUp(
         @Body request: RequestSignUpDto,
-    ): Call<ResponseSignUpDto>
+    ): Response<Unit>
 
     @POST("member/login")
-    fun logIn(
+    suspend fun logIn(
         @Body request: RequestLogInDto,
-    ): Call<ResponseLogInDto>
+    ): Response<Unit>
 
     @GET("member/info")
     fun getUserInfo(

app/src/main/java/com/sopt/now/dto/LoginDto/RequestLogInDto.kt → app/src/main/java/com/sopt/now/data/dto/LoginDto/RequestLogInDto.kt

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

app/src/main/java/com/sopt/now/dto/LoginDto/ResponseLogInDto.kt → app/src/main/java/com/sopt/now/data/dto/LoginDto/ResponseLogInDto.kt

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

app/src/main/java/com/sopt/now/dto/ResponseUserProfile.kt → app/src/main/java/com/sopt/now/data/dto/ResponseUserProfile.kt

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

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

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

app/src/main/java/com/sopt/now/dto/SignUp/ResponseSignUpDto.kt → app/src/main/java/com/sopt/now/data/dto/SignUp/ResponseSignUpDto.kt

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

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

@@ -0,0 +1,9 @@
+package com.sopt.now.domain
+
+import com.sopt.now.domain.model.AuthData
+import retrofit2.Response
+
+interface AuthRepository {
+    suspend fun logIn(authData: AuthData): Result<Response<Unit>>
+    suspend fun signUp(authData: AuthData): Result<Response<Unit>>
+}

app/src/main/java/com/sopt/now/domain/model/AuthData.kt

@@ -0,0 +1,10 @@
+package com.sopt.now.domain.model
+
+import android.provider.ContactsContract.CommonDataKinds.Phone
+
+data class AuthData(
+    val id: String,
+    val pw: String,
+    val name: String? = null,
+    val phone: String? = null
+)

app/src/main/java/com/sopt/now/Friend/FriendAdapter.kt → app/src/main/java/com/sopt/now/presentation/Friend/FriendAdapter.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Friend
+package com.sopt.now.presentation.Friend
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

app/src/main/java/com/sopt/now/Friend/FriendData.kt → app/src/main/java/com/sopt/now/presentation/Friend/FriendData.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Friend
+package com.sopt.now.presentation.Friend
 
 import androidx.annotation.DrawableRes
 

app/src/main/java/com/sopt/now/Friend/FriendViewHolder.kt → app/src/main/java/com/sopt/now/presentation/Friend/FriendViewHolder.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Friend
+package com.sopt.now.presentation.Friend
 
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.now.databinding.ItemFriendBinding

app/src/main/java/com/sopt/now/Home/HomeFragment.kt → app/src/main/java/com/sopt/now/presentation/Home/HomeFragment.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Home
+package com.sopt.now.presentation.Home
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -8,8 +8,8 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.sopt.now.Friend.FriendAdapter
-import com.sopt.now.User.UserAdapter
+import com.sopt.now.presentation.Friend.FriendAdapter
+import com.sopt.now.presentation.User.UserAdapter
 import com.sopt.now.databinding.FragmentHomeBinding
 
 

app/src/main/java/com/sopt/now/Home/HomeViewModel.kt → app/src/main/java/com/sopt/now/presentation/Home/HomeViewModel.kt

@@ -1,9 +1,9 @@
-package com.sopt.now.Home
+package com.sopt.now.presentation.Home
 
 import androidx.lifecycle.ViewModel
-import com.sopt.now.Friend.FriendData
+import com.sopt.now.presentation.Friend.FriendData
 import com.sopt.now.R
-import com.sopt.now.User.UserData
+import com.sopt.now.presentation.User.UserData
 
 class HomeViewModel : ViewModel() {
 

app/src/main/java/com/sopt/now/Home/MyPageFragment.kt → app/src/main/java/com/sopt/now/presentation/Home/MyPageFragment.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Home
+package com.sopt.now.presentation.Home
 
 import android.os.Bundle
 import android.util.Log
@@ -7,9 +7,9 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import com.sopt.now.api.ServicePool
+import com.sopt.now.data.api.ServicePool
 import com.sopt.now.databinding.FragmentMyPageBinding
-import com.sopt.now.dto.ResponseUserProfile
+import com.sopt.now.data.dto.ResponseUserProfile
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -26,7 +26,7 @@ class MyPageFragment : Fragment() {
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
-    ): View? {
+    ): View {
         _binding = FragmentMyPageBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -60,19 +60,20 @@ class MyPageFragment : Fragment() {
                                 tvUserId.text = "ID: ${it.data.authenticationId}"
                                 tvUserName.text = "Name: ${it.data.nickname}"
                                 tvPhone.text = "Phone: ${it.data.phone}"
-
                             }
                         }
                     } else {
                         onFailure(call, Throwable("Fail: ${response.code()}"))
                     }
                 }
-
                 override fun onFailure(call: Call<ResponseUserProfile>, t: Throwable) {
                     Toast.makeText(requireContext(), t.message.toString(), Toast.LENGTH_SHORT)
                         .show()
                 }
 
             })
     }
+    companion object{
+        const val userId= "userId"
+    }
 }

app/src/main/java/com/sopt/now/Home/SearchFragment.kt → app/src/main/java/com/sopt/now/presentation/Home/SearchFragment.kt

@@ -1,4 +1,4 @@
-package com.sopt.now.Home
+package com.sopt.now.presentation.Home
 
 import android.os.Bundle
 import android.view.LayoutInflater