forked from Cookies_Github_mirror/AquaDX
[+] Generalize game trend & summary apis
This commit is contained in:
Azalea
@@ -3,15 +3,18 @@ package icu.samnyan.aqua.net.games
|
||||
import ext.API
|
||||
import ext.RP
|
||||
import ext.Str
|
||||
import ext.minus
|
||||
import icu.samnyan.aqua.net.db.AquaUserServices
|
||||
import icu.samnyan.aqua.net.utils.TrendLog
|
||||
import icu.samnyan.aqua.net.utils.findTrend
|
||||
import icu.samnyan.aqua.net.utils.genericUserSummary
|
||||
import icu.samnyan.aqua.net.utils.mai2Scores
|
||||
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserDataRepository
|
||||
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserGeneralDataRepository
|
||||
import icu.samnyan.aqua.sega.maimai2.dao.userdata.UserPlaylogRepository
|
||||
import org.springframework.web.bind.annotation.RestController
|
||||
|
||||
@RestController
|
||||
@API("api/v2/game/maimai2")
|
||||
@API("api/v2/game/mai2")
|
||||
class Maimai2(
|
||||
val us: AquaUserServices,
|
||||
val userPlaylogRepository: UserPlaylogRepository,
|
||||
@@ -20,69 +23,22 @@ class Maimai2(
|
||||
): GameApiController
|
||||
{
|
||||
override fun trend(@RP username: Str): List<TrendOut> = us.byName(username) { u ->
|
||||
// O(n log n) sort
|
||||
val d = userPlaylogRepository.findByUser_Card_ExtId(u.ghostCard.extId).sortedBy { it.playDate }.toList()
|
||||
|
||||
// Precompute the play counts for each date in O(n)
|
||||
val playCounts = d.groupingBy { it.playDate }.eachCount()
|
||||
|
||||
// Find the max afterRating on each date
|
||||
val maxRating = d.groupingBy { it.playDate }.fold(0) { acc, e -> maxOf(acc, e.afterRating) }
|
||||
|
||||
// Use the precomputed play counts
|
||||
d.distinctBy { it.playDate }
|
||||
.map { TrendOut(it.playDate, maxRating[it.playDate] ?: 0,
|
||||
playCounts[it.playDate] ?: 0) }
|
||||
.sortedBy { it.date }
|
||||
findTrend(userPlaylogRepository.findByUser_Card_ExtId(u.ghostCard.extId)
|
||||
.map { TrendLog(it.playDate, it.afterRating) })
|
||||
}
|
||||
|
||||
private val shownRanks = listOf(
|
||||
100.5 to "SSS+",
|
||||
100.0 to "SSS",
|
||||
99.5 to "SS+",
|
||||
99.0 to "SS",
|
||||
98.0 to "S+",
|
||||
97.0 to "S").map { (k, v) -> (k * 10000).toInt() to v }
|
||||
// Only show > S rank
|
||||
private val shownRanks = mai2Scores.filter { it.first >= 97 }
|
||||
|
||||
override fun userSummary(@RP username: Str) = us.byName(username) { u ->
|
||||
// Summary values: total plays, player rating, server-wide ranking
|
||||
// number of each rank, max combo, number of full combo, number of all perfect
|
||||
val user = userDataRepository.findByCard(u.ghostCard) ?: (404 - "User not found")
|
||||
val plays = userPlaylogRepository.findByUser_Card_ExtId(u.ghostCard.extId)
|
||||
val extra = userGeneralDataRepository.findByUser_Card_ExtId(u.ghostCard.extId)
|
||||
.associate { it.propertyKey to it.propertyValue }
|
||||
|
||||
// O(6n) ranks algorithm: Loop through the entire list of plays,
|
||||
// count the number of each rank
|
||||
val ranks = shownRanks.associate { (_, v) -> v to 0 }.toMutableMap()
|
||||
plays.forEach {
|
||||
shownRanks.find { (s, _) -> it.achievement > s }?.let { (_, v) -> ranks[v] = ranks[v]!! + 1 }
|
||||
}
|
||||
|
||||
GenericGameSummary(
|
||||
name = user.userName,
|
||||
iconId = user.iconId,
|
||||
serverRank = userDataRepository.getRanking(user.playerRating),
|
||||
accuracy = plays.sumOf { it.achievement }.toDouble() / plays.size,
|
||||
rating = user.playerRating,
|
||||
ratingHighest = user.highestRating,
|
||||
ranks = ranks.map { (k, v) -> RankCount(k, v) },
|
||||
maxCombo = plays.maxOf { it.maxCombo },
|
||||
fullCombo = plays.count { it.totalCombo == it.maxCombo },
|
||||
allPerfect = plays.count { it.achievement == 1010000 },
|
||||
totalScore = user.totalDeluxscore,
|
||||
plays = plays.size,
|
||||
totalPlayTime = plays.count() * 3L, // TODO: Give a better estimate
|
||||
joined = user.firstPlayDate,
|
||||
lastSeen = user.lastPlayDate,
|
||||
lastVersion = user.lastRomVersion,
|
||||
ratingComposition = mapOf(
|
||||
"best35" to (extra["recent_rating"] ?: ""),
|
||||
"best15" to (extra["recent_rating_new"] ?: "")
|
||||
),
|
||||
recent = plays.sortedBy { it.playDate }.takeLast(15).map {
|
||||
GenericGamePlaylog(it.playDate, it.achievement, it.maxCombo, it.totalCombo)
|
||||
}
|
||||
val ratingComposition = mapOf(
|
||||
"best35" to (extra["recent_rating"] ?: ""),
|
||||
"best15" to (extra["recent_rating_new"] ?: "")
|
||||
)
|
||||
|
||||
genericUserSummary(u, userDataRepository, userPlaylogRepository, shownRanks, ratingComposition)
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,8 @@ data class GenericGamePlaylog(
|
||||
val playDate: String,
|
||||
val achievement: Int,
|
||||
val maxCombo: Int,
|
||||
val totalCombo: Int
|
||||
val totalCombo: Int,
|
||||
val afterRating: Int
|
||||
)
|
||||
|
||||
data class RankCount(val name: String, val count: Int)
|
||||
|
||||
105
src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
Normal file
105
src/main/java/icu/samnyan/aqua/net/utils/GameHelper.kt
Normal file
@@ -0,0 +1,105 @@
|
||||
package icu.samnyan.aqua.net.utils
|
||||
|
||||
import ext.minus
|
||||
import icu.samnyan.aqua.net.db.AquaNetUser
|
||||
import icu.samnyan.aqua.net.games.GenericGamePlaylog
|
||||
import icu.samnyan.aqua.net.games.GenericGameSummary
|
||||
import icu.samnyan.aqua.net.games.RankCount
|
||||
import icu.samnyan.aqua.net.games.TrendOut
|
||||
import icu.samnyan.aqua.sega.general.model.Card
|
||||
|
||||
data class TrendLog(val date: String, val rating: Int)
|
||||
|
||||
/**
|
||||
* Find the trend of a user's rating
|
||||
*/
|
||||
fun findTrend(log: List<TrendLog>): List<TrendOut> {
|
||||
// O(n log n)
|
||||
val d = log.sortedBy { it.date }.toList()
|
||||
|
||||
// Precompute the play counts for each date in O(n)
|
||||
val playCounts = d.groupingBy { it.date }.eachCount()
|
||||
|
||||
// Find the max afterRating on each date
|
||||
val maxRating = d.groupingBy { it.date }.fold(0) { acc, e -> maxOf(acc, e.rating) }
|
||||
|
||||
// Use the precomputed play counts
|
||||
return d.distinctBy { it.date }
|
||||
.map { TrendOut(it.date, maxRating[it.date] ?: 0,
|
||||
playCounts[it.date] ?: 0) }
|
||||
.sortedBy { it.date }
|
||||
}
|
||||
|
||||
// Here are some interfaces to generalize across multiple games
|
||||
interface IGenericUserData {
|
||||
val userName: String
|
||||
val iconId: Int
|
||||
val playerRating: Int
|
||||
val highestRating: Int
|
||||
val firstPlayDate: Any
|
||||
val lastPlayDate: Any
|
||||
val lastRomVersion: String
|
||||
val totalScore: Long
|
||||
}
|
||||
|
||||
interface GenericUserDataRepo {
|
||||
fun findByCard(card: Card): IGenericUserData?
|
||||
fun getRanking(rating: Int): Long
|
||||
}
|
||||
|
||||
interface IGenericGamePlaylog {
|
||||
val date: Any
|
||||
val achievement: Int
|
||||
val maxCombo: Int
|
||||
val totalCombo: Int
|
||||
val afterRating: Int
|
||||
}
|
||||
|
||||
interface GenericPlaylogRepo {
|
||||
fun findByUserCardExtId(extId: Long): List<IGenericGamePlaylog>
|
||||
}
|
||||
|
||||
fun genericUserSummary(
|
||||
u: AquaNetUser,
|
||||
userDataRepo: GenericUserDataRepo,
|
||||
userPlaylogRepo: GenericPlaylogRepo,
|
||||
shownRanks: List<Pair<Int, String>>,
|
||||
ratingComposition: Map<String, String>,
|
||||
): GenericGameSummary {
|
||||
// Summary values: total plays, player rating, server-wide ranking
|
||||
// number of each rank, max combo, number of full combo, number of all perfect
|
||||
val user = userDataRepo.findByCard(u.ghostCard) ?: (404 - "User not found")
|
||||
val plays = userPlaylogRepo.findByUserCardExtId(u.ghostCard.extId)
|
||||
|
||||
// O(6n) ranks algorithm: Loop through the entire list of plays,
|
||||
// count the number of each rank
|
||||
val ranks = shownRanks.associate { (_, v) -> v to 0 }.toMutableMap()
|
||||
plays.forEach {
|
||||
shownRanks.find { (s, _) -> it.achievement > s }?.let { (_, v) -> ranks[v] = ranks[v]!! + 1 }
|
||||
}
|
||||
|
||||
return GenericGameSummary(
|
||||
name = user.userName,
|
||||
iconId = user.iconId,
|
||||
serverRank = userDataRepo.getRanking(user.playerRating),
|
||||
accuracy = plays.sumOf { it.achievement }.toDouble() / plays.size,
|
||||
rating = user.playerRating,
|
||||
ratingHighest = user.highestRating,
|
||||
ranks = ranks.map { (k, v) -> RankCount(k, v) },
|
||||
maxCombo = plays.maxOf { it.maxCombo },
|
||||
fullCombo = plays.count { it.totalCombo == it.maxCombo },
|
||||
allPerfect = plays.count { it.achievement == 1010000 },
|
||||
totalScore = user.totalScore,
|
||||
plays = plays.size,
|
||||
totalPlayTime = plays.count() * 3L, // TODO: Give a better estimate
|
||||
joined = user.firstPlayDate.toString(),
|
||||
lastSeen = user.lastPlayDate.toString(),
|
||||
lastVersion = user.lastRomVersion,
|
||||
ratingComposition = ratingComposition,
|
||||
recent = plays.sortedBy { it.date.toString() }.takeLast(15).map {
|
||||
GenericGamePlaylog(it.date.toString(), it.achievement, it.maxCombo, it.totalCombo, it.afterRating)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
33
src/main/java/icu/samnyan/aqua/net/utils/GameScoring.kt
Normal file
33
src/main/java/icu/samnyan/aqua/net/utils/GameScoring.kt
Normal file
@@ -0,0 +1,33 @@
|
||||
package icu.samnyan.aqua.net.utils
|
||||
|
||||
|
||||
val mai2Scores = listOf(
|
||||
100.5 to "SSS+",
|
||||
100.0 to "SSS",
|
||||
99.5 to "SS+",
|
||||
99.0 to "SS",
|
||||
98.0 to "S+",
|
||||
97.0 to "S",
|
||||
94.0 to "AAA",
|
||||
90.0 to "AA",
|
||||
80.0 to "A",
|
||||
75.0 to "BBB",
|
||||
70.0 to "BB",
|
||||
60.0 to "B",
|
||||
50.0 to "C",
|
||||
0.0 to "D",
|
||||
).map { (k, v) -> (k * 10000).toInt() to v }
|
||||
|
||||
val chu3Scores = listOf(
|
||||
100.75 to "SSS",
|
||||
100.0 to "SS",
|
||||
97.5 to "S",
|
||||
95.0 to "AAA",
|
||||
92.5 to "AA",
|
||||
90.0 to "A",
|
||||
80.0 to "BBB",
|
||||
70.0 to "BB",
|
||||
60.0 to "B",
|
||||
50.0 to "C",
|
||||
0.0 to "D",
|
||||
).map { (k, v) -> (k * 10000).toInt() to v }
|
||||
Reference in New Issue
Block a user