Week6 필수,심화 과제

app/src/main/java/org/sopt/and/MainActivity.kt

@@ -3,8 +3,8 @@ package org.sopt.and
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import org.sopt.and.navigation.Navigation
-import org.sopt.and.services.AppContext
+import org.sopt.and.data.service.AppContext
+import org.sopt.and.presentation.navigation.Navigation
 import org.sopt.and.ui.theme.ANDANDROIDTheme
 
 class MainActivity : ComponentActivity() {

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

@@ -0,0 +1,10 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.model.response.GetMyHobbyResponseDto
+import org.sopt.and.data.service.UserService
+
+class GetMyHobbyDataSource(
+    private val userService: UserService
+) {
+    suspend fun getMyHobby(): GetMyHobbyResponseDto = userService.getMyHobby()
+}

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

@@ -0,0 +1,13 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.model.request.SignInRequestDto
+import org.sopt.and.data.model.response.SignInResponseDto
+import org.sopt.and.data.service.UserService
+import retrofit2.Response
+
+class SignInDataSource(
+    private val userService: UserService
+) {
+    suspend fun signIn(request: SignInRequestDto): Response<SignInResponseDto> =
+        userService.signIn(request = request)
+}

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

@@ -0,0 +1,13 @@
+package org.sopt.and.data.datasource
+
+import org.sopt.and.data.model.request.SignUpRequestDto
+import org.sopt.and.data.model.response.SignUpResponseDto
+import org.sopt.and.data.service.UserService
+import retrofit2.Response
+
+class SignUpDataSource(
+    private val userService: UserService
+) {
+    suspend fun signUp(request: SignUpRequestDto): Response<SignUpResponseDto> =
+        userService.signUp(request = request)
+}

app/src/main/java/org/sopt/and/data/mapper/Mapper.kt

@@ -0,0 +1,47 @@
+package org.sopt.and.data.mapper
+
+import org.sopt.and.data.model.request.SignInRequestDto
+import org.sopt.and.data.model.request.SignUpRequestDto
+import org.sopt.and.data.model.response.GetMyHobbyResponseResultDto
+import org.sopt.and.data.model.response.SignInResponseDto
+import org.sopt.and.data.model.response.SignUpResponseDto
+import org.sopt.and.domain.model.MyHobbyEntity
+import org.sopt.and.domain.model.SignInInformationEntity
+import org.sopt.and.domain.model.SignInResponseEntity
+import org.sopt.and.domain.model.SignUpInformationEntity
+import org.sopt.and.domain.model.SignUpResponseEntity
+import retrofit2.Response
+
+object Mapper {
+    fun toMyHobbyEntity(getHobbyResponseResultDto: GetMyHobbyResponseResultDto) =
+        MyHobbyEntity(myHobby = getHobbyResponseResultDto.myHobby)
+
+    fun toSignUpResponseEntity(signUpResponseDto: Response<SignUpResponseDto>) =
+        signUpResponseDto.body()?.result?.let {
+            SignUpResponseEntity(
+                no = it.no,
+                status = signUpResponseDto.code(),
+                code = signUpResponseDto.body()!!.code
+            )
+        }
+
+    fun toSignInResponseEntity(signInResponseDto: Response<SignInResponseDto>) =
+        signInResponseDto.body()?.result?.let {
+            SignInResponseEntity(
+                token = it.token,
+                status = signInResponseDto.code(),
+                code = signInResponseDto.body()!!.code
+            )
+        }
+
+    fun toSignInRequestDto(signInInformationEntity: SignInInformationEntity) = SignInRequestDto(
+        username = signInInformationEntity.username,
+        password = signInInformationEntity.password
+    )
+
+    fun toSignUpRequestDto(signUpInformationEntity: SignUpInformationEntity) = SignUpRequestDto(
+        username = signUpInformationEntity.username,
+        password = signUpInformationEntity.password,
+        hobby = signUpInformationEntity.hobby
+    )
+}

app/src/main/java/org/sopt/and/signin/dto/SignInRequestDto.kt → app/src/main/java/org/sopt/and/data/model/request/SignInRequestDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.signin.dto
+package org.sopt.and.data.model.request
 
 import kotlinx.serialization.Serializable
 

app/src/main/java/org/sopt/and/signup/dto/SignUpRequestDto.kt → app/src/main/java/org/sopt/and/data/model/request/SignUpRequestDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.signup.dto
+package org.sopt.and.data.model.request
 
 import kotlinx.serialization.Serializable
 

app/src/main/java/org/sopt/and/data/model/response/GetMyHobbyResponseDto.kt

@@ -0,0 +1,16 @@
+package org.sopt.and.data.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetMyHobbyResponseDto(
+    val result: GetMyHobbyResponseResultDto? = null,
+    val code: String? = null
+)
+
+@Serializable
+data class GetMyHobbyResponseResultDto(
+    @SerialName("hobby")
+    val myHobby: String
+)

app/src/main/java/org/sopt/and/signin/dto/SignInResponseDto.kt → app/src/main/java/org/sopt/and/data/model/response/SignInResponseDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.signin.dto
+package org.sopt.and.data.model.response
 
 import kotlinx.serialization.Serializable
 

app/src/main/java/org/sopt/and/signup/dto/SignUpResponseDto.kt → app/src/main/java/org/sopt/and/data/model/response/SignUpResponseDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.signup.dto
+package org.sopt.and.data.model.response
 
 import kotlinx.serialization.Serializable
 

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

@@ -0,0 +1,15 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.GetMyHobbyDataSource
+import org.sopt.and.data.mapper.Mapper
+import org.sopt.and.domain.model.MyHobbyEntity
+import org.sopt.and.domain.repository.GetMyHobbyRepository
+
+class GetMyHobbyRepositoryImpl(
+    private val getMyHobbyDataSource: GetMyHobbyDataSource
+) : GetMyHobbyRepository {
+    override suspend fun getMyHobby(): Result<MyHobbyEntity> =
+        runCatching {
+            getMyHobbyDataSource.getMyHobby().result?.let { Mapper.toMyHobbyEntity(it) }!!
+        }
+}

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

@@ -0,0 +1,22 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.SignInDataSource
+import org.sopt.and.data.mapper.Mapper
+import org.sopt.and.domain.model.SignInInformationEntity
+import org.sopt.and.domain.model.SignInResponseEntity
+import org.sopt.and.domain.repository.SignInRepository
+
+class SignInRepositoryImpl(
+    private val signInDataSource: SignInDataSource
+) : SignInRepository {
+    override suspend fun signIn(request: SignInInformationEntity): Result<SignInResponseEntity> =
+        runCatching {
+            Mapper.toSignInResponseEntity(
+                signInDataSource.signIn(
+                    Mapper.toSignInRequestDto(
+                        request
+                    )
+                )
+            )!!
+        }
+}

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

@@ -0,0 +1,22 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.datasource.SignUpDataSource
+import org.sopt.and.data.mapper.Mapper
+import org.sopt.and.domain.model.SignUpInformationEntity
+import org.sopt.and.domain.model.SignUpResponseEntity
+import org.sopt.and.domain.repository.SignUpRepository
+
+class SignUpRepositoryImpl(
+    private val signUpDataSource: SignUpDataSource
+) : SignUpRepository {
+    override suspend fun signUp(request: SignUpInformationEntity): Result<SignUpResponseEntity> =
+        runCatching {
+            Mapper.toSignUpResponseEntity(
+                signUpDataSource.signUp(
+                    Mapper.toSignUpRequestDto(
+                        request
+                    )
+                )
+            )!!
+        }
+}

app/src/main/java/org/sopt/and/services/ApiFactory.kt → app/src/main/java/org/sopt/and/data/service/ApiFactory.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.services
+package org.sopt.and.data.service
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
 import kotlinx.serialization.json.Json

app/src/main/java/org/sopt/and/services/AppContext.kt → app/src/main/java/org/sopt/and/data/service/AppContext.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.services
+package org.sopt.and.data.service
 
 import android.content.Context
 

app/src/main/java/org/sopt/and/services/AuthInterceptor.kt → app/src/main/java/org/sopt/and/data/service/AuthInterceptor.kt

@@ -1,4 +1,4 @@
-package org.sopt.and.services
+package org.sopt.and.data.service
 
 import android.content.Context
 import kotlinx.coroutines.flow.first

app/src/main/java/org/sopt/and/services/TokenManager.kt → app/src/main/java/org/sopt/and/data/service/TokenManager.kt

@@ -1,12 +1,12 @@
-package org.sopt.and.services
+package org.sopt.and.data.service
 
 import android.content.Context
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import org.sopt.and.services.TokenManager.Companion.DATASTORE_NAME
+import org.sopt.and.data.service.TokenManager.Companion.DATASTORE_NAME
 
 val Context.dataStore by preferencesDataStore(DATASTORE_NAME)
 

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

@@ -0,0 +1,22 @@
+package org.sopt.and.data.service
+
+import org.sopt.and.data.model.request.SignInRequestDto
+import org.sopt.and.data.model.request.SignUpRequestDto
+import org.sopt.and.data.model.response.GetMyHobbyResponseDto
+import org.sopt.and.data.model.response.SignInResponseDto
+import org.sopt.and.data.model.response.SignUpResponseDto
+import retrofit2.Response
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+
+interface UserService {
+    @POST("/user")
+    suspend fun signUp(@Body request: SignUpRequestDto): Response<SignUpResponseDto>
+
+    @POST("/login")
+    suspend fun signIn(@Body request: SignInRequestDto): Response<SignInResponseDto>
+
+    @GET("/user/my-hobby")
+    suspend fun getMyHobby(): GetMyHobbyResponseDto
+}

app/src/main/java/org/sopt/and/domain/model/MyHobbyEntity.kt

@@ -0,0 +1,5 @@
+package org.sopt.and.domain.model
+
+data class MyHobbyEntity(
+    val myHobby: String
+)

app/src/main/java/org/sopt/and/domain/model/SignInInformationEntity.kt

@@ -0,0 +1,6 @@
+package org.sopt.and.domain.model
+
+data class SignInInformationEntity(
+    val username: String,
+    val password: String
+)

app/src/main/java/org/sopt/and/domain/model/SignInResponseEntity.kt

@@ -0,0 +1,7 @@
+package org.sopt.and.domain.model
+
+data class SignInResponseEntity(
+    val token: String? = null,
+    val status: Int? = null,
+    val code: String? = null
+)

app/src/main/java/org/sopt/and/domain/model/SignUpInformationEntity.kt

@@ -0,0 +1,7 @@
+package org.sopt.and.domain.model
+
+data class SignUpInformationEntity(
+    val username: String,
+    val password: String,
+    val hobby: String
+)

app/src/main/java/org/sopt/and/domain/model/SignUpResponseEntity.kt

@@ -0,0 +1,7 @@
+package org.sopt.and.domain.model
+
+data class SignUpResponseEntity(
+    val no: Int? = null,
+    val code: String? = null,
+    val status: Int? = null
+)

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

@@ -0,0 +1,20 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.data.datasource.GetMyHobbyDataSource
+import org.sopt.and.data.repositoryimpl.GetMyHobbyRepositoryImpl
+import org.sopt.and.data.service.ServicePool
+import org.sopt.and.domain.model.MyHobbyEntity
+
+interface GetMyHobbyRepository {
+    suspend fun getMyHobby(): Result<MyHobbyEntity>
+
+    companion object {
+        fun create(): GetMyHobbyRepositoryImpl {
+            return GetMyHobbyRepositoryImpl(
+                GetMyHobbyDataSource(
+                    ServicePool.userService
+                )
+            )
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.data.datasource.SignInDataSource
+import org.sopt.and.data.repositoryimpl.SignInRepositoryImpl
+import org.sopt.and.data.service.ServicePool
+import org.sopt.and.domain.model.SignInInformationEntity
+import org.sopt.and.domain.model.SignInResponseEntity
+
+interface SignInRepository {
+    suspend fun signIn(request: SignInInformationEntity): Result<SignInResponseEntity>
+
+    companion object {
+        fun create(): SignInRepositoryImpl {
+            return SignInRepositoryImpl(
+                SignInDataSource(
+                    ServicePool.userService
+                )
+            )
+        }
+    }
+}

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

@@ -0,0 +1,21 @@
+package org.sopt.and.domain.repository
+
+import org.sopt.and.data.datasource.SignUpDataSource
+import org.sopt.and.data.repositoryimpl.SignUpRepositoryImpl
+import org.sopt.and.data.service.ServicePool
+import org.sopt.and.domain.model.SignUpInformationEntity
+import org.sopt.and.domain.model.SignUpResponseEntity
+
+interface SignUpRepository {
+    suspend fun signUp(request: SignUpInformationEntity): Result<SignUpResponseEntity>
+
+    companion object {
+        fun create(): SignUpRepositoryImpl {
+            return SignUpRepositoryImpl(
+                signUpDataSource = SignUpDataSource(
+                    userService = ServicePool.userService
+                )
+            )
+        }
+    }
+}

app/src/main/java/org/sopt/and/domain/usecase/GetMyHobbyUseCase.kt

@@ -0,0 +1,11 @@
+package org.sopt.and.domain.usecase
+
+import org.sopt.and.domain.model.MyHobbyEntity
+import org.sopt.and.domain.repository.GetMyHobbyRepository
+
+class GetMyHobbyUseCase(
+    private val getMyHobbyRepository: GetMyHobbyRepository
+) {
+    suspend operator fun invoke(): Result<MyHobbyEntity> =
+        getMyHobbyRepository.getMyHobby()
+}

app/src/main/java/org/sopt/and/domain/usecase/SignInUseCase.kt

@@ -0,0 +1,12 @@
+package org.sopt.and.domain.usecase
+
+import org.sopt.and.domain.model.SignInInformationEntity
+import org.sopt.and.domain.model.SignInResponseEntity
+import org.sopt.and.domain.repository.SignInRepository
+
+class SignInUseCase(
+    private val signInRepository: SignInRepository
+) {
+    suspend operator fun invoke(request: SignInInformationEntity): Result<SignInResponseEntity> =
+        signInRepository.signIn(request = request)
+}