[FEAT/#10] 6주차 필수 과제

app/src/main/java/org/sopt/and/core/data/datasource/HobbyDataSource.kt

@@ -0,0 +1,10 @@
+package org.sopt.and.core.data.datasource
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.response.GetHobbyResponse
+
+interface HobbyDataSource {
+    suspend fun getHobby(
+        token: String
+    ): BaseResponse<GetHobbyResponse>
+}

app/src/main/java/org/sopt/and/core/data/datasource/SignInDataSource.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.core.data.datasource
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.LoginRequest
+import org.sopt.and.core.data.dto.response.LoginResponse
+
+interface SignInDataSource {
+    suspend fun postSignIn(
+        request: LoginRequest
+    ): BaseResponse<LoginResponse>
+}

app/src/main/java/org/sopt/and/core/data/datasource/SignUpDataSource.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.core.data.datasource
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.CreateUserRequest
+import org.sopt.and.core.data.dto.response.CreateUserResponse
+
+interface SignUpDataSource {
+    suspend fun postSignUp(
+        request: CreateUserRequest
+    ): BaseResponse<CreateUserResponse>
+}

app/src/main/java/org/sopt/and/core/data/datasourceimpl/HobbyDataSourceImpl.kt

@@ -0,0 +1,12 @@
+package org.sopt.and.core.data.datasourceimpl
+
+import org.sopt.and.core.data.datasource.HobbyDataSource
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.response.GetHobbyResponse
+import org.sopt.and.core.data.service.HobbyService
+
+class HobbyDataSourceImpl(
+    private val hobbyService: HobbyService
+) : HobbyDataSource {
+    override suspend fun getHobby(token: String): BaseResponse<GetHobbyResponse> = hobbyService.getMyHobby(token)
+}

app/src/main/java/org/sopt/and/core/data/datasourceimpl/SignInDataSourceImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.core.data.datasourceimpl
+
+import org.sopt.and.core.data.datasource.SignInDataSource
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.LoginRequest
+import org.sopt.and.core.data.dto.response.LoginResponse
+import org.sopt.and.core.data.service.SignInService
+
+
+class SignInDataSourceImpl(
+    private val signInService: SignInService
+) : SignInDataSource {
+    override suspend fun postSignIn(request: LoginRequest): BaseResponse<LoginResponse> = signInService.login(request)
+}

app/src/main/java/org/sopt/and/core/data/datasourceimpl/SignUpDataSourceImpl.kt

@@ -0,0 +1,13 @@
+package org.sopt.and.core.data.datasourceimpl
+
+import org.sopt.and.core.data.datasource.SignUpDataSource
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.CreateUserRequest
+import org.sopt.and.core.data.dto.response.CreateUserResponse
+import org.sopt.and.core.data.service.SignUpService
+
+class SignUpDataSourceImpl(
+    private val signUpService: SignUpService
+) : SignUpDataSource {
+    override suspend fun postSignUp(request: CreateUserRequest): BaseResponse<CreateUserResponse> = signUpService.signUp(request)
+}

app/src/main/java/org/sopt/and/core/data/dto/BaseResponse.kt

@@ -1,10 +1,10 @@
 package org.sopt.and.core.data.dto
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
 data class BaseResponse <T> (
-    val status: Int,
-    val message: String,
-    val data: T? = null
+    @SerialName("result")
+    val result: T
 )

app/src/main/java/org/sopt/and/core/data/dto/response/CreateUserResponse.kt

@@ -5,12 +5,6 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class CreateUserResponse(
-    @SerialName("result")
-    val result: Result
-) {
-    @Serializable
-    data class Result(
-        @SerialName("no")
-        val no: Int
-    )
-}
+    @SerialName("no")
+    val userId: Int
+)

app/src/main/java/org/sopt/and/core/data/dto/response/GetHobbyResponse.kt

@@ -5,12 +5,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class GetHobbyResponse(
-    @SerialName("result")
-    val result: Result
-) {
-    @Serializable
-    data class Result(
-        @SerialName("hobby")
-        val hobby: String
-    )
-}
+    @SerialName("hobby")
+    val hobby: String
+)
+

app/src/main/java/org/sopt/and/core/data/dto/response/LoginResponse.kt

@@ -6,12 +6,8 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class LoginResponse(
-    @SerialName("result")
-    val result: Result
-) {
-    @Serializable
-    data class Result(
-        @SerialName("token")
-        val token: String
-    )
-}
+    @SerialName("token")
+    val token: String
+)
+
+

app/src/main/java/org/sopt/and/core/data/repositoryimpl/HobbyRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.core.data.repositoryimpl
+
+import org.sopt.and.core.data.datasource.HobbyDataSource
+import org.sopt.and.core.data.dto.response.GetHobbyResponse
+import org.sopt.and.domain.entity.HobbyData
+import org.sopt.and.domain.entity.SignInData
+import org.sopt.and.domain.repository.HobbyRepository
+
+class HobbyRepositoryImpl(private val hobbyDataSource: HobbyDataSource) : HobbyRepository {
+    override suspend fun getHobby(token: String): Result<HobbyData> = runCatching {
+        val response = hobbyDataSource.getHobby(token)
+        HobbyData(response.result.hobby)
+    }
+}

app/src/main/java/org/sopt/and/core/data/repositoryimpl/SignInRepositoryImpl.kt

@@ -0,0 +1,13 @@
+package org.sopt.and.core.data.repositoryimpl
+
+import org.sopt.and.core.data.datasource.SignInDataSource
+import org.sopt.and.core.data.dto.reqeust.LoginRequest
+import org.sopt.and.domain.entity.SignInData
+import org.sopt.and.domain.repository.SignInRepository
+
+class SignInRepositoryImpl(private val signInDataSource: SignInDataSource) : SignInRepository {
+    override suspend fun signIn(username: String, password: String): Result<SignInData> = runCatching {
+        val response = signInDataSource.postSignIn(LoginRequest(username, password))
+        SignInData(response.result.token)
+    }
+}

app/src/main/java/org/sopt/and/core/data/repositoryimpl/SignUpRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.core.data.repositoryimpl
+
+import org.sopt.and.core.data.datasource.SignUpDataSource
+import org.sopt.and.core.data.dto.reqeust.CreateUserRequest
+import org.sopt.and.core.data.dto.response.CreateUserResponse
+import org.sopt.and.domain.entity.SignUpData
+import org.sopt.and.domain.repository.SignUpRepository
+
+class SignUpRepositoryImpl(private val signUpDataSource: SignUpDataSource) : SignUpRepository {
+    override suspend fun signUp(username: String, password: String, hobby: String): Result<SignUpData> = runCatching {
+        val response = signUpDataSource.postSignUp(CreateUserRequest(username, password, hobby))
+        SignUpData(response.result.userId)
+    }
+}

app/src/main/java/org/sopt/and/core/data/service/HobbyService.kt

@@ -0,0 +1,13 @@
+package org.sopt.and.core.data.service
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.response.GetHobbyResponse
+import retrofit2.http.GET
+import retrofit2.http.Header
+
+interface HobbyService {
+    @GET("user/my-hobby")
+    suspend fun getMyHobby(
+        @Header("token") token: String
+    ): BaseResponse<GetHobbyResponse>
+}

app/src/main/java/org/sopt/and/core/data/service/ServicePool.kt

@@ -0,0 +1,9 @@
+package org.sopt.and.core.data.service
+
+import org.sopt.and.network.RetrofitInstance
+
+object ServicePool {
+    val signInService: SignInService = RetrofitInstance.create<SignInService>()
+    val signUpService: SignUpService = RetrofitInstance.create<SignUpService>()
+    val hobbyService: HobbyService = RetrofitInstance.create<HobbyService>()
+}

app/src/main/java/org/sopt/and/core/data/service/SignInService.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.core.data.service
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.LoginRequest
+import org.sopt.and.core.data.dto.response.LoginResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface SignInService {
+    @POST("login")
+    suspend fun login(
+        @Body request: LoginRequest
+    ): BaseResponse<LoginResponse>
+}

app/src/main/java/org/sopt/and/core/data/service/SignUpService.kt

@@ -0,0 +1,14 @@
+package org.sopt.and.core.data.service
+
+import org.sopt.and.core.data.dto.BaseResponse
+import org.sopt.and.core.data.dto.reqeust.CreateUserRequest
+import org.sopt.and.core.data.dto.response.CreateUserResponse
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface SignUpService {
+    @POST("user")
+    suspend fun signUp(
+        @Body request: CreateUserRequest
+    ): BaseResponse<CreateUserResponse>
+}

app/src/main/java/org/sopt/and/core/util/DefaultErrorHandler.kt

@@ -0,0 +1,23 @@
+package org.sopt.and.core.util
+
+import android.content.Context
+import retrofit2.HttpException
+import org.sopt.and.R
+
+interface ErrorHandler {
+    fun handleNetworkError(exception: Throwable?): String
+}
+
+class DefaultErrorHandler(private val context: Context) : ErrorHandler {
+    override fun handleNetworkError(exception: Throwable?): String {
+        return when (exception) {
+            is HttpException -> when (exception.code()) {
+                400 -> context.getString(R.string.network_error_400)
+                403 -> context.getString(R.string.network_error_403)
+                409 -> context.getString(R.string.network_error_409)
+                else -> context.getString(R.string.network_error)
+            }
+            else -> context.getString(R.string.network_error)
+        }
+    }
+}

app/src/main/java/org/sopt/and/domain/entity/HobbyData.kt

@@ -0,0 +1,5 @@
+package org.sopt.and.domain.entity
+
+data class HobbyData(
+    val hobby: String
+)

app/src/main/java/org/sopt/and/domain/entity/SignInData.kt

@@ -0,0 +1,6 @@
+package org.sopt.and.domain.entity
+
+data class SignInData(
+    val token: String
+)
+

app/src/main/java/org/sopt/and/domain/entity/SignUpData.kt

@@ -0,0 +1,5 @@
+package org.sopt.and.domain.entity
+
+data class SignUpData(
+    val userId: Int
+)

app/src/main/java/org/sopt/and/domain/repository/HobbyRepository.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.core.data.dto.response.GetHobbyResponse
+import org.sopt.and.domain.entity.HobbyData
+
+interface HobbyRepository {
+    suspend fun getHobby(token: String): Result<HobbyData>
+}

app/src/main/java/org/sopt/and/domain/repository/RepositoryPool.kt

@@ -0,0 +1,23 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.core.data.datasourceimpl.HobbyDataSourceImpl
+import org.sopt.and.core.data.datasourceimpl.SignInDataSourceImpl
+import org.sopt.and.core.data.datasourceimpl.SignUpDataSourceImpl
+import org.sopt.and.core.data.repositoryimpl.HobbyRepositoryImpl
+import org.sopt.and.core.data.repositoryimpl.SignInRepositoryImpl
+import org.sopt.and.core.data.repositoryimpl.SignUpRepositoryImpl
+import org.sopt.and.core.data.service.ServicePool
+
+object RepositoryPool {
+    val hobbyRepository: HobbyRepository by lazy {
+        HobbyRepositoryImpl(HobbyDataSourceImpl(ServicePool.hobbyService))
+    }
+
+    val signInRepository: SignInRepository by lazy {
+        SignInRepositoryImpl(SignInDataSourceImpl(ServicePool.signInService))
+    }
+
+    val signUpRepository: SignUpRepository by lazy {
+        SignUpRepositoryImpl(SignUpDataSourceImpl(ServicePool.signUpService))
+    }
+}

app/src/main/java/org/sopt/and/domain/repository/SignInRepository.kt

@@ -0,0 +1,7 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.domain.entity.SignInData
+
+interface SignInRepository {
+    suspend fun signIn(username: String, password: String): Result<SignInData>
+}

app/src/main/java/org/sopt/and/domain/repository/SignUpRepository.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.core.data.dto.response.CreateUserResponse
+import org.sopt.and.domain.entity.SignUpData
+
+interface SignUpRepository {
+    suspend fun signUp(username: String, password: String, hobby: String): Result<SignUpData>
+}

app/src/main/java/org/sopt/and/navigation/NavGraph.kt

@@ -5,7 +5,6 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import org.sopt.and.core.UserInfo
 import org.sopt.and.presentation.home.HomeScreen
 import org.sopt.and.presentation.mypage.MyPageScreen
 import org.sopt.and.presentation.search.SearchScreen
@@ -22,7 +21,7 @@ sealed class Screen(val route: String) {
 }
 
 @Composable
-fun NavGraph(navController: NavHostController, userInfo: UserInfo) {
+fun NavGraph(navController: NavHostController) {
     NavHost(
         navController = navController,
         startDestination = Screen.SignIn.route