[Feat] 마이페이지 나의 밈 API 연결

core/data/src/main/java/team/ppac/data/repository/UserRepositoryImpl.kt

@@ -54,6 +54,15 @@ internal class UserRepositoryImpl @Inject constructor(
         }.flow
     }
 
+    override fun getUserRegisteredMemes(): Flow<PagingData<Meme>> {
+        return createPager { page ->
+            userRemoteDataSource.getUserRegisteredMemes(
+                page = page,
+                size = ITEMS_PER_PAGE,
+            ).memeList.map { it.toMeme() }
+        }.flow
+    }
+
     override suspend fun getUserRecentMemes(): List<Meme> {
         return userRemoteDataSource.getUserRecentMemes().map { it.toMeme() }
     }

core/domain/src/main/java/team/ppac/domain/di/UseCaseModule.kt

@@ -25,6 +25,8 @@ import team.ppac.domain.usecase.GetTopKeywordsUseCase
 import team.ppac.domain.usecase.GetTopKeywordsUseCaseImpl
 import team.ppac.domain.usecase.GetUserRecentMemesUseCase
 import team.ppac.domain.usecase.GetUserRecentMemesUseCaseImpl
+import team.ppac.domain.usecase.GetUserRegisteredMemesUseCase
+import team.ppac.domain.usecase.GetUserRegisteredMemesUseCaseImpl
 import team.ppac.domain.usecase.GetUserSavedMemesUseCase
 import team.ppac.domain.usecase.GetUserSavedMemesUseCaseImpl
 import team.ppac.domain.usecase.GetUserUseCase
@@ -73,6 +75,10 @@ internal abstract class UseCaseModule {
     @ViewModelScoped
     abstract fun bindGetUserSavedMemesUseCase(impl: GetUserSavedMemesUseCaseImpl): GetUserSavedMemesUseCase
 
+    @Binds
+    @ViewModelScoped
+    abstract fun bindGetUserRegisteredMemesUseCase(impl: GetUserRegisteredMemesUseCaseImpl): GetUserRegisteredMemesUseCase
+
     @Binds
     @ViewModelScoped
     abstract fun bindGetUserRecentMemesUseCase(impl: GetUserRecentMemesUseCaseImpl): GetUserRecentMemesUseCase

core/domain/src/main/java/team/ppac/domain/repository/UserRepository.kt

@@ -9,7 +9,8 @@ interface UserRepository {
     suspend fun createUser(): Boolean
     suspend fun getUser(): User
     fun getUserSavedMemes(getCurrentPage: (Int) -> Unit): Flow<PagingData<Meme>>
+    fun getUserRegisteredMemes(): Flow<PagingData<Meme>>
     suspend fun getUserRecentMemes(): List<Meme>
     suspend fun setLevel(level: Int)
-    suspend fun getLevel() : Int
+    suspend fun getLevel(): Int
 }

core/domain/src/main/java/team/ppac/domain/usecase/GetUserRegisteredMemesUseCase.kt

@@ -0,0 +1,19 @@
+package team.ppac.domain.usecase
+
+import androidx.paging.PagingData
+import kotlinx.coroutines.flow.Flow
+import team.ppac.domain.model.Meme
+import team.ppac.domain.repository.UserRepository
+import javax.inject.Inject
+
+interface GetUserRegisteredMemesUseCase {
+    operator fun invoke(): Flow<PagingData<Meme>>
+}
+
+internal class GetUserRegisteredMemesUseCaseImpl @Inject constructor(
+    private val userRepository: UserRepository,
+) : GetUserRegisteredMemesUseCase {
+    override fun invoke(): Flow<PagingData<Meme>> {
+        return userRepository.getUserRegisteredMemes()
+    }
+}

core/remote/src/main/kotlin/team/ppac/remote/api/MemeApi.kt

@@ -10,8 +10,8 @@ import retrofit2.http.Part
 import retrofit2.http.Path
 import retrofit2.http.Query
 import team.ppac.remote.model.response.meme.MemeResponse
+import team.ppac.remote.model.response.user.MemesResponse
 import team.ppac.remote.model.response.meme.UploadMemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
 
 internal interface MemeApi {
     @GET("api/meme/{memeId}")
@@ -34,7 +34,7 @@ internal interface MemeApi {
         @Path("name") keyword: String,
         @Query("page") page: Int,
         @Query("size") pageSize: Int,
-    ): SavedMemesResponse
+    ): MemesResponse
 
     @POST("/api/meme/{memeId}/reaction")
     suspend fun reactMeme(@Path("memeId") memeId: String): Boolean

core/remote/src/main/kotlin/team/ppac/remote/api/UserApi.kt

@@ -6,7 +6,7 @@ import retrofit2.http.POST
 import retrofit2.http.Query
 import team.ppac.remote.model.request.user.PostUserRequest
 import team.ppac.remote.model.response.meme.MemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
+import team.ppac.remote.model.response.user.MemesResponse
 import team.ppac.remote.model.response.user.UserResponse
 
 internal interface UserApi {
@@ -22,7 +22,13 @@ internal interface UserApi {
     suspend fun getUserSavedMemes(
         @Query("page") page: Int,
         @Query("size") size: Int,
-    ): SavedMemesResponse
+    ): MemesResponse
+
+    @GET("api/user/registered-memes")
+    suspend fun getUserRegisteredMemes(
+        @Query("page") page: Int,
+        @Query("size") size: Int,
+    ): MemesResponse
 
     @GET("api/user/recent-memes")
     suspend fun getUserRecentMemes(): List<MemeResponse>

core/remote/src/main/kotlin/team/ppac/remote/datasource/MemeDataSource.kt

@@ -1,7 +1,7 @@
 package team.ppac.remote.datasource
 
 import team.ppac.remote.model.response.meme.MemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
+import team.ppac.remote.model.response.user.MemesResponse
 
 interface MemeDataSource {
     suspend fun getMemeById(memeId: String): MemeResponse
@@ -12,7 +12,7 @@ interface MemeDataSource {
         keyword: String,
         page: Int,
         size: Int,
-    ): SavedMemesResponse
+    ): MemesResponse
     suspend fun reactMeme(memeId: String): Boolean
     suspend fun watchMeme(
         memeId: String,

core/remote/src/main/kotlin/team/ppac/remote/datasource/UserRemoteDataSource.kt

@@ -1,12 +1,13 @@
 package team.ppac.remote.datasource
 
 import team.ppac.remote.model.response.meme.MemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
+import team.ppac.remote.model.response.user.MemesResponse
 import team.ppac.remote.model.response.user.UserResponse
 
 interface UserRemoteDataSource {
     suspend fun postUser(deviceId: String): UserResponse
     suspend fun getUser(): UserResponse
-    suspend fun getUserSavedMemes(page: Int, size: Int): SavedMemesResponse
+    suspend fun getUserSavedMemes(page: Int, size: Int): MemesResponse
+    suspend fun getUserRegisteredMemes(page: Int, size: Int): MemesResponse
     suspend fun getUserRecentMemes(): List<MemeResponse>
 }

core/remote/src/main/kotlin/team/ppac/remote/datasource/impl/MemeDataSourceImpl.kt

@@ -12,14 +12,13 @@ import okhttp3.RequestBody.Companion.toRequestBody
 import team.ppac.remote.api.MemeApi
 import team.ppac.remote.datasource.MemeDataSource
 import team.ppac.remote.model.response.meme.MemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
+import team.ppac.remote.model.response.user.MemesResponse
 import java.io.File
 import java.io.FileOutputStream
 import java.io.InputStream
 import java.io.OutputStream
 import javax.inject.Inject
 
-
 internal class MemeDataSourceImpl @Inject constructor(
     private val memeApi: MemeApi,
     @ApplicationContext private val context: Context,
@@ -40,7 +39,7 @@ internal class MemeDataSourceImpl @Inject constructor(
         return memeApi.deleteSavedMeme(memeId)
     }
 
-    override suspend fun getSearchMemes(keyword: String, page: Int, size: Int): SavedMemesResponse {
+    override suspend fun getSearchMemes(keyword: String, page: Int, size: Int): MemesResponse {
         return memeApi.getSearchMemes(keyword, page, size)
     }
 
@@ -110,4 +109,4 @@ internal class MemeDataSourceImpl @Inject constructor(
             } else null
         }
     }
-}
+}

core/remote/src/main/kotlin/team/ppac/remote/datasource/impl/UserDataSourceImpl.kt

@@ -4,7 +4,7 @@ import team.ppac.remote.api.UserApi
 import team.ppac.remote.datasource.UserRemoteDataSource
 import team.ppac.remote.model.request.user.PostUserRequest
 import team.ppac.remote.model.response.meme.MemeResponse
-import team.ppac.remote.model.response.user.SavedMemesResponse
+import team.ppac.remote.model.response.user.MemesResponse
 import team.ppac.remote.model.response.user.UserResponse
 import javax.inject.Inject
 
@@ -19,10 +19,14 @@ internal class UserDataSourceImpl @Inject constructor(
         return userApi.getUser()
     }
 
-    override suspend fun getUserSavedMemes(page: Int, size: Int): SavedMemesResponse {
+    override suspend fun getUserSavedMemes(page: Int, size: Int): MemesResponse {
         return userApi.getUserSavedMemes(page = page, size = size)
     }
 
+    override suspend fun getUserRegisteredMemes(page: Int, size: Int): MemesResponse {
+        return userApi.getUserRegisteredMemes(page = page, size = size)
+    }
+
     override suspend fun getUserRecentMemes(): List<MemeResponse> {
         return userApi.getUserRecentMemes()
     }

core/remote/src/main/kotlin/team/ppac/remote/model/response/user/SavedMemesResponse.kt → core/remote/src/main/kotlin/team/ppac/remote/model/response/user/MemesResponse.kt

@@ -6,7 +6,7 @@ import team.ppac.remote.model.response.meme.MemeResponse
 import team.ppac.remote.model.response.pagination.PaginationResponse
 
 @JsonClass(generateAdapter = true)
-data class SavedMemesResponse(
+data class MemesResponse(
     @field:Json(name = "pagination")
     val pagination: PaginationResponse,
     @field:Json(name = "memeList")

feature/mypage/src/main/java/team/ppac/mypage/MyPageScreen.kt

@@ -80,6 +80,7 @@ internal fun MyPageScreen(
         onRefresh = {
             onIntent(MyPageIntent.RefreshData)
             savedMemes.refresh()
+            registeredMemes.refresh()
         },
     )
 

feature/mypage/src/main/java/team/ppac/mypage/MyPageViewModel.kt

@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 import team.ppac.common.android.base.BaseViewModel
 import team.ppac.domain.usecase.GetLevelUseCase
 import team.ppac.domain.usecase.GetUserRecentMemesUseCase
+import team.ppac.domain.usecase.GetUserRegisteredMemesUseCase
 import team.ppac.domain.usecase.GetUserSavedMemesUseCase
 import team.ppac.domain.usecase.GetUserUseCase
 import team.ppac.domain.usecase.RefreshEventUseCase
@@ -27,6 +28,7 @@ class MyPageViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val getUserUseCase: GetUserUseCase,
     getUserSavedMemesUseCase: GetUserSavedMemesUseCase,
+    getUserRegisteredMemesUseCase: GetUserRegisteredMemesUseCase,
     private val getUserRecentMemesUseCase: GetUserRecentMemesUseCase,
     private val setLevelUseCase: SetLevelUseCase,
     private val getLevelUseCase: GetLevelUseCase,
@@ -40,10 +42,12 @@ class MyPageViewModel @Inject constructor(
         val savedMemes =
             getUserSavedMemesUseCase(getCurrentPage = { currentPage.tryEmit(it) })
                 .cachedIn(viewModelScope)
+        val registeredMemes = getUserRegisteredMemesUseCase().cachedIn(viewModelScope)
 
         reduce {
             copy(
-                savedMemes = savedMemes
+                savedMemes = savedMemes,
+                registeredMemes = registeredMemes,
             )
         }
     }