[REFACTOR] entity 추가, dataStore 추가

app/build.gradle

@@ -108,6 +108,10 @@ dependencies {
     implementation "com.kakao.sdk:v2-share:2.15.0" // 메시지(카카오톡 공유)
     //EncryptedSharedPreference
     implementation "androidx.security:security-crypto-ktx:1.1.0-alpha06"
+    // dataStore
+    implementation "androidx.datastore:datastore-preferences:1.0.0"
+
+
 }
 // hilt dependency와 함께 추가
 kapt {

app/src/main/java/com/puzzling/puzzlingaos/data/datasource/local/TokenDataSource.kt

@@ -0,0 +1,41 @@
+package com.puzzling.puzzlingaos.data.datasource.local
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.datastore.core.Serializer
+import com.puzzling.puzzlingaos.data.entity.Token
+import com.puzzling.puzzlingaos.data.service.CryptoService
+import kotlinx.serialization.json.Json
+import org.apache.commons.lang3.SerializationException
+import java.io.InputStream
+import java.io.OutputStream
+import javax.inject.Inject
+
+@RequiresApi(Build.VERSION_CODES.M)
+class TokenDataSource @Inject constructor(private val cryptoService: CryptoService) : Serializer<Token> {
+    override val defaultValue: Token
+        get() = Token()
+
+    override suspend fun readFrom(input: InputStream): Token {
+        val decryptedBytes = cryptoService.decrypt(input)
+        return try {
+            Json.decodeFromString(
+                deserializer = Token.serializer(),
+                string = decryptedBytes.decodeToString(),
+            )
+        } catch (e: SerializationException) {
+            e.printStackTrace()
+            defaultValue
+        }
+    }
+
+    override suspend fun writeTo(t: Token, output: OutputStream) {
+        cryptoService.encrypt(
+            bytes = Json.encodeToString(
+                serializer = Token.serializer(),
+                value = t,
+            ).encodeToByteArray(),
+            outputStream = output,
+        )
+    }
+}

app/src/main/java/com/puzzling/puzzlingaos/data/datasource/remote/ProjectDataSource.kt

@@ -1,6 +1,6 @@
 package com.puzzling.puzzlingaos.data.datasource.remote
 
-import com.puzzling.puzzlingaos.data.model.request.RequestInvitationCode
+import com.puzzling.puzzlingaos.data.model.request.RequestJoinProject
 import com.puzzling.puzzlingaos.data.model.request.RequestProjectRegisterDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseInvitationCodeDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseJoinProjectDto
@@ -15,7 +15,7 @@ interface ProjectDataSource {
 
     suspend fun joinProject(
         memberId: Int,
-        request: RequestInvitationCode,
+        request: RequestJoinProject,
     ): ResponseJoinProjectDto
 
     suspend fun isValidInvitationCode(

app/src/main/java/com/puzzling/puzzlingaos/data/datasource/remote/impl/ProjectDataSourceImpl.kt

@@ -1,7 +1,7 @@
 package com.puzzling.puzzlingaos.data.datasource.remote.impl
 
 import com.puzzling.puzzlingaos.data.datasource.remote.ProjectDataSource
-import com.puzzling.puzzlingaos.data.model.request.RequestInvitationCode
+import com.puzzling.puzzlingaos.data.model.request.RequestJoinProject
 import com.puzzling.puzzlingaos.data.model.request.RequestProjectRegisterDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseInvitationCodeDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseJoinProjectDto
@@ -22,7 +22,7 @@ class ProjectDataSourceImpl @Inject constructor(
 
     override suspend fun joinProject(
         memberId: Int,
-        request: RequestInvitationCode,
+        request: RequestJoinProject,
     ): ResponseJoinProjectDto = apiService.joinProject(memberId, request)
 
     override suspend fun isValidInvitationCode(invitationCode: String): ResponseInvitationCodeDto =

app/src/main/java/com/puzzling/puzzlingaos/data/entity/Token.kt

@@ -0,0 +1,8 @@
+package com.puzzling.puzzlingaos.data.entity
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Token(
+    val accessToken: String? = null,
+)

app/src/main/java/com/puzzling/puzzlingaos/data/model/request/RequestInvitationCode.kt → app/src/main/java/com/puzzling/puzzlingaos/data/model/request/RequestJoinProject.kt

@@ -1,14 +1,21 @@
 package com.puzzling.puzzlingaos.data.model.request
 
+import com.puzzling.puzzlingaos.domain.entity.JoinProjectInfo
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class RequestInvitationCode(
+data class RequestJoinProject(
     @SerialName("projectId")
     val projectId: Int,
     @SerialName("memberProjectNickname")
     val memberProjectNickname: String,
     @SerialName("memberProjectRole")
     val memberProjectRole: String,
 )
+
+fun JoinProjectInfo.toRequestJoinProjectDto() = RequestJoinProject(
+    projectId,
+    memberProjectNickname,
+    memberProjectRole,
+)

app/src/main/java/com/puzzling/puzzlingaos/data/model/response/ResponseDetailRetroDto.kt

@@ -1,5 +1,6 @@
 package com.puzzling.puzzlingaos.data.model.response
 
+import com.puzzling.puzzlingaos.domain.entity.DetailRetro
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,7 +13,7 @@ data class ResponseDetailRetroDto(
     @SerialName("message")
     val message: String,
     @SerialName("data")
-    val data: Data?,
+    val data: Data,
 ) {
     @Serializable
     data class Data(
@@ -42,5 +43,18 @@ data class ResponseDetailRetroDto(
                 val content: String,
             )
         }
+
+        fun toDetailRetro() = reviews.map { reviews ->
+            DetailRetro(
+                reviewId = reviews.reviewId,
+                reviewDay = reviews.reviewDay,
+                reviewDate = reviews.reviewDate,
+                reviewTemplateId = reviews.reviewTemplateId,
+                content = reviews.contents?.map { content ->
+                    DetailRetro.Content(content.title, content.content)
+                },
+
+            )
+        }
     }
 }

app/src/main/java/com/puzzling/puzzlingaos/data/model/response/ResponseInvitationCodeDto.kt

@@ -1,5 +1,6 @@
 package com.puzzling.puzzlingaos.data.model.response
 
+import com.puzzling.puzzlingaos.domain.entity.InvitationCode
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,13 +13,15 @@ data class ResponseInvitationCodeDto(
     @SerialName("message")
     val message: String,
     @SerialName("data")
-    val data: InvitationCodeData?,
+    val data: InvitationCodeData,
 ) {
     @Serializable
     data class InvitationCodeData(
         @SerialName("projectId")
         val projectId: Int,
         @SerialName("projectName")
         val projectName: String,
-    )
+    ) {
+        fun toInvitationCode() = InvitationCode(projectId, projectName)
+    }
 }

app/src/main/java/com/puzzling/puzzlingaos/data/model/response/ResponseMyRetroListDto.kt

@@ -1,5 +1,6 @@
 package com.puzzling.puzzlingaos.data.model.response
 
+import com.puzzling.puzzlingaos.domain.entity.ProjectReview
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,7 +13,7 @@ data class ResponseMyRetroListDto(
     @SerialName("message")
     val message: String,
     @SerialName("data")
-    val data: List<ReviewData>?,
+    val data: List<ReviewData>,
 ) {
     @Serializable
     data class ReviewData(
@@ -23,5 +24,12 @@ data class ResponseMyRetroListDto(
         @SerialName("contents")
         val contents: String,
     )
-}
 
+    fun toProjectReview() = data.map { reviewData ->
+        ProjectReview(
+            reviewData.reviewId,
+            reviewData.reviewDate,
+            reviewData.contents,
+        )
+    }
+}

app/src/main/java/com/puzzling/puzzlingaos/data/model/response/ResponseProjectRetroWeekDto.kt

@@ -1,5 +1,6 @@
 package com.puzzling.puzzlingaos.data.model.response
 
+import com.puzzling.puzzlingaos.domain.entity.ReviewCycle
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -12,13 +13,15 @@ data class ResponseProjectRetroWeekDto(
     @SerialName("message")
     val message: String,
     @SerialName("data")
-    val data: ProjectCycle?,
+    val data: ProjectCycle,
 ) {
     @Serializable
     data class ProjectCycle(
         @SerialName("projectName")
         val projectName: String,
         @SerialName("projectReviewCycle")
         val projectReviewCycle: String,
-    )
+    ) {
+        fun toReviewCycle() = ReviewCycle(projectName, projectReviewCycle)
+    }
 }

app/src/main/java/com/puzzling/puzzlingaos/data/repository/MyPageRepositoryImpl.kt

@@ -1,23 +1,32 @@
 package com.puzzling.puzzlingaos.data.repository
 
 import com.puzzling.puzzlingaos.data.datasource.remote.MyPageDataSource
-import com.puzzling.puzzlingaos.data.model.response.ResponseDetailRetroDto
-import com.puzzling.puzzlingaos.data.model.response.ResponseMyRetroListDto
+import com.puzzling.puzzlingaos.domain.entity.DetailRetro
+import com.puzzling.puzzlingaos.domain.entity.ProjectReview
 import com.puzzling.puzzlingaos.domain.repository.MyPageRepository
 import javax.inject.Inject
 
 class MyPageRepositoryImpl @Inject constructor(private val myPageDataSource: MyPageDataSource) :
     MyPageRepository {
-    override suspend fun getMyProjectReview(memberId: Int, projectId: Int): ResponseMyRetroListDto {
-        return myPageDataSource.getMyProjectReview(memberId, projectId)
-    }
+    override suspend fun getMyProjectReview(
+        memberId: Int,
+        projectId: Int,
+    ): Result<List<ProjectReview>> =
+        runCatching {
+            myPageDataSource.getMyProjectReview(memberId, projectId).toProjectReview()
+        }
 
     override suspend fun getMyDetailReview(
         memberId: Int,
         projectId: Int,
         startDate: String,
         endDate: String,
-    ): ResponseDetailRetroDto {
-        return myPageDataSource.getMyDetailReview(memberId, projectId, startDate, endDate)
+    ): Result<List<DetailRetro>> = runCatching {
+        myPageDataSource.getMyDetailReview(
+            memberId,
+            projectId,
+            startDate,
+            endDate,
+        ).data.toDetailRetro()
     }
 }

app/src/main/java/com/puzzling/puzzlingaos/data/repository/ProjectRepositoryImpl.kt

@@ -2,12 +2,13 @@ package com.puzzling.puzzlingaos.data.repository
 
 import android.util.Log
 import com.puzzling.puzzlingaos.data.datasource.remote.ProjectDataSource
-import com.puzzling.puzzlingaos.data.model.request.RequestInvitationCode
 import com.puzzling.puzzlingaos.data.model.request.RequestProjectRegisterDto
-import com.puzzling.puzzlingaos.data.model.response.ResponseInvitationCodeDto
+import com.puzzling.puzzlingaos.data.model.request.toRequestJoinProjectDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseJoinProjectDto
 import com.puzzling.puzzlingaos.data.model.response.ResponseProjectRegisterDto
-import com.puzzling.puzzlingaos.data.model.response.ResponseProjectRetroWeekDto
+import com.puzzling.puzzlingaos.domain.entity.InvitationCode
+import com.puzzling.puzzlingaos.domain.entity.JoinProjectInfo
+import com.puzzling.puzzlingaos.domain.entity.ReviewCycle
 import com.puzzling.puzzlingaos.domain.repository.ProjectRepository
 import javax.inject.Inject
 
@@ -28,16 +29,17 @@ class ProjectRepositoryImpl @Inject constructor(
 
     override suspend fun joinProject(
         memberId: Int,
-        request: RequestInvitationCode,
-    ): ResponseJoinProjectDto {
-        return projectDataSource.joinProject(memberId, request)
+        request: JoinProjectInfo,
+    ): Result<ResponseJoinProjectDto> = runCatching {
+        projectDataSource.joinProject(memberId, request.toRequestJoinProjectDto())
     }
 
-    override suspend fun isValidInvitationCode(invitationCode: String): ResponseInvitationCodeDto {
-        return projectDataSource.isValidInvitationCode(invitationCode)
-    }
+    override suspend fun isValidInvitationCode(invitationCode: String): Result<InvitationCode> =
+        runCatching {
+            projectDataSource.isValidInvitationCode(invitationCode).data.toInvitationCode()
+        }
 
-    override suspend fun getProjectWeekCycle(projectId: Int): ResponseProjectRetroWeekDto {
-        return projectDataSource.getProjectWeekCycle(projectId)
+    override suspend fun getProjectWeekCycle(projectId: Int): Result<ReviewCycle> = runCatching {
+        projectDataSource.getProjectWeekCycle(projectId).data.toReviewCycle()
     }
 }

app/src/main/java/com/puzzling/puzzlingaos/data/repository/TokenRepositoryImpl.kt

@@ -0,0 +1,16 @@
+package com.puzzling.puzzlingaos.data.repository
+
+import androidx.datastore.core.DataStore
+import com.puzzling.puzzlingaos.data.entity.Token
+import com.puzzling.puzzlingaos.domain.repository.TokenRepository
+import kotlinx.coroutines.flow.first
+import javax.inject.Inject
+
+class TokenRepositoryImpl @Inject constructor(private val dataStore: DataStore<Token>) :
+    TokenRepository {
+    override suspend fun setToken(token: String) {
+        dataStore.updateData { Token(token) }
+    }
+
+    override suspend fun getToken(): Token = dataStore.data.first()
+}