Merge pull request #18 from wsi1212/feature/detail

상세 페이지 만들기
Team-B1ND · Jan 26, 2024 · f16792c · f16792c
2 parents 3a6eec5 + 0e44f53
commit f16792c
Show file tree

Hide file tree

Showing 105 changed files with 1,755 additions and 384 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.../mentomenv2/data/remote/AuthDataSource.kt → ...tomenv2/data/datasource/AuthDataSource.kt b/.../mentomenv2/data/remote/AuthDataSource.kt → ...tomenv2/data/datasource/AuthDataSource.kt
@@ -1,8 +1,11 @@
-package kr.hs.dgsw.mentomenv2.data.remote
+package kr.hs.dgsw.mentomenv2.data.datasource
 
 import kotlinx.coroutines.flow.Flow
+import kr.hs.dgsw.mentomenv2.data.response.TokenResponse
 import kr.hs.dgsw.mentomenv2.domain.model.Token
 
 interface AuthDataSource {
     fun signIn(code: String): Flow<Token>
+
+    fun getAccessToken(): Flow<TokenResponse>
 }
diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/CommentDataSource.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/CommentDataSource.kt
@@ -0,0 +1,16 @@
+package kr.hs.dgsw.mentomenv2.data.datasource
+
+import kotlinx.coroutines.flow.Flow
+import kr.hs.dgsw.mentomenv2.data.request.CommentSubmitRequest
+import kr.hs.dgsw.mentomenv2.data.request.CommentUpdateRequest
+import kr.hs.dgsw.mentomenv2.domain.model.Comment
+
+interface CommentDataSource {
+    fun getCommentList(postId: Int): Flow<List<Comment>>
+
+    fun submitComment(commentSubmitRequest: CommentSubmitRequest): Flow<Unit>
+
+    fun updateComment(commentUpdateRequest: CommentUpdateRequest): Flow<Unit>
+
+    fun deleteComment(commentId: Int): Flow<Unit>
+}
diff --git a/...omenv2/data/remote/DataStoreDataSource.kt → ...v2/data/datasource/DataStoreDataSource.kt b/...omenv2/data/remote/DataStoreDataSource.kt → ...v2/data/datasource/DataStoreDataSource.kt
@@ -1,4 +1,4 @@
-package kr.hs.dgsw.mentomenv2.data.remote
+package kr.hs.dgsw.mentomenv2.data.datasource
 
 import kotlinx.coroutines.flow.Flow
 import kr.hs.dgsw.mentomenv2.domain.model.Token

diff --git a/.../mentomenv2/data/remote/FileDataSource.kt → ...tomenv2/data/datasource/FileDataSource.kt b/.../mentomenv2/data/remote/FileDataSource.kt → ...tomenv2/data/datasource/FileDataSource.kt
@@ -1,9 +1,9 @@
-package kr.hs.dgsw.mentomenv2.data.remote
+package kr.hs.dgsw.mentomenv2.data.datasource
 
 import kotlinx.coroutines.flow.Flow
-import kr.hs.dgsw.mentomenv2.data.response.ImgUrlResponseDto
+import kr.hs.dgsw.mentomenv2.data.response.ImgUrlResponse
 import okhttp3.MultipartBody
 
 interface FileDataSource {
-    fun postFile(files: List<MultipartBody.Part>): Flow<List<ImgUrlResponseDto>>
+    fun postFile(files: List<MultipartBody.Part>): Flow<List<ImgUrlResponse>>
 }
diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/MyDataSource.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/MyDataSource.kt
@@ -0,0 +1,11 @@
+package kr.hs.dgsw.mentomenv2.data.datasource
+
+import kotlinx.coroutines.flow.Flow
+import kr.hs.dgsw.mentomenv2.domain.model.Post
+import kr.hs.dgsw.mentomenv2.domain.model.User
+
+interface MyDataSource {
+    fun getMyInfo(): Flow<User>
+
+    fun getMyPost(): Flow<List<Post>>
+}
diff --git a/.../mentomenv2/data/remote/PostDataSource.kt → ...tomenv2/data/datasource/PostDataSource.kt b/.../mentomenv2/data/remote/PostDataSource.kt → ...tomenv2/data/datasource/PostDataSource.kt
@@ -1,4 +1,4 @@
-package kr.hs.dgsw.mentomenv2.data.remote
+package kr.hs.dgsw.mentomenv2.data.datasource
 
 import kotlinx.coroutines.flow.Flow
 import kr.hs.dgsw.mentomenv2.domain.model.Post

diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/remote/AuthDataSourceImpl.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasource/remote/AuthDataSourceImpl.kt
diff --git a/...tasource/cache/DataStoreDataSourceImpl.kt → ...urceimpl/cache/DataStoreDataSourceImpl.kt b/...tasource/cache/DataStoreDataSourceImpl.kt → ...urceimpl/cache/DataStoreDataSourceImpl.kt
@@ -1,4 +1,4 @@
-package kr.hs.dgsw.mentomenv2.data.datasource.cache
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.cache
 
 import android.util.Log
 import androidx.datastore.core.DataStore
@@ -9,7 +9,8 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
-import kr.hs.dgsw.mentomenv2.data.remote.DataStoreDataSource
+import kr.hs.dgsw.mentomenv2.data.datasource.DataStoreDataSource
+import kr.hs.dgsw.mentomenv2.domain.exception.MenToMenException
 import kr.hs.dgsw.mentomenv2.domain.model.Token
 import javax.inject.Inject
 
@@ -43,7 +44,11 @@ class DataStoreDataSourceImpl
                     "DataStoreDataSourceImpl",
                     "Token: ${accessToken.first()}, ${refreshToken.first()} 토큰 호출 성공",
                 )
-                emit(Token(accessToken.first(), refreshToken.first()))
+                if (accessToken.first() == "" || refreshToken.first() == "") {
+                    throw MenToMenException("토큰이 없습니다.")
+                } else {
+                    emit(Token(accessToken.first(), refreshToken.first()))
+                }
             }
 
         override fun getData(

diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/AuthDataSourceImpl.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/AuthDataSourceImpl.kt
@@ -0,0 +1,44 @@
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote
+
+import android.util.Log
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kr.hs.dgsw.mentomenv2.data.datasource.AuthDataSource
+import kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote.base.RetrofitDataSourceImpl
+import kr.hs.dgsw.mentomenv2.data.request.DAuthClientRequest
+import kr.hs.dgsw.mentomenv2.data.response.TokenResponse
+import kr.hs.dgsw.mentomenv2.data.service.AuthService
+import kr.hs.dgsw.mentomenv2.domain.exception.MenToMenException
+import kr.hs.dgsw.mentomenv2.domain.model.Token
+import kr.hs.dgsw.mentomenv2.domain.usecase.token.GetTokenUseCase
+import javax.inject.Inject
+
+class AuthDataSourceImpl
+    @Inject
+    constructor(
+        getTokenUseCase: GetTokenUseCase,
+    ) : RetrofitDataSourceImpl<AuthService>(getTokenUseCase), AuthDataSource {
+        override val api: AuthService
+            get() = createApi(AuthService::class.java)
+
+        override fun signIn(code: String): Flow<Token> {
+            Log.d("AuthDataSourceImpl", "signIn out return flow: $code")
+            return flow {
+                emit(api.signIn(DAuthClientRequest(code)).data)
+            }
+        }
+
+        override fun getAccessToken(): Flow<TokenResponse> {
+            return flow {
+                val response = api.refreshToken().execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: TokenResponse())
+                } else {
+                    throw MenToMenException("토큰을 갱신하는데 실패했습니다.")
+                }
+            }.flowOn(Dispatchers.IO)
+        }
+    }
diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/CommentDataSourceImpl.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/CommentDataSourceImpl.kt
@@ -0,0 +1,67 @@
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kr.hs.dgsw.mentomenv2.data.datasource.CommentDataSource
+import kr.hs.dgsw.mentomenv2.data.request.CommentSubmitRequest
+import kr.hs.dgsw.mentomenv2.data.request.CommentUpdateRequest
+import kr.hs.dgsw.mentomenv2.data.service.CommentService
+import kr.hs.dgsw.mentomenv2.domain.exception.MenToMenException
+import kr.hs.dgsw.mentomenv2.domain.model.Comment
+import javax.inject.Inject
+
+class CommentDataSourceImpl
+    @Inject
+    constructor(
+        private val api: CommentService,
+    ) : CommentDataSource {
+        override fun getCommentList(postId: Int): Flow<List<Comment>> {
+            return flow {
+                val response = api.getCommentList(postId).execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: emptyList())
+                } else {
+                    throw MenToMenException("댓글 목록을 불러오는데 실패했습니다.")
+                }
+            }.flowOn(Dispatchers.IO)
+        }
+
+        override fun submitComment(commentSubmitRequest: CommentSubmitRequest): Flow<Unit> {
+            return flow {
+                val response = api.submitComment(commentSubmitRequest).execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: Unit)
+                } else {
+                    throw MenToMenException("댓글을 작성하는데 실패했습니다.")
+                }
+            }.flowOn(Dispatchers.IO)
+        }
+
+        override fun updateComment(commentUpdateRequest: CommentUpdateRequest): Flow<Unit> {
+            return flow {
+                val response = api.updateComment(commentUpdateRequest).execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: Unit)
+                } else {
+                    throw MenToMenException("댓글을 수정하는데 실패했습니다.")
+                }
+            }.flowOn(Dispatchers.IO)
+        }
+
+        override fun deleteComment(commentId: Int): Flow<Unit> {
+            return flow {
+                val response = api.deleteComment(commentId).execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: Unit)
+                } else {
+                    throw MenToMenException("댓글을 삭제하는데 실패했습니다.")
+                }
+            }.flowOn(Dispatchers.IO)
+        }
+    }
diff --git a/...a/datasource/remote/FileDataSourceImpl.kt → ...tasourceimpl/remote/FileDataSourceImpl.kt b/...a/datasource/remote/FileDataSourceImpl.kt → ...tasourceimpl/remote/FileDataSourceImpl.kt
@@ -1,11 +1,11 @@
-package kr.hs.dgsw.mentomenv2.data.datasource.remote
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote
 
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import kr.hs.dgsw.mentomenv2.data.remote.FileDataSource
-import kr.hs.dgsw.mentomenv2.data.response.ImgUrlResponseDto
+import kr.hs.dgsw.mentomenv2.data.datasource.FileDataSource
+import kr.hs.dgsw.mentomenv2.data.response.ImgUrlResponse
 import kr.hs.dgsw.mentomenv2.data.service.FileService
 import okhttp3.MultipartBody
 import javax.inject.Inject
@@ -15,7 +15,7 @@ class FileDataSourceImpl
     constructor(
         private val api: FileService,
     ) : FileDataSource {
-        override fun postFile(files: List<MultipartBody.Part>): Flow<List<ImgUrlResponseDto>> {
+        override fun postFile(files: List<MultipartBody.Part>): Flow<List<ImgUrlResponse>> {
             return flow {
                 val response = api.postFile(files).execute()
 

diff --git a/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/MyDataSourceImpl.kt b/data/src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/MyDataSourceImpl.kt
@@ -0,0 +1,53 @@
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote
+
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import kr.hs.dgsw.mentomenv2.data.datasource.MyDataSource
+import kr.hs.dgsw.mentomenv2.data.service.MyService
+import kr.hs.dgsw.mentomenv2.domain.model.Post
+import kr.hs.dgsw.mentomenv2.domain.model.StdInfo
+import kr.hs.dgsw.mentomenv2.domain.model.User
+import retrofit2.HttpException
+import javax.inject.Inject
+
+class MyDataSourceImpl
+    @Inject
+    constructor(
+        private val myApi: MyService,
+    ) : MyDataSource {
+        override fun getMyInfo(): Flow<User> =
+            flow {
+                val response = myApi.getUserInfo().execute()
+                if (response.isSuccessful) {
+                    if (response.body()?.data?.profileImage == null) {
+                        emit(
+                            User(
+                                email = response.body()?.data?.email ?: "",
+                                name = response.body()?.data?.name ?: "",
+                                profileImage = "",
+                                roles = response.body()?.data?.roles ?: "",
+                                stdInfo = response.body()?.data?.stdInfo ?: StdInfo(0, 0, 0),
+                                userId = response.body()?.data?.userId ?: 0,
+                            ),
+                        )
+                    } else {
+                        emit(response.body()?.data ?: User())
+                    }
+                } else {
+                    throw HttpException(response)
+                }
+            }.flowOn(Dispatchers.IO)
+
+        override fun getMyPost(): Flow<List<Post>> =
+            flow {
+                val response = myApi.getMyPost().execute()
+
+                if (response.isSuccessful) {
+                    emit(response.body()?.data ?: emptyList())
+                } else {
+                    throw HttpException(response)
+                }
+            }.flowOn(Dispatchers.IO)
+    }
diff --git a/...a/datasource/remote/PostDataSourceImpl.kt → ...tasourceimpl/remote/PostDataSourceImpl.kt b/...a/datasource/remote/PostDataSourceImpl.kt → ...tasourceimpl/remote/PostDataSourceImpl.kt
@@ -1,8 +1,8 @@
-package kr.hs.dgsw.mentomenv2.data.datasource.remote
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kr.hs.dgsw.mentomenv2.data.remote.PostDataSource
+import kr.hs.dgsw.mentomenv2.data.datasource.PostDataSource
 import kr.hs.dgsw.mentomenv2.data.service.PostService
 import kr.hs.dgsw.mentomenv2.domain.model.Post
 import kr.hs.dgsw.mentomenv2.domain.params.PostSubmitParam

diff --git a/...src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/base/BaseDataSourceImpl.kt b/...src/main/java/kr/hs/dgsw/mentomenv2/data/datasourceimpl/remote/base/BaseDataSourceImpl.kt
@@ -0,0 +1,5 @@
+package kr.hs.dgsw.mentomenv2.data.datasourceimpl.remote.base
+
+abstract class BaseDataSourceImpl<API> {
+    abstract val api: API
+}