move name'calculation' into backend
This commit is contained in:
@@ -1,17 +1,40 @@
|
||||
use crate::Backend;
|
||||
use crate::{random_names::get_name_by_uuid, Backend};
|
||||
|
||||
pub(crate) struct Rank {
|
||||
struct RankDb {
|
||||
pub(crate) rank: i64,
|
||||
pub(crate) name: Option<String>,
|
||||
pub(crate) uuid: String,
|
||||
pub(crate) amount: i64,
|
||||
}
|
||||
|
||||
pub(crate) struct Rank {
|
||||
pub(crate) rank: i64,
|
||||
pub(crate) name: String,
|
||||
pub(crate) uuid: String,
|
||||
pub(crate) amount: i64,
|
||||
}
|
||||
|
||||
impl From<RankDb> for Rank {
|
||||
fn from(value: RankDb) -> Self {
|
||||
let name = match value.name {
|
||||
Some(name) => name,
|
||||
None => get_name_by_uuid(&value.uuid).to_string(),
|
||||
};
|
||||
|
||||
Self {
|
||||
rank: value.rank,
|
||||
name,
|
||||
uuid: value.uuid,
|
||||
amount: value.amount,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Backend {
|
||||
pub(crate) async fn highscore(&self) -> Vec<Rank> {
|
||||
match self {
|
||||
Backend::Sqlite(db) => sqlx::query_as!(
|
||||
Rank,
|
||||
RankDb,
|
||||
"SELECT
|
||||
RANK() OVER (ORDER BY COUNT(s.client_uuid) DESC) as rank,
|
||||
c.name,
|
||||
@@ -24,7 +47,10 @@ impl Backend {
|
||||
)
|
||||
.fetch_all(db)
|
||||
.await
|
||||
.unwrap_or_default(),
|
||||
.unwrap_or_default()
|
||||
.into_iter()
|
||||
.map(|r| r.into())
|
||||
.collect(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user