Skip to content

refactor(afternote): 에디터 곡·영상 변환 규칙을 공통화한다 (#2166) #2167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OnlyReadOneBook merged 5 commits into from
Oct 4, 2026
Merged

refactor(afternote): 에디터 곡·영상 변환 규칙을 공통화한다 (#2166) #2167

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95dc5c3
refactor(afternote): 에디터 곡·영상 변환 규칙을 공통화 (#2166)
OnlyReadOneBook Sep 25, 2026
dfa015b
refactor(afternote): 수정 입력의 수신자 id 계약 통합 (#2166)
OnlyReadOneBook Sep 25, 2026
3b1014b
refactor(afternote): 미디어 URL 인자 이름 통합 (#2166)
OnlyReadOneBook Sep 25, 2026
f67d10e
Merge category snapshot parent after current develop integration (#2166)
OnlyReadOneBook Sep 27, 2026
1c3ca47
Merge remote-tracking branch 'origin/develop' into tmp/2167-sync
OnlyReadOneBook Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 17 additions & 29 deletions ...n/kotlin/com/afternote/feature/afternote/presentation/editor/AfternoteEditorFormMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,28 +117,12 @@ internal object AfternoteEditorFormMapper {
memorialPhotoUrl: String? = null,
memorialVideoUrl: String? = null,
memorialThumbnailUrl: String? = null,
): MemorialWritePayload {
val songs =
playlistSongs.map { song ->
MemorialSongPayload(
title = song.title,
artist = song.artist,
coverUrl = song.albumCoverUrl,
)
}
val memorialVideo =
memorialVideoUrl?.ifBlank { null }?.let { url ->
MemorialVideoPayload(
videoUrl = url,
thumbnailUrl = memorialThumbnailUrl?.ifBlank { null },
)
}
return MemorialWritePayload(
): MemorialWritePayload =
MemorialWritePayload(
memorialPhotoUrl = memorialPhotoUrl?.ifBlank { null },
songs = songs,
memorialVideo = memorialVideo,
songs = playlistSongs.map { it.toMemorialSongPayload() },
memorialVideo = memorialVideoPayload(videoUrl = memorialVideoUrl, thumbnailUrl = memorialThumbnailUrl),
)
}

fun buildCreateInput(
type: AfternoteType,
Expand Down Expand Up @@ -446,10 +430,7 @@ internal object AfternoteEditorFormMapper {
leaveMessageBlocks = leaveMessageBlocks,
photoUrl = memorialMediaUrls.memorialPhotoUrl?.ifBlank { null },
video = memorialMediaUrls.toVideoPayload(),
songs =
playlistSongs.map { song ->
MemorialSongPayload(title = song.title, artist = song.artist, coverUrl = song.albumCoverUrl)
},
songs = playlistSongs.map { it.toMemorialSongPayload() },
)
}

Expand All @@ -466,14 +447,21 @@ internal object AfternoteEditorFormMapper {
private fun RegisterAfternotePayload.toCredentialsSnapshot() =
CredentialsSnapshot(id = accountId.ifBlank { null }, password = password.ifBlank { null })

private fun Song.toMemorialSongPayload() = MemorialSongPayload(title = title, artist = artist, coverUrl = albumCoverUrl)

private fun MemorialMedia.toVideoPayload(): MemorialVideoPayload? =
videoUrl?.ifBlank { null }?.let { url ->
MemorialVideoPayload(videoUrl = url, thumbnailUrl = thumbnailUrl?.ifBlank { null })
}
memorialVideoPayload(videoUrl = videoUrl, thumbnailUrl = thumbnailUrl)

private fun MemorialMediaUrls.toVideoPayload(): MemorialVideoPayload? =
memorialVideoUrl?.ifBlank { null }?.let { url ->
MemorialVideoPayload(videoUrl = url, thumbnailUrl = memorialThumbnailUrl?.ifBlank { null })
memorialVideoPayload(videoUrl = memorialVideoUrl, thumbnailUrl = memorialThumbnailUrl)

/** 영상 주소가 비었으면 영상 슬롯 자체가 없다. 썸네일만 남은 값은 싣지 않는다. */
private fun memorialVideoPayload(
videoUrl: String?,
thumbnailUrl: String?,
): MemorialVideoPayload? =
videoUrl?.ifBlank { null }?.let { url ->
MemorialVideoPayload(videoUrl = url, thumbnailUrl = thumbnailUrl?.ifBlank { null })
}
}

Expand Down
Loading