Merge pull request #96 from YAPP-Github/feat/#94-terms-api

[feat] #94 이용약관 API 연동

Author: Ojongseok

core/data-api/src/main/java/com/neki/android/core/dataapi/repository/TermRepository.kt

@@ -0,0 +1,8 @@
+package com.neki.android.core.dataapi.repository
+
+import com.neki.android.core.model.Term
+
+interface TermRepository {
+    suspend fun getTerms(): Result<List<Term>>
+    suspend fun agreeTerms(termIds: List<Long>): Result<Unit>
+}

core/data/src/main/java/com/neki/android/core/data/remote/api/TermService.kt

@@ -0,0 +1,26 @@
+package com.neki.android.core.data.remote.api
+
+import com.neki.android.core.data.remote.model.request.TermAgreementsRequest
+import com.neki.android.core.data.remote.model.response.BasicNullableResponse
+import com.neki.android.core.data.remote.model.response.BasicResponse
+import com.neki.android.core.data.remote.model.response.TermsResponse
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.request.get
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import javax.inject.Inject
+
+class TermService @Inject constructor(
+    private val client: HttpClient,
+) {
+    suspend fun getTerms(): BasicResponse<TermsResponse> {
+        return client.get("/api/terms").body()
+    }
+
+    suspend fun agreeTerms(request: TermAgreementsRequest): BasicNullableResponse<Unit> {
+        return client.post("/api/terms/agreements") {
+            setBody(request)
+        }.body()
+    }
+}

core/data/src/main/java/com/neki/android/core/data/remote/di/NetworkModule.kt

@@ -51,6 +51,7 @@ internal object NetworkModule {
     val sendWithoutAuthUrls = listOf(
         "/api/auth/kakao/login",
         "/api/auth/refresh",
+        "/api/terms",
     )
 
     private val json = Json {

core/data/src/main/java/com/neki/android/core/data/remote/model/request/TermAgreementsRequest.kt

@@ -0,0 +1,15 @@
+package com.neki.android.core.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermAgreementsRequest(
+    @SerialName("agreements") val agreements: List<Agreement>,
+) {
+    @Serializable
+    data class Agreement(
+        @SerialName("termId") val termId: Long,
+        @SerialName("agreed") val agreed: Boolean,
+    )
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/response/TermResponse.kt

@@ -0,0 +1,28 @@
+package com.neki.android.core.data.remote.model.response
+
+import com.neki.android.core.model.Term
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TermsResponse(
+    @SerialName("terms") val terms: List<TermResponse> = emptyList(),
+) {
+    @Serializable
+    data class TermResponse(
+        @SerialName("id") val id: Long = 0L,
+        @SerialName("termType") val termType: String = "",
+        @SerialName("title") val title: String = "",
+        @SerialName("url") val url: String = "",
+        @SerialName("isRequired") val isRequired: Boolean = false,
+    ) {
+        internal fun toModel(): Term = Term(
+            id = id,
+            title = title,
+            url = url,
+            isRequired = isRequired,
+        )
+    }
+
+    fun toModels(): List<Term> = terms.map { it.toModel() }
+}

core/data/src/main/java/com/neki/android/core/data/remote/model/response/UserInfoResponse.kt

@@ -6,16 +6,18 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class UserInfoResponse(
-    @SerialName("userId") val userId: Long,
-    @SerialName("name") val name: String,
-    @SerialName("email") val email: String,
-    @SerialName("profileImageUrl") val profileImageUrl: String,
-    @SerialName("providerType") val providerType: String,
+    @SerialName("userId") val userId: Long = 0L,
+    @SerialName("name") val name: String = "",
+    @SerialName("email") val email: String = "",
+    @SerialName("profileImageUrl") val profileImageUrl: String = "",
+    @SerialName("providerType") val providerType: String = "",
+    @SerialName("agreeTerms") val agreeTerms: Boolean = false,
 ) {
     fun toModel() = UserInfo(
         id = userId,
         nickname = name,
         profileImageUrl = profileImageUrl,
         loginType = providerType,
+        isRequiredTermsAgreed = agreeTerms,
     )
 }

core/data/src/main/java/com/neki/android/core/data/repository/di/RepositoryModule.kt

@@ -7,6 +7,7 @@ import com.neki.android.core.data.repository.impl.FolderRepositoryImpl
 import com.neki.android.core.data.repository.impl.MapRepositoryImpl
 import com.neki.android.core.data.repository.impl.PhotoRepositoryImpl
 import com.neki.android.core.data.repository.impl.PoseRepositoryImpl
+import com.neki.android.core.data.repository.impl.TermRepositoryImpl
 import com.neki.android.core.data.repository.impl.TokenRepositoryImpl
 import com.neki.android.core.data.repository.impl.UserRepositoryImpl
 import com.neki.android.core.dataapi.auth.AuthEventManager
@@ -16,6 +17,7 @@ import com.neki.android.core.dataapi.repository.MediaUploadRepository
 import com.neki.android.core.dataapi.repository.MapRepository
 import com.neki.android.core.dataapi.repository.PhotoRepository
 import com.neki.android.core.dataapi.repository.PoseRepository
+import com.neki.android.core.dataapi.repository.TermRepository
 import com.neki.android.core.dataapi.repository.TokenRepository
 import com.neki.android.core.dataapi.repository.UserRepository
 import dagger.Binds
@@ -81,4 +83,10 @@ internal interface RepositoryModule {
     fun bindPoseRepositoryImpl(
         poseRepositoryImpl: PoseRepositoryImpl,
     ): PoseRepository
+
+    @Binds
+    @Singleton
+    fun bindTermRepositoryImpl(
+        termRepositoryImpl: TermRepositoryImpl,
+    ): TermRepository
 }

core/data/src/main/java/com/neki/android/core/data/repository/impl/TermRepositoryImpl.kt

@@ -0,0 +1,25 @@
+package com.neki.android.core.data.repository.impl
+
+import com.neki.android.core.data.remote.api.TermService
+import com.neki.android.core.data.remote.model.request.TermAgreementsRequest
+import com.neki.android.core.data.util.runSuspendCatching
+import com.neki.android.core.dataapi.repository.TermRepository
+import com.neki.android.core.model.Term
+import javax.inject.Inject
+
+class TermRepositoryImpl @Inject constructor(
+    private val termService: TermService,
+) : TermRepository {
+    override suspend fun getTerms(): Result<List<Term>> = runSuspendCatching {
+        termService.getTerms().data.toModels()
+    }
+
+    override suspend fun agreeTerms(termIds: List<Long>): Result<Unit> = runSuspendCatching {
+        val request = TermAgreementsRequest(
+            agreements = termIds.map { termId ->
+                TermAgreementsRequest.Agreement(termId = termId, agreed = true)
+            },
+        )
+        termService.agreeTerms(request).data
+    }
+}