서버에서 바뀐 업로드 과정 반영 #237
Merged
서버에서 바뀐 업로드 과정 반영 #237
Conversation
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
Closed
HamBP
reviewed
Nov 30, 2023
Comment on lines
18
to
32
| override fun getCoverImageUrl(uuid: String, file: File): Flow<String> = flow { | ||
| val urlResponse = uploadApi.postImage( | ||
| image = file.toImageMultipart(), | ||
| uuid = uuid.toRequestBody(), | ||
| type = "cover".toRequestBody(), | ||
| ) | ||
| emit(urlResponse.url) | ||
| } | ||
|
|
||
| override fun getAudioUrl(file: File): Flow<String> = flow { | ||
| val urlResponse = uploadApi.postMusic(file.toMultipart("audio/mpeg")) | ||
| override fun getAudioUrl(uuid: String, file: File): Flow<String> = flow { | ||
| val urlResponse = | ||
| uploadApi.postMusic( | ||
| audio = file.toAudioMultipart(), | ||
| uuid = uuid.toRequestBody(), | ||
| ) |
There was a problem hiding this comment.
함수 이름은 get인데 실제 동작은 사이드 이펙트가 있는 거 같아서 해석하기 어려웠어
HamBP
reviewed
Nov 30, 2023
Comment on lines
16
to
22
| fun uploadAudio(audioFile: File): Flow<String> = uuidRepository.getUuid().map { uuid -> | ||
| urlRepository.getAudioUrl(uuid, audioFile).first() | ||
| } | ||
|
|
||
| fun uploadMusicCover(imageFile: File): Flow<String> = uuidRepository.getUuid().map { uuid -> | ||
| urlRepository.getCoverImageUrl(uuid, imageFile).first() | ||
| } |
There was a problem hiding this comment.
코드에 대한 코멘트는 아님!
uuid를 가져오는 API가 서버에서 사이드 이펙트가 일어나지 않는다면, 네트워킹을 두 번 해서 업로드하기보다는 클라이언트쪽에서 uuid를 생성하는 방식을 사용하는 건 어떨지 서버와 논의해 봐야 할 듯
HamBP
reviewed
Nov 30, 2023
There was a problem hiding this comment.
코드를 해석하기 어려운 것 같아
- isLoading, isUploading, isUploadEnable 이 각각 어떤 차이가 있는지 확인하기 어렵다.
- isUploadEnable 의 상태는 combine에서만 처리할 것 같지만, 실제로는 변경하는 곳이 여러 곳이다.
There was a problem hiding this comment.
isUpladEnable 상태를 한곳에서만 처리하도록 변경하였습니당!
There was a problem hiding this comment.
isUploading 변수를 encoding 으로 바꿔서 더 코드를 해석하기 쉽도록 바꿨어!
isLoading-Progress Bar 상태,
isUploadEnable-완료 Button 활성화/비활성화 유무
라고 생각하면돼
HamBP
reviewed
Nov 30, 2023
| _events.emit(UploadEvent.NavigateToBack) | ||
| }.onCompletion { | ||
| _isUploadEnable.value = true |
There was a problem hiding this comment.
제목과 장르가 입력되지 않으면 애초에 uploadAudio 함수를 실행시킬 수 없엉
There was a problem hiding this comment.
그건 musicTitle을 옵저빙 하고 있기 때문에 false 로 바뀌지
There was a problem hiding this comment.
제가 착각했습니당! ㅠㅠㅠㅠㅠ 근데 리팩토링하면서 && 처리를 통해 이부분도 가능하도록 바꿨습니다!
youlalala
force-pushed
the
android/feature/227
branch
from
16966b1 to
23ce67d
Compare
youlalala
force-pushed
the
android/feature/227
branch
from
2c76356 to
4a37a34
Compare
youlalala
force-pushed
the
android/feature/227
branch
from
acef177 to
d2627cf
Compare
HamBP
reviewed
Nov 30, 2023
Comment on lines
120
to
135
| fun uploadMusic() { | ||
| if (isUploadEnable.value) { | ||
| if (uiState.value.isUploadEnable) { | ||
| uploadMusicUseCase( | ||
| imageUrl = imageState.value.url, | ||
| audioUrl = audioState.value.url, | ||
| title = musicTitle.value, | ||
| genre = musicGenre.value | ||
| ).onEach { | ||
| imageUrl = uiState.value.imageState.url, | ||
| audioUrl = uiState.value.audioState.url, | ||
| title = uiState.value.musicTitle, | ||
| genre = uiState.value.musicGenre | ||
| ).onStart { | ||
| _uiState.update { it.copy(encoding = true) } | ||
| }.onEach { | ||
| _events.emit(UploadEvent.NavigateToBack) | ||
| }.onCompletion { | ||
| _uiState.update { it.copy(encoding = false) } | ||
| }.launchIn(viewModelScopeWithExceptionHandler) | ||
| } | ||
| } |
There was a problem hiding this comment.
early return 이용하면 좀 더 깔끔할 거 같긴 합니당
if (!uiState.value.isUploadEnable) return
uplopadMusicUseCase() {
// ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue
Overview
isLoading (progress bar) -> image file, audio file, isUploading 상태에 따라 변함
isUploadEnable (완료버튼) -> musicTitle, musicGenre, image Url, audio Url 가 모두 들어왔을 때 업로드 가능 + 업로드 중일 때는 업로드 불가
Screenshot
default.mp4