From 8ac197515b630798aabdedd73fb55932dc8b507c Mon Sep 17 00:00:00 2001 From: "nise.moe" Date: Fri, 14 Jun 2024 13:13:06 +0200 Subject: [PATCH] Added more beatmap values --- .../search/score/ScoreSearchController.kt | 12 +++++++++- .../score/ScoreSearchSchemaController.kt | 10 ++++++++ .../nise/search/score/ScoreSearchService.kt | 24 +++++++++++++++++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchController.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchController.kt index 444f93a..d67e648 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchController.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchController.kt @@ -106,7 +106,17 @@ class ScoreSearchController( val beatmap_source: String?, val beatmap_star_rating: Double?, val beatmap_title: String?, - val beatmap_version: String? + val beatmap_version: String?, + val beatmap_length: Int?, + val beatmap_bpm: Double?, + val beatmap_accuracy: Double?, + val beatmap_ar: Double?, + val beatmap_cs: Double?, + val beatmap_drain: Double?, + val beatmap_circles: Int?, + val beatmap_sliders: Int?, + val beatmap_spinners: Int?, + val beatmap_max_combo: Int?, ) data class SearchRequest( diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchSchemaController.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchSchemaController.kt index 683d799..f3eb907 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchSchemaController.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchSchemaController.kt @@ -80,6 +80,16 @@ class ScoreSearchSchemaController( InternalSchemaField("beatmap_star_rating", "Stars", Category.beatmap, Type.number, false, "(★) difficulty rating of the beatmap", databaseField = BEATMAPS.STAR_RATING), InternalSchemaField("beatmap_title", "Title", Category.beatmap, Type.string, false, "title of the beatmap", databaseField = BEATMAPS.TITLE), InternalSchemaField("beatmap_version", "Version", Category.beatmap, Type.string, false, "version or difficulty name of the beatmap", databaseField = BEATMAPS.VERSION), + InternalSchemaField("beatmap_length", "Length", Category.beatmap, Type.number, false, "total length of the beatmap in seconds", databaseField = BEATMAPS.TOTAL_LENGTH), + InternalSchemaField("beatmap_bpm", "BPM", Category.beatmap, Type.number, false, "beats per minute of the beatmap", databaseField = BEATMAPS.BPM), + InternalSchemaField("beatmap_accuracy", "Accuracy", Category.beatmap, Type.number, false, "beatmap accuracy", databaseField = BEATMAPS.ACCURACY), + InternalSchemaField("beatmap_ar", "AR", Category.beatmap, Type.number, false, "approach rate of the beatmap", databaseField = BEATMAPS.AR), + InternalSchemaField("beatmap_cs", "CS", Category.beatmap, Type.number, false, "circle size of the beatmap", databaseField = BEATMAPS.CS), + InternalSchemaField("beatmap_drain", "HP Drain", Category.beatmap, Type.number, false, "health drain rate of the beatmap", databaseField = BEATMAPS.DRAIN), + InternalSchemaField("beatmap_circles", "Circles", Category.beatmap, Type.number, false, "number of circles in the beatmap", databaseField = BEATMAPS.COUNT_CIRCLES), + InternalSchemaField("beatmap_sliders", "Sliders", Category.beatmap, Type.number, false, "number of sliders in the beatmap", databaseField = BEATMAPS.COUNT_SLIDERS), + InternalSchemaField("beatmap_spinners", "Spinners", Category.beatmap, Type.number, false, "number of spinners in the beatmap", databaseField = BEATMAPS.COUNT_SPINNERS), + InternalSchemaField("beatmap_max_combo", "Max Combo", Category.beatmap, Type.number, false, "maximum combo achievable in the beatmap", databaseField = BEATMAPS.MAX_COMBO) ) } diff --git a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchService.kt b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchService.kt index 267ad3a..db330a9 100644 --- a/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchService.kt +++ b/nise-backend/src/main/kotlin/com/nisemoe/nise/search/score/ScoreSearchService.kt @@ -91,7 +91,17 @@ class ScoreSearchService( BEATMAPS.SOURCE, BEATMAPS.STAR_RATING, BEATMAPS.TITLE, - BEATMAPS.VERSION + BEATMAPS.VERSION, + BEATMAPS.TOTAL_LENGTH, + BEATMAPS.BPM, + BEATMAPS.ACCURACY, + BEATMAPS.AR, + BEATMAPS.CS, + BEATMAPS.DRAIN, + BEATMAPS.COUNT_CIRCLES, + BEATMAPS.COUNT_SLIDERS, + BEATMAPS.COUNT_SPINNERS, + BEATMAPS.MAX_COMBO, ) // Conditionally add admin-specific fields @@ -206,7 +216,17 @@ class ScoreSearchService( beatmap_source = it.get(BEATMAPS.SOURCE), beatmap_star_rating = it.get(BEATMAPS.STAR_RATING), beatmap_title = it.get(BEATMAPS.TITLE), - beatmap_version = it.get(BEATMAPS.VERSION) + beatmap_version = it.get(BEATMAPS.VERSION), + beatmap_length = it.get(BEATMAPS.TOTAL_LENGTH), + beatmap_bpm = it.get(BEATMAPS.BPM), + beatmap_accuracy = it.get(BEATMAPS.ACCURACY), + beatmap_ar = it.get(BEATMAPS.AR), + beatmap_cs = it.get(BEATMAPS.CS), + beatmap_drain = it.get(BEATMAPS.DRAIN), + beatmap_circles = it.get(BEATMAPS.COUNT_CIRCLES), + beatmap_sliders = it.get(BEATMAPS.COUNT_SLIDERS), + beatmap_spinners = it.get(BEATMAPS.COUNT_SPINNERS), + beatmap_max_combo = it.get(BEATMAPS.MAX_COMBO) ) }