diff --git a/src/main/kotlin/win/taptap/musicmanager/api/ApiModels.kt b/src/main/kotlin/win/taptap/musicmanager/api/ApiModels.kt index 4e97da2..0ffb70a 100644 --- a/src/main/kotlin/win/taptap/musicmanager/api/ApiModels.kt +++ b/src/main/kotlin/win/taptap/musicmanager/api/ApiModels.kt @@ -181,6 +181,7 @@ data class SearchResultDto( val thumbnail: String? = null, val songId: String? = null, val downloaded: Boolean = false, + val inMood: Boolean = false, ) @Serializable diff --git a/src/main/kotlin/win/taptap/musicmanager/api/SongApi.kt b/src/main/kotlin/win/taptap/musicmanager/api/SongApi.kt index 44cd4e3..2bafc89 100644 --- a/src/main/kotlin/win/taptap/musicmanager/api/SongApi.kt +++ b/src/main/kotlin/win/taptap/musicmanager/api/SongApi.kt @@ -15,6 +15,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.slf4j.LoggerFactory import win.taptap.musicmanager.config.UsersConfig +import win.taptap.musicmanager.db.MoodRepository import win.taptap.musicmanager.db.SongRecord import win.taptap.musicmanager.db.SongRepository import win.taptap.musicmanager.discovery.YtSearch @@ -38,13 +39,18 @@ fun Route.songRoutes( transcoder: FfmpegTranscoder, ) { get("/search") { - call.requireApiUser(users) + val user = call.requireApiUser(users) val query = call.request.queryParameters["q"]?.trim().orEmpty() if (query.isEmpty()) { call.respond(SearchResponse()) return@get } val limit = (call.request.queryParameters["limit"]?.toIntOrNull() ?: 20).coerceIn(1, 25) + val moodId = call.request.queryParameters["moodId"]?.takeIf { it.isNotBlank() } + val moodVideos = moodId + ?.takeIf { MoodRepository.get(it, user.name) != null } + ?.let(MoodRepository::videoIdsInMood) + .orEmpty() val results = withContext(Dispatchers.IO) { runCatching { search.search(query, limit) } @@ -73,6 +79,7 @@ fun Route.songRoutes( thumbnail = candidate.thumbnail, songId = song?.takeIf { downloaded }?.id, downloaded = downloaded, + inMood = candidate.videoId in moodVideos, ) }, ), diff --git a/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt b/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt index 9da4a9e..7daea06 100644 --- a/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt +++ b/src/test/kotlin/win/taptap/musicmanager/api/ApiRoutesTest.kt @@ -292,9 +292,11 @@ class ApiRoutesTest { testApplication { setupApp(seed, search = FakeYt(results)) val token = client.token("alice", "alice-pw") + val moodId = client.createMood(token, """{"name":"Search Mood","recommendationCount":0}""") + client.addSong(token, moodId, seed.ambient1) val body = parse( - client.get("/api/v1/search?q=ambient") { bearer(token) }.bodyAsText(), + client.get("/api/v1/search?q=ambient&moodId=$moodId") { bearer(token) }.bodyAsText(), ) val found = body["results"]!!.jsonArray.map { it.jsonObject } assertEquals(2, found.size) @@ -303,6 +305,7 @@ class ApiRoutesTest { val downloaded = found.first { it.string("videoId") == "vid-ambient-1" } assertTrue(downloaded["downloaded"]!!.jsonPrimitive.content.toBoolean()) + assertTrue(downloaded["inMood"]!!.jsonPrimitive.content.toBoolean()) assertEquals(seed.ambient1, downloaded.string("songId")) assertFalse( found.first { it.string("videoId") == "vid-new" }["downloaded"]!!