Merge pull request #150 from SOLPLY/feature/#149-mypage-withdraw

[Feature/#149] 마이페이지 구현 완료

Author: ImHyungsuk

app/build.gradle.kts

@@ -59,6 +59,7 @@ dependencies {
     implementation(projects.data.search)
     implementation(projects.local.main)
     implementation(projects.local.oauth)
+    implementation(projects.local.mypage)
     implementation(projects.local.place)
     implementation(projects.remote.oauth)
     implementation(projects.remote.onboarding)

core/designsystem/src/main/java/com/teamsolply/solply/designsystem/component/button/SolplyButton.kt

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text

data/mypage/build.gradle.kts

@@ -7,5 +7,6 @@ android {
 }
 
 dependencies {
+    implementation(projects.core.datastore)
     implementation(projects.domain.mypage)
 }

data/mypage/src/main/java/com/teamsolply/solply/mypage/datasource/MypageLocalDataSource.kt

@@ -0,0 +1,5 @@
+package com.teamsolply.solply.mypage.datasource
+
+interface MypageLocalDataSource {
+    suspend fun saveAutoSignIn(autoSignIn: Boolean)
+}

data/mypage/src/main/java/com/teamsolply/solply/mypage/datasource/MypageRemoteDataSource.kt

@@ -1,13 +1,19 @@
 package com.teamsolply.solply.mypage.datasource
 
+import com.teamsolply.solply.mypage.dto.request.DeleteUserRequestDto
 import com.teamsolply.solply.mypage.dto.response.GetPersonaListResponseDto
 import com.teamsolply.solply.mypage.dto.response.GetUserInfoResponseDto
+import com.teamsolply.solply.mypage.dto.response.GetWithdrawListResponseDto
 import com.teamsolply.solply.mypage.dto.response.NicknameDuplicateResponseDto
 import com.teamsolply.solply.mypage.dto.response.PlaceListResponseDto
+import com.teamsolply.solply.network.model.NullableBaseResponse
 
 interface MypageRemoteDataSource {
     suspend fun getUserInfo(): GetUserInfoResponseDto
     suspend fun getPlaceList(townId: Long): PlaceListResponseDto
     suspend fun getPersonaList(): GetPersonaListResponseDto
     suspend fun checkNicknameDuplicate(nickname: String): NicknameDuplicateResponseDto
+    suspend fun getWithdrawList(): GetWithdrawListResponseDto
+    suspend fun deleteUser(deleteUserRequestDto: DeleteUserRequestDto): NullableBaseResponse<Unit>
+    suspend fun getReportPlaceList(userId: Long): PlaceListResponseDto
 }

data/mypage/src/main/java/com/teamsolply/solply/mypage/dto/request/DeleteUserRequestDto.kt

@@ -0,0 +1,14 @@
+package com.teamsolply.solply.mypage.dto.request
+
+import com.teamsolply.solply.mypage.model.WithdrawType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class DeleteUserRequestDto(
+    @SerialName("withdrawReason")
+    val withdrawType: WithdrawType,
+
+    @SerialName("reasonText")
+    val reasonText: String
+)

data/mypage/src/main/java/com/teamsolply/solply/mypage/dto/response/GetWithdrawListResponseDto.kt

@@ -0,0 +1,20 @@
+package com.teamsolply.solply.mypage.dto.response
+
+import com.teamsolply.solply.mypage.model.WithdrawType
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GetWithdrawListResponseDto(
+    @SerialName("description")
+    val withdrawList: List<WithdrawResponseDto>
+)
+
+@Serializable
+data class WithdrawResponseDto(
+    @SerialName("withdrawType")
+    val withdrawType: WithdrawType,
+
+    @SerialName("description")
+    val description: String
+)

data/mypage/src/main/java/com/teamsolply/solply/mypage/dto/response/PlaceListResponseDto.kt

@@ -19,6 +19,9 @@ data class PlaceResponseDto(
     @SerialName("placeName")
     val placeName: String,
 
+    @SerialName("townId")
+    val townId: Long,
+
     @SerialName("thumbnailImageUrl")
     val imageUrl: String,
 

data/mypage/src/main/java/com/teamsolply/solply/mypage/repository/MypageRepositoryImpl.kt

@@ -1,15 +1,19 @@
 package com.teamsolply.solply.mypage.repository
 
-import android.util.Log
+import com.teamsolply.solply.mypage.datasource.MypageLocalDataSource
 import com.teamsolply.solply.mypage.datasource.MypageRemoteDataSource
+import com.teamsolply.solply.mypage.dto.request.DeleteUserRequestDto
 import com.teamsolply.solply.mypage.dto.response.toDomain
 import com.teamsolply.solply.mypage.model.PersonaEntity
 import com.teamsolply.solply.mypage.model.PlaceInfoEntity
 import com.teamsolply.solply.mypage.model.UserInfo
+import com.teamsolply.solply.mypage.model.WithdrawEntity
+import com.teamsolply.solply.mypage.model.WithdrawType
 import javax.inject.Inject
 
 class MypageRepositoryImpl @Inject constructor(
-    private val mypageRemoteDataSource: MypageRemoteDataSource
+    private val mypageRemoteDataSource: MypageRemoteDataSource,
+    private val mypageLocalDataSource: MypageLocalDataSource
 ) : MypageRepository {
     override suspend fun getUserInfo(): Result<UserInfo> = runCatching {
         mypageRemoteDataSource.getUserInfo()
@@ -26,15 +30,31 @@ class MypageRepositoryImpl @Inject constructor(
                 placeName = place.placeName,
                 placeType = place.tag,
                 imageUrls = place.imageUrl,
-                isSaved = place.isSaved
+                isSaved = place.isSaved,
+                townId = place.townId
             )
         }
     }
 
+    override suspend fun getReportPlaceList(userId: Long): Result<List<PlaceInfoEntity>> =
+        runCatching {
+            mypageRemoteDataSource.getReportPlaceList(userId = userId).placeList
+        }.mapCatching { placeList ->
+            placeList.map { place ->
+                PlaceInfoEntity(
+                    placeId = place.placeId,
+                    placeName = place.placeName,
+                    placeType = place.tag,
+                    imageUrls = place.imageUrl,
+                    isSaved = place.isSaved,
+                    townId = place.townId
+                )
+            }
+        }
+
     override suspend fun getPersonaList(): Result<List<PersonaEntity>> = runCatching {
         mypageRemoteDataSource.getPersonaList().personaDtoList
     }.mapCatching { personaList ->
-        Log.d("persona: ", "repo impl start")
         personaList.map { persona ->
             PersonaEntity(
                 personaType = persona.personaType,
@@ -46,4 +66,30 @@ class MypageRepositoryImpl @Inject constructor(
     override suspend fun checkNicknameDuplicate(nickname: String): Result<Boolean> = runCatching {
         mypageRemoteDataSource.checkNicknameDuplicate(nickname = nickname).isDuplicated
     }
+
+    override suspend fun getWithdrawList(): Result<List<WithdrawEntity>> = runCatching {
+        mypageRemoteDataSource.getWithdrawList().withdrawList
+    }.mapCatching { list ->
+        list.map { reason ->
+            WithdrawEntity(
+                withdrawType = reason.withdrawType,
+                description = reason.description
+            )
+        }
+    }
+
+    override suspend fun deleteUser(withdrawType: WithdrawType, reason: String): Result<Unit> =
+        runCatching {
+            mypageRemoteDataSource.deleteUser(
+                DeleteUserRequestDto(
+                    withdrawType = withdrawType,
+                    reasonText = reason
+                )
+            )
+        }
+
+    override suspend fun saveAutoSignIn(autoSignIn: Boolean): Result<Unit> =
+        runCatching {
+            mypageLocalDataSource.saveAutoSignIn(autoSignIn)
+        }
 }

domain/mypage/build.gradle.kts

@@ -1,8 +1,10 @@
 plugins {
     alias(libs.plugins.solply.java.library)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 dependencies {
     implementation(projects.core.model)
     implementation(libs.bundles.coroutine)
+    implementation(libs.kotlinx.serialization.json)
 }