[feat] #7 sync with compose branch

app/build.gradle.kts

@@ -13,15 +13,6 @@ android {
         versionName = "1.0"
     }
     viewBinding.enable = true
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
-        }
-    }
 }
 
 dependencies {
@@ -30,6 +21,6 @@ dependencies {
     implementation(projects.core.database)
     implementation(projects.core.common)
     implementation(projects.core.data)
-
+    implementation(projects.core.network)
     implementation(projects.feature.main)
 }

build-logic/convention/src/main/java/DataPlugin.kt

@@ -16,6 +16,7 @@ internal class DataPlugin : Plugin<Project> {
             dependencies {
                 "implementation"(project(":core:model"))
                 "implementation"(libs.findBundle("coroutine").get())
+                "implementation"(libs.findLibrary("androidx-paging").get())
             }
         }
     }

build-logic/convention/src/main/java/org/sopt/convention/KotlinAndroid.kt

@@ -1,6 +1,7 @@
 package org.sopt.convention
 
 import com.android.build.api.dsl.CommonExtension
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtensionAware
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
@@ -15,6 +16,17 @@ internal fun Project.configureKotlinAndroid(
             minSdk = Const.minSdk
 
             vectorDrawables.useSupportLibrary = true
+
+            buildConfigField(
+                type = "String",
+                name = "AUTH_BASE_URL",
+                gradleLocalProperties(rootDir, providers).getProperty("auth.base.url")
+            )
+            buildConfigField(
+                type = "String",
+                name = "REQRES_BASE_URL",
+                gradleLocalProperties(rootDir, providers).getProperty("reqres.base.url")
+            )
         }
 
         compileOptions {

core/data/build.gradle.kts

@@ -12,5 +12,8 @@ dependencies {
     implementation(projects.core.datastore)
     implementation(projects.core.database)
     implementation(projects.core.common)
+    implementation(projects.core.network)
     implementation(libs.retrofit.kotlin.serialization)
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.androidx.paging)
 }

core/data/src/main/java/org/sopt/data/di/DataModule.kt

@@ -4,20 +4,27 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.sopt.data.repository.AuthRepositoryImpl
 import org.sopt.data.repository.FriendRepository
 import org.sopt.data.repository.UserDataRepositoryImpl
+import org.sopt.data.repository.UserRepositoryImpl
+import org.sopt.domain.repo.AuthRepository
 import org.sopt.domain.repo.SoptRepository
 import org.sopt.domain.repo.UserDataRepository
-import javax.inject.Singleton
+import org.sopt.domain.repo.UserRepository
 
 @Module
 @InstallIn(SingletonComponent::class)
 abstract class DataModule {
-    @Singleton
     @Binds
     abstract fun bindsFriendRepo(soptRepository: FriendRepository): SoptRepository
 
-    @Singleton
     @Binds
     abstract fun bindsUserRepo(userDataRepository: UserDataRepositoryImpl): UserDataRepository
+
+    @Binds
+    abstract fun bindsMemberRepo(userRepository: UserRepositoryImpl): UserRepository
+
+    @Binds
+    abstract fun authRepo(authRepository: AuthRepositoryImpl): AuthRepository
 }

core/data/src/main/java/org/sopt/data/paging/UserPagingSource.kt

@@ -0,0 +1,39 @@
+package org.sopt.data.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import org.sopt.model.ReqresUser
+import org.sopt.network.api.ReqresApi
+import org.sopt.network.model.response.toReqresUser
+import retrofit2.HttpException
+import java.io.IOException
+import javax.inject.Inject
+
+class UserPagingSource @Inject constructor(
+    private val reqresApi: ReqresApi,
+) : PagingSource<Int, ReqresUser>() {
+    override fun getRefreshKey(state: PagingState<Int, ReqresUser>): Int? {
+        return state.anchorPosition
+    }
+
+    override suspend fun load(params: LoadParams<Int>): LoadResult<Int, ReqresUser> {
+        return try {
+            val currentPage = params.key ?: 1
+            val users = toReqresUser(
+                reqresApi.getUsers(
+                    currentPage
+                ).data
+            )
+
+            LoadResult.Page(
+                data = users,
+                prevKey = if (currentPage == 1) null else currentPage - 1,
+                nextKey = if (users.isEmpty()) null else currentPage + 1
+            )
+        } catch (exception: IOException) {
+            return LoadResult.Error(exception)
+        } catch (exception: HttpException) {
+            return LoadResult.Error(exception)
+        }
+    }
+}

core/data/src/main/java/org/sopt/data/repository/AuthRepositoryImpl.kt

@@ -0,0 +1,87 @@
+package org.sopt.data.repository
+
+import kotlinx.serialization.json.Json
+import org.sopt.domain.repo.AuthRepository
+import org.sopt.model.Base
+import org.sopt.model.Member
+import org.sopt.network.api.AuthApi
+import org.sopt.network.model.request.RequestPatchPasswordDto
+import org.sopt.network.model.request.RequestPostSigninDto
+import org.sopt.network.model.request.RequestPostSignupDto
+import org.sopt.network.model.response.base.ApiError
+import org.sopt.network.model.response.base.BaseResponse
+import org.sopt.network.model.response.base.toCoreModel
+import org.sopt.network.model.response.base.toCoreModelNothingType
+import org.sopt.network.model.response.toCoreModel
+import retrofit2.HttpException
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val authApi: AuthApi,
+) : AuthRepository {
+    override suspend fun postSignup(member: Member, pw: String): Result<Base<Nothing>> {
+        val result = runCatching {
+            authApi.postSignup(
+                RequestPostSignupDto(
+                    authenticationId = member.id,
+                    nickname = member.nickname,
+                    password = pw,
+                    phone = member.phone
+                )
+            )
+        }
+        return handleResult(result)
+    }
+
+    override suspend fun getUserinfo(): Result<Member> = runCatching {
+        authApi.getUserinfo().data!!.toCoreModel()
+    }
+
+    override suspend fun postSignin(id: String, pw: String): Result<Base<Nothing>> {
+        val result = runCatching {
+            authApi.postSignin(
+                RequestPostSigninDto(
+                    id,
+                    pw
+                )
+            )
+        }
+        return handleResult(result)
+    }
+
+    override suspend fun patchPassword(
+        previousPassword: String,
+        newPassword: String,
+        newPasswordVerification: String,
+    ): Result<Base<Nothing>> {
+        val result = runCatching {
+            authApi.patchPassword(
+                RequestPatchPasswordDto(
+                    previousPassword = previousPassword,
+                    newPassword = newPassword,
+                    newPasswordVerification = newPasswordVerification
+                )
+            )
+        }
+        return handleResult(result)
+    }
+
+    private fun handleResult(result: Result<BaseResponse<Unit>>) =
+        when (val exception = result.exceptionOrNull()) {
+            null -> result.map {
+                it.toCoreModelNothingType()
+            }
+
+            is HttpException -> {
+                val json = exception.response()?.errorBody()?.string()
+                val api = Json.decodeFromString<ApiError>(json!!)
+                Result.success(
+                    api.toCoreModel()
+                )
+            }
+
+            else -> {
+                Result.failure(exception)
+            }
+        }
+}

core/data/src/main/java/org/sopt/data/repository/UserRepositoryImpl.kt

@@ -0,0 +1,20 @@
+package org.sopt.data.repository
+
+import androidx.paging.Pager
+import androidx.paging.PagingConfig
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import org.sopt.data.paging.UserPagingSource
+import org.sopt.domain.repo.UserRepository
+import org.sopt.model.ReqresUser
+import javax.inject.Inject
+
+class UserRepositoryImpl @Inject constructor(
+    private val userPagingSource: UserPagingSource,
+) : UserRepository {
+    override fun getUser(): Flow<PagingData<ReqresUser>> {
+        return Pager(PagingConfig(6, 2)) {
+            userPagingSource
+        }.flow
+    }
+}

core/datastore/src/main/java/org/sopt/datastore/UserData.kt

@@ -4,6 +4,7 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class UserData(
+    val memberId: Int? = null,
     val id: String? = null,
     val pw: String? = null,
     val name: String? = null,

core/datastore/src/main/java/org/sopt/datastore/source/UserPreferencesDataSource.kt

@@ -14,7 +14,7 @@ class UserPreferencesDataSource @Inject constructor(
     suspend fun setUserData(user: UserData) {
         try {
             userPreferences.updateData {
-                it.copy(user.id, user.pw, user.name, user.hobby)
+                it.copy(user.memberId, user.id, user.pw, user.name, user.hobby)
             }
         } catch (ioException: IOException) {
             Log.e("exception", "setUserData ioException")
@@ -31,10 +31,20 @@ class UserPreferencesDataSource @Inject constructor(
         }
     }
 
+    suspend fun setMemberId(id: Int) {
+        try {
+            userPreferences.updateData {
+                it.copy(memberId = id)
+            }
+        } catch (ioException: IOException) {
+            Log.e("exception", "setMemberId ioException")
+        }
+    }
+
     suspend fun deleteUser() {
         try {
             userPreferences.updateData {
-                it.copy("","","","",false)
+                it.copy(null, "", "", "", "", false)
             }
         } catch (ioException: IOException) {
             Log.e("exception", "deleteUser ioException")

core/domain/build.gradle.kts

@@ -6,4 +6,5 @@ dependencies {
     implementation(projects.core.model)
     implementation(libs.kotlinx.coroutines.core)
     implementation(libs.javax.inject)
+    implementation(libs.androidx.paging.common)
 }

core/domain/src/main/java/org/sopt/domain/repo/AuthRepository.kt

@@ -0,0 +1,18 @@
+package org.sopt.domain.repo
+
+import org.sopt.model.Base
+import org.sopt.model.Member
+
+interface AuthRepository {
+    suspend fun postSignup(member: Member, pw: String): Result<Base<Nothing>>
+
+    suspend fun getUserinfo(): Result<Member?>
+
+    suspend fun postSignin(id: String, pw: String): Result<Base<Nothing>>
+
+    suspend fun patchPassword(
+        previousPassword: String,
+        newPassword: String,
+        newPasswordVerification: String,
+    ): Result<Base<Nothing>>
+}

core/domain/src/main/java/org/sopt/domain/repo/UserRepository.kt

@@ -0,0 +1,9 @@
+package org.sopt.domain.repo
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import org.sopt.model.ReqresUser
+
+interface UserRepository {
+    fun getUser(): Flow<PagingData<ReqresUser>>
+}

core/domain/src/main/java/org/sopt/domain/usecase/ValidatePasswordUseCase.kt

@@ -0,0 +1,18 @@
+package org.sopt.domain.usecase
+
+import org.sopt.model.ValidateResult
+import org.sopt.model.getResult
+import javax.inject.Inject
+
+class ValidatePasswordUseCase @Inject constructor() {
+    operator fun invoke(password: String): ValidateResult {
+        if (password.isBlank()) return ValidateResult.EmptyError
+        return getResult(passwordPattern.matches(password))
+    }
+
+    companion object {
+        val passwordPattern = Regex(
+            """^(?=.*[a-zA-Z])(?=.*[0-9])(?=.*[!@#$%^&*()-_=+{};:,<>/~`|'"\[\]\\?\.]).{8,}$"""
+        )
+    }
+}

core/domain/src/main/java/org/sopt/domain/usecase/ValidatePhoneNumberUseCase.kt

@@ -0,0 +1,18 @@
+package org.sopt.domain.usecase
+
+import org.sopt.model.ValidateResult
+import org.sopt.model.getResult
+import javax.inject.Inject
+
+class ValidatePhoneNumberUseCase @Inject constructor() {
+    operator fun invoke(phone: String): ValidateResult {
+        if (phone.isBlank()) return ValidateResult.EmptyError
+        return getResult(phoneNumberPattern.matches(phone))
+    }
+
+    companion object {
+        val phoneNumberPattern = Regex(
+            """^01[0-9]-[0-9]{3,4}-[0-9]{4}$"""
+        )
+    }
+}

core/model/src/main/java/org/sopt/model/Base.kt

@@ -0,0 +1,8 @@
+package org.sopt.model
+
+data class Base<T>(
+    val code: Int,
+    val data: T? = null,
+    val message: String,
+)
+

core/model/src/main/java/org/sopt/model/Member.kt

@@ -0,0 +1,7 @@
+package org.sopt.model
+
+data class Member(
+    val id: String,
+    val nickname: String,
+    val phone: String,
+)

core/model/src/main/java/org/sopt/model/ReqresUser.kt

@@ -0,0 +1,9 @@
+package org.sopt.model
+
+data class ReqresUser(
+    val id: Int? = null,
+    val email: String? = null,
+    val firstName: String? = null,
+    val lastName: String? = null,
+    val avatar: String? = null,
+)