[feature/semin7]: 7주차 과제제출 #13
There are no files selected for viewing
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package org.android.go.sopt.data.model.music | ||
|
|
||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.android.go.sopt.domain.entity.music.SoptPostMusicData | ||
|
|
||
| @Serializable | ||
| data class SoptPostMusicResponse( | ||
| @SerialName("data") | ||
| val data: Data? = null, | ||
| @SerialName("message") | ||
| val message: String? = null, | ||
| @SerialName("status") | ||
| val status: Int? = null | ||
| ) { | ||
|
|
||
| @Serializable | ||
| data class Data( | ||
| @SerialName("singer") | ||
| val singer: String? = null, | ||
| @SerialName("title") | ||
| val title: String? = null, | ||
| @SerialName("url") | ||
| val url: String? = null | ||
| ) | ||
| } | ||
|
|
||
| fun SoptPostMusicResponse.toSoptPostMusicData() = SoptPostMusicData( | ||
| message = message.orEmpty(), | ||
| status = status ?: -1, | ||
| singer = data?.singer.orEmpty(), | ||
| title = data?.title.orEmpty(), | ||
| url = data?.url.orEmpty() | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package org.android.go.sopt.data.service.sopt | ||
|
|
||
| import okhttp3.MultipartBody | ||
| import okhttp3.RequestBody | ||
| import org.android.go.sopt.data.model.music.SoptGetMusicListResponse | ||
| import org.android.go.sopt.data.model.music.SoptPostMusicResponse | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.Header | ||
| import retrofit2.http.Multipart | ||
| import retrofit2.http.POST | ||
| import retrofit2.http.Part | ||
| import retrofit2.http.Path | ||
|
|
||
| interface SoptMusicService { | ||
|
|
||
| @Multipart | ||
| @POST("/music") | ||
| suspend fun postMusic( | ||
| @Header("id") id: String, | ||
| @Part image: MultipartBody.Part, | ||
| @Part("title") title: RequestBody, | ||
| @Part("singer") singer: RequestBody, | ||
| ): SoptPostMusicResponse | ||
|
|
||
| @GET("/{id}/music") | ||
| suspend fun getMusic( | ||
| @Path("id") id: String | ||
| ): SoptGetMusicListResponse | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.android.go.sopt.domain.entity.music | ||
|
|
||
|
|
||
| import kotlinx.serialization.Serializable | ||
|
|
||
| data class SoptGetMusicData( | ||
|
There was a problem hiding this comment. https://developer.android.com/topic/architecture/data-layer?hl=ko#business-models 이 부분 참고해서 데이터 클래스 네이밍 지어봐도 괜찮을 것 같네요 |
||
| val message: String, | ||
| val status: Int, | ||
| val musicList: List<Music> | ||
| ) { | ||
| data class Music( | ||
| val singer: String, | ||
| val title: String, | ||
| val url: String | ||
| ) | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package org.android.go.sopt.domain.entity.music | ||
|
|
||
| import okhttp3.MultipartBody | ||
|
|
||
| data class SoptPostMusicBody( | ||
| val singer: String, | ||
| val title: String, | ||
| val image: MultipartBody.Part | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| package org.android.go.sopt.domain.entity.music | ||
|
|
||
|
|
||
|
|
||
| data class SoptPostMusicData( | ||
| val message: String, | ||
| val status: Int, | ||
| val singer: String, | ||
| val title: String, | ||
| val url: String | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,8 @@ | ||||||||||
| package org.android.go.sopt.extension | ||||||||||
|
|
||||||||||
| import okhttp3.MediaType.Companion.toMediaTypeOrNull | ||||||||||
| import okhttp3.RequestBody.Companion.toRequestBody | ||||||||||
|
|
||||||||||
| class CommonExtension { | ||||||||||
| private fun Int.toRequestBody() = toString().toRequestBody("text/plain".toMediaTypeOrNull()) | ||||||||||
| } | ||||||||||
|
Comment on lines
+6
to
+8
There was a problem hiding this comment.
Suggested change
코틀린이니까 파일안에 함수만 있어도 될듯 There was a problem hiding this comment. file로 만든게 아니라 class로 만들었었네요 이런 실수를 ㅋㅎㅋㅎㅋㅎ 감사합니다 |
||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| package org.android.go.sopt.presentation.main.home | ||
|
|
||
| import org.android.go.sopt.domain.entity.music.SoptGetMusicData | ||
|
|
||
| sealed class HomeState { | ||
| object UnInitialized: HomeState() | ||
|
|
||
| object Loading: HomeState() | ||
|
|
||
| data class SuccessGetMusicList( | ||
| val data: SoptGetMusicData | ||
| ): HomeState() | ||
|
There was a problem hiding this comment. 의진님은 state 관리 따로, data 관리 따로 하는 것이 좋은 것 같나요? There was a problem hiding this comment. 오 State 관리와 data 관리를 따로 한다는 관점에 대해서는 깊게 생각해보지 않았는데요. 현재 제가 사용하고 있는 UI State의 사용 이유가 결국 View단에서 State에 따라서만 View가 보여져야하는 형태를 핸들링 할 수 있다는 부분이 유지보수 측면에서 매력적이기 때문입니다. 결국 View가 State에 따라 변경되게 하려면 비즈니스 로직에서 받아오는 data가 State내에 필수적으로 필요할 것 같습니다. 어떻게 보면 MVI의 느낌의 패턴이라고 생각하시면 됩니다. 만약 데이터를 따로 관리하게 된다면, Success인 State에서 data를 따로 observable한 변수를 통해 처리하는 방법을 생각하시는 걸까요?? 이 부분에 있어서 다른 패턴을 적용할 수 있는 예제를 보여주신다면 저도 확인해보겠습니다!! |
||
|
|
||
| object SuccessPostMusic: HomeState() | ||
|
|
||
| object Error: HomeState() | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,58 @@ | ||
| package org.android.go.sopt.presentation.main.home | ||
|
|
||
| import android.util.Log | ||
| import androidx.lifecycle.ViewModel | ||
| import androidx.lifecycle.viewModelScope | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.launch | ||
| import okhttp3.MediaType.Companion.toMediaType | ||
| import okhttp3.MediaType.Companion.toMediaTypeOrNull | ||
| import okhttp3.MultipartBody | ||
| import okhttp3.RequestBody | ||
| import okhttp3.RequestBody.Companion.toRequestBody | ||
| import org.android.go.sopt.domain.entity.music.SoptPostMusicBody | ||
| import org.android.go.sopt.domain.repository.MusicRepository | ||
| import retrofit2.http.Multipart | ||
| import javax.inject.Inject | ||
|
|
||
|
|
||
| @HiltViewModel | ||
| class HomeViewModel @Inject constructor( | ||
| private val musicRepository: MusicRepository | ||
| ) : ViewModel() { | ||
|
|
||
| private val _homeStateFlow = MutableStateFlow<HomeState>(HomeState.UnInitialized) | ||
| val homeStateFlow: StateFlow<HomeState> get() = _homeStateFlow | ||
|
|
||
| private val id = "admin5" | ||
|
|
||
| fun getMusicList() { | ||
| viewModelScope.launch { | ||
| musicRepository.getMusicList(id) | ||
| .onSuccess { | ||
| _homeStateFlow.emit(HomeState.SuccessGetMusicList(it)) | ||
| }.onFailure { | ||
| Log.e("HomeViewModel", "getMusicList() error: $it") | ||
| _homeStateFlow.emit(HomeState.Error) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| fun postMusic(soptPostMusicBody: SoptPostMusicBody) { | ||
| viewModelScope.launch { | ||
| val image = soptPostMusicBody.image | ||
| val title = soptPostMusicBody.title.toRequestBody("text/plain".toMediaType()) | ||
| val singer = soptPostMusicBody.singer.toRequestBody("text/plain".toMediaType()) | ||
|
|
||
| musicRepository.postMusic(id, image, title, singer) | ||
| .onSuccess { | ||
| _homeStateFlow.emit(HomeState.SuccessPostMusic) | ||
| }.onFailure { | ||
| Log.e("HomeViewModel", "postMusic() error: $it") | ||
| _homeStateFlow.emit(HomeState.Error) | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SerialName을 사용한다면 변수명을 다른 이름으로 지정해도 되지 않을까요?