bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Minor refactor for fake server players

Browse Source
This commit is contained in:
NG (Graham)
2025-08-16 15:52:06 -04:00
parent 70b17ddda5
commit 94d247f8f4
14 changed files with 530 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
rc_database/src/migration/m20250816_000001_add_fake_players.rs Normal file
View File

@@ -0,0 +1,154 @@
use sea_orm::{DbBackend, Statement};
use sea_orm_migration::prelude::*;
pub struct Migration;
impl MigrationName for Migration {
fn name(&self) -> &str {
"m20250816_000001_add_fake_players"
}
}
#[async_trait::async_trait]
impl MigrationTrait for Migration {
// Define how to apply this migration: Make user_id column nullable/optional
async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
match manager.get_database_backend() {
DbBackend::Sqlite => {
// cannot modify existing column, let's just drop it since this is supposed to be only for dev work
manager.drop_table(
Table::drop()
.table(crate::schema::multiplayer_game_player::Entity)
.to_owned()
).await?;
manager
.create_table(
Table::create()
.table(crate::schema::multiplayer_game_player::Entity)
.col(
ColumnDef::new(crate::schema::multiplayer_game_player::Column::Id)
.integer()
.not_null()
.auto_increment()
.primary_key(),
)
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::UserId).integer().null())
.foreign_key(
ForeignKey::create()
.name("fk-players-user_id")
.from(crate::schema::multiplayer_game_player::Entity, crate::schema::multiplayer_game_player::Column::UserId)
.to(crate::schema::user::Entity, crate::schema::user::Column::Id),
)
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::GameId).integer().not_null())
.foreign_key(
ForeignKey::create()
.name("fk-players-game_id")
.from(crate::schema::multiplayer_game_player::Entity, crate::schema::multiplayer_game_player::Column::GameId)
.to(crate::schema::multiplayer_game::Entity, crate::schema::multiplayer_game::Column::Id),
)
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::CreationTime).big_integer().not_null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::PlayerId).small_integer().not_null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::Team).integer().not_null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::Group).integer().null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::IsClaimed).boolean().not_null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::PublicId).string().not_null())
.col(ColumnDef::new(crate::schema::multiplayer_game_player::Column::DisplayName).string().not_null())
.to_owned(),
)
.await
},
_ => {
manager
.alter_table(
Table::alter()
.table(crate::schema::multiplayer_game_player::Entity)
.modify_column(ColumnDef::new(crate::schema::multiplayer_game_player::Column::UserId).integer().null())
.add_column(ColumnDef::new(crate::schema::multiplayer_game_player::Column::PublicId).string().not_null().default("???"))
.add_column(ColumnDef::new(crate::schema::multiplayer_game_player::Column::DisplayName).string().not_null().default("???"))
.to_owned()
)
.await
}
}
}
// Define how to rollback this migration: Makes the colum not nullable.
async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> {
// this will always fail in sqlite, but why are you rolling back migrations anyway?
match manager.get_database_backend() {
DbBackend::Sqlite => {
// cannot modify existing column, just do it in raw sqlite for simplicity
let statements = [
r#"CREATE TEMPORARY TABLE temp AS
SELECT
id,
user_id,
game_id,
creation_time,
player_id,
team,
"group",
is_claimed
FROM players;"#,
r#"DROP TABLE players;"#,
r#"CREATE TABLE players (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
game_id INTEGER NOT NULL,
creation_time BIGINT NOT NULL,
player_id SMALLINT NOT NULL,
team INTEGER NOT NULL,
"group" INTEGER,
is_claimed BOOLEAN NOT NULL,
CONSTRAINT FK_players_games FOREIGN KEY (game_id) REFERENCES games(id),
CONSTRAINT FK_players_users FOREIGN KEY (user_id) REFERENCES users(id)
);"#,
r#"INSERT INTO players
(id,
user_id,
game_id,
creation_time,
player_id,
team,
"group",
is_claimed)
SELECT
id,
user_id,
game_id,
creation_time,
player_id,
team,
"group",
is_claimed
FROM temp
WHERE user_id IS NOT NULL;"#,
r#"DROP TABLE temp;"#,
];
for sql in statements {
let statement = Statement::from_sql_and_values(DbBackend::Sqlite, sql, []);
manager.get_connection().execute(statement).await?;
}
Ok(())
}
_ => {
manager
.alter_table(
Table::alter()
.table(crate::schema::multiplayer_game_player::Entity)
.modify_column(ColumnDef::new(crate::schema::multiplayer_game_player::Column::UserId).integer().not_null())
.drop_column(crate::schema::multiplayer_game_player::Column::PublicId)
.drop_column(crate::schema::multiplayer_game_player::Column::DisplayName)
.to_owned()
)
.await
}
}
}
}

2
rc_database/src/migration/mod.rs
View File

@@ -10,6 +10,7 @@ mod m20250529_000001_create_sanction_table;
mod m20250713_000001_create_game_table;
mod m20250713_000002_create_player_table;
mod m20250722_000001_create_game_event_table;
mod m20250816_000001_add_fake_players;
pub struct Migrator;
@@ -27,6 +28,7 @@ impl MigratorTrait for Migrator {
Box::new(m20250713_000001_create_game_table::Migration),
Box::new(m20250713_000002_create_player_table::Migration),
Box::new(m20250722_000001_create_game_event_table::Migration),
Box::new(m20250816_000001_add_fake_players::Migration),
]
}
}

4
rc_database/src/schema/multiplayer_game_player.rs
View File

@@ -5,13 +5,15 @@ use sea_orm::entity::prelude::*;
pub struct Model {
#[sea_orm(primary_key)]
pub id: i32,
pub user_id: i32,
pub user_id: Option<i32>,
pub game_id: i32,
pub creation_time: i64, // seconds since unix epoch
pub player_id: i16, // actually u8
pub team: i32,
pub group: Option<i32>, // probably a user id
pub is_claimed: bool,
pub public_id: String,
pub display_name: String,
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

43
rc_database/src/wrapper.rs
View File

@@ -1,5 +1,5 @@
use sea_orm_migration::MigratorTrait;
use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect, TransactionTrait, RelationTrait};
use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect, TransactionTrait};
pub struct Database {
orm: sea_orm::DatabaseConnection,
@@ -330,16 +330,19 @@ impl Database {
}
pub async fn players_by_game_guid_and_completion(&self, game_guid: i64, is_complete: bool) -> Result<Vec<crate::schema::multiplayer_game_player::Model>, sea_orm::DbErr> {
crate::schema::multiplayer_game_player::Entity::find()
.join(sea_orm::JoinType::InnerJoin, crate::schema::multiplayer_game::Relation::Player.def())
Ok(crate::schema::multiplayer_game_player::Entity::find()
.find_also_related(crate::schema::multiplayer_game::Entity)
.filter(crate::schema::multiplayer_game::Column::Guid.eq(game_guid))
.filter(crate::schema::multiplayer_game::Column::IsComplete.eq(is_complete))
.into_model::<crate::schema::multiplayer_game_player::Model>()
//.into_model::<crate::schema::multiplayer_game_player::Model>()
.all(&self.orm)
.await
.await?
.into_iter()
.map(|(player, _)| player)
.collect())
}
pub async fn players_by_game_guid_and_completion_heavy(&self, game_guid: i64, is_complete: bool) -> Result<Vec<(crate::schema::multiplayer_game_player::Model, crate::schema::user::Model)>, sea_orm::DbErr> {
/*pub async fn players_by_game_guid_and_completion_heavy(&self, game_guid: i64, is_complete: bool) -> Result<Vec<(crate::schema::multiplayer_game_player::Model, crate::schema::user::Model)>, sea_orm::DbErr> {
Ok(crate::schema::multiplayer_game_player::Entity::find()
.find_also_related(crate::schema::user::Entity)
.find_also_related(crate::schema::multiplayer_game::Entity)
@@ -352,9 +355,9 @@ impl Database {
.into_iter()
.filter_map(|(player, user, _)| user.map(|user| (player, user)))
.collect())
}
}*/
pub async fn players_by_game_guid_and_completion_and_team_heavy(&self, game_guid: i64, team: i32, is_complete: bool) -> Result<Vec<(crate::schema::multiplayer_game_player::Model, crate::schema::user::Model)>, sea_orm::DbErr> {
/*pub async fn players_by_game_guid_and_completion_and_team_heavy(&self, game_guid: i64, team: i32, is_complete: bool) -> Result<Vec<(crate::schema::multiplayer_game_player::Model, crate::schema::user::Model)>, sea_orm::DbErr> {
Ok(crate::schema::multiplayer_game_player::Entity::find()
.find_also_related(crate::schema::user::Entity)
.find_also_related(crate::schema::multiplayer_game::Entity)
@@ -368,14 +371,32 @@ impl Database {
.into_iter()
.filter_map(|(player, user, _)| user.map(|user| (player, user)))
.collect())
}*/
pub async fn players_by_game_guid_and_completion_and_team(&self, game_guid: i64, team: i32, is_complete: bool) -> Result<Vec<crate::schema::multiplayer_game_player::Model>, sea_orm::DbErr> {
Ok(crate::schema::multiplayer_game_player::Entity::find()
.find_also_related(crate::schema::multiplayer_game::Entity)
//.join(sea_orm::JoinType::InnerJoin, crate::schema::multiplayer_game::Relation::Player.def())
//.join(sea_orm::JoinType::InnerJoin, crate::schema::user::Relation::Player.def())
.filter(crate::schema::multiplayer_game::Column::Guid.eq(game_guid))
.filter(crate::schema::multiplayer_game::Column::IsComplete.eq(is_complete))
.filter(crate::schema::multiplayer_game_player::Column::Team.eq(team))
.all(&self.orm)
.await?
.into_iter()
.map(|(player, _)| player)
.collect())
}
pub async fn players_by_game_id_and_completion(&self, game_id: i32) -> Result<Vec<crate::schema::multiplayer_game_player::Model>, sea_orm::DbErr> {
crate::schema::multiplayer_game_player::Entity::find()
.join(sea_orm::JoinType::InnerJoin, crate::schema::multiplayer_game::Relation::Player.def())
Ok(crate::schema::multiplayer_game_player::Entity::find()
.find_also_related(crate::schema::multiplayer_game::Entity)
.filter(crate::schema::multiplayer_game::Column::Id.eq(game_id))
.all(&self.orm)
.await
.await?
.into_iter()
.map(|(player, _)| player)
.collect())
}
pub async fn insert_players(&self, entities: Vec<crate::schema::multiplayer_game_player::ActiveModel>) -> Result<(), sea_orm::DbErr> {