내가 업로드한 노래 3개 가져오기

android/core/data/src/main/java/com/ohdodok/catchytape/core/data/api/MusicApi.kt

@@ -20,4 +20,6 @@ interface MusicApi {
     @GET("musics/recent-uploads")
     suspend fun getRecentUploads(): List<MusicResponse>
 
+    @GET("musics/my-uploads")
+    suspend fun getMyUploads(): List<MusicResponse>
 }

android/core/data/src/main/java/com/ohdodok/catchytape/core/data/model/MusicResponse.kt

@@ -1,5 +1,6 @@
 package com.ohdodok.catchytape.core.data.model
 
+import com.ohdodok.catchytape.core.domain.model.Music
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -13,4 +14,15 @@ data class MusicResponse (
     val musicFile : String,
     val genre: String,
     val user: NicknameResponse
-)
+) {
+    fun toDomain(): Music {
+        return Music(
+            id = musicId,
+            title = title,
+            artist = user.nickname,
+            imageUrl = cover
+        )
+    }
+}
+
+internal fun List<MusicResponse>.toDomains(): List<Music> = this.map { it.toDomain() }

android/core/data/src/main/java/com/ohdodok/catchytape/core/data/repository/MusicRepositoryImpl.kt

@@ -3,6 +3,7 @@ package com.ohdodok.catchytape.core.data.repository
 import com.ohdodok.catchytape.core.data.api.MusicApi
 import com.ohdodok.catchytape.core.data.model.MusicRequest
 import com.ohdodok.catchytape.core.data.model.MusicResponse
+import com.ohdodok.catchytape.core.data.model.toDomains
 import com.ohdodok.catchytape.core.domain.model.Music
 import com.ohdodok.catchytape.core.domain.repository.MusicRepository
 import kotlinx.coroutines.flow.Flow
@@ -20,7 +21,7 @@ class MusicRepositoryImpl @Inject constructor(
 
     override fun getRecentUploadedMusic(): Flow<List<Music>> = flow {
         val musicResponses = musicApi.getRecentUploads()
-        emit(musicResponses.map { it.toDomain() })
+        emit(musicResponses.toDomains())
     }
 
     override fun postMusic(
@@ -42,14 +43,9 @@ class MusicRepositoryImpl @Inject constructor(
 
         emit(response)
     }
-}
 
-fun MusicResponse.toDomain(): Music {
-    return Music(
-        id = musicId,
-        title = title,
-        artist = user.nickname,
-        imageUrl = cover
-    )
+    override fun getMyMusics(): Flow<List<Music>> = flow {
+        val myMusics = musicApi.getMyUploads()
+        emit(myMusics.toDomains())
+    }
 }
-

android/core/domain/src/main/java/com/ohdodok/catchytape/core/domain/repository/MusicRepository.kt

@@ -11,4 +11,6 @@ interface MusicRepository {
 
     fun postMusic(musicId: String, title: String, imageUrl: String, audioUrl: String, genre: String): Flow<Unit>
 
+    fun getMyMusics(): Flow<List<Music>>
+
 }

android/core/ui/src/main/res/values/dimens.xml

@@ -17,4 +17,6 @@
     <dimen name="btn_radius">4dp</dimen>
 
     <dimen name="et_height">50dp</dimen>
+
+    <dimen name="appbar_height">48dp</dimen>
 </resources>

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyPageFragment.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.viewModels
 import com.ohdodok.catchytape.core.ui.BaseFragment
+import com.ohdodok.catchytape.core.ui.toMessageId
 import com.ohdodok.catchytape.feature.mypage.databinding.FragmentMyPageBinding
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -15,7 +16,19 @@ class MyPageFragment : BaseFragment<FragmentMyPageBinding>(R.layout.fragment_my_
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding.viewModel = viewModel
-    }
 
+        observeEvents()
+    }
 
+    private fun observeEvents() {
+        repeatOnStarted {
+            viewModel.events.collect { event ->
+                when (event) {
+                    is MyPageEvent.ShowMessage -> {
+                        showMessage(event.error.toMessageId())
+                    }
+                }
+            }
+        }
+    }
 }

android/feature/mypage/src/main/java/com/ohdodok/catchytape/feature/mypage/MyPageViewModel.kt

@@ -1,20 +1,72 @@
 package com.ohdodok.catchytape.feature.mypage
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.ohdodok.catchytape.core.domain.model.CtErrorType
+import com.ohdodok.catchytape.core.domain.model.CtException
+import com.ohdodok.catchytape.core.domain.model.Music
+import com.ohdodok.catchytape.core.domain.repository.MusicRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineExceptionHandler
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import javax.inject.Inject
 
+data class MyPageUiState(
+    val myMusics: List<Music> = emptyList()
+)
 
 @HiltViewModel
-class MyPageViewModel @Inject constructor() : ViewModel() {
+class MyPageViewModel @Inject constructor(
+    private val musicRepository: MusicRepository,
+) : ViewModel() {
+
+    private val _uiState = MutableStateFlow(MyPageUiState())
+    val uiState: StateFlow<MyPageUiState> = _uiState.asStateFlow()
+
     private val _events = MutableSharedFlow<MyPageEvent>()
     val events: SharedFlow<MyPageEvent> = _events.asSharedFlow()
-}
 
+    private val exceptionHandler = CoroutineExceptionHandler { _, throwable ->
+        viewModelScope.launch {
+            if (throwable is CtException) {
+                _events.emit(MyPageEvent.ShowMessage(throwable.ctError))
+            } else {
+                _events.emit(MyPageEvent.ShowMessage(CtErrorType.UN_KNOWN))
+            }
+        }
+    }
 
-sealed interface MyPageEvent {
+    private val viewModelScopeWithExceptionHandler = viewModelScope + exceptionHandler
 
+    init {
+        fetchMyMusics()
+    }
+
+    private fun fetchMyMusics() {
+        musicRepository.getMyMusics()
+            .onEach { response ->
+                _uiState.update {
+                    it.copy(
+                        myMusics = response.take(3)
+                    )
+                }
+            }
+            .launchIn(viewModelScopeWithExceptionHandler)
+    }
+}
+
+sealed interface MyPageEvent {
+    data class ShowMessage(
+        val error: CtErrorType
+    ) : MyPageEvent
 }

android/feature/mypage/src/main/res/layout/fragment_my_page.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
+
         <variable
             name="viewModel"
             type="com.ohdodok.catchytape.feature.mypage.MyPageViewModel" />
@@ -11,6 +14,81 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/mt_my_page"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/appbar_height"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:title="@string/my_page">
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+        <TextView
+            android:id="@+id/tv_upload"
+            style="@style/BodyLarge"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/margin_horizontal"
+            android:text="@string/share_music"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/mt_my_page" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_upload"
+            style="@style/BodyLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_horizontal"
+            android:background="@android:color/transparent"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/upload"
+            android:textColor="@color/primary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_upload" />
+
+        <TextView
+            android:id="@+id/tv_my_music"
+            style="@style/BodyLarge"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_horizontal"
+            android:layout_marginTop="@dimen/extra_large"
+            android:text="@string/my_musics"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_upload" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_more"
+            style="@style/BodySmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_horizontal"
+            android:background="@android:color/transparent"
+            android:minWidth="0dp"
+            android:minHeight="0dp"
+            android:text="@string/more"
+            app:layout_constraintBottom_toBottomOf="@id/tv_my_music"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/tv_my_music" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_musics"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginTop="@dimen/large"
+            android:paddingHorizontal="@dimen/margin_horizontal"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_my_music"
+            app:list="@{viewModel.uiState.myMusics}"
+            tools:itemCount="3"
+            tools:listitem="@layout/item_music_vertical" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

android/feature/mypage/src/main/res/values/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="share_music">노래를 공유해 보세요.</string>
+    <string name="my_musics">내가 업로드한 노래</string>
+</resources>