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

Implement factory in main database, close #80

Browse Source
This commit is contained in:
NG (Graham)
2026-02-01 18:14:16 -05:00
parent a346299de8
commit 3b909327d8
33 changed files with 741 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
rc_database/src/wrapper.rs
View File

@@ -2,7 +2,7 @@ use sea_orm_migration::MigratorTrait;
use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, PaginatorTrait, QueryFilter, QueryOrder, QuerySelect, TransactionTrait};
pub struct Database {
orm: sea_orm::DatabaseConnection,
orm: std::sync::Arc<sea_orm::DatabaseConnection>,
metrics: std::sync::Arc<std::sync::Mutex<super::metrics::MetricsState>>,
}
@@ -14,14 +14,18 @@ impl Database {
//let schema_manager = SchemaManager::new(&db);
super::Migrator::up(&db, None).await?;
Ok(Self {
orm: db,
orm: std::sync::Arc::new(db),
metrics: metrics_data,
})
}
pub fn vehicle_factory(&self, cdn: std::sync::Arc<String>) -> super::FactoryDatabase {
super::FactoryDatabase::init_preconnected(self.orm.clone(), cdn)
}
pub async fn user_count(&self) -> Result<u64, sea_orm::DbErr> {
crate::schema::user::Entity::find()
.count(&self.orm)
.count(self.orm.as_ref())
.await
}
@@ -31,14 +35,14 @@ impl Database {
sea_orm::sea_query::Func::lower(crate::schema::user::Column::DisplayName.into_expr())
).eq(public_id.to_lowercase())
)
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn user_by_steam_id(&self, steam_id: u64) -> Result<Option<crate::schema::user::Model>, sea_orm::DbErr> {
crate::schema::user::Entity::find()
.filter(crate::schema::user::Column::SteamId.eq(Some(steam_id.to_string())))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -48,7 +52,7 @@ impl Database {
sea_orm::sea_query::Func::lower(crate::schema::user::Column::Email.into_expr())
).eq(email.to_lowercase())
)
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -67,13 +71,13 @@ impl Database {
}
pub async fn insert_user(&self, entity: crate::schema::user::ActiveModel) -> Result<crate::schema::user::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn user_aux_by_user_id(&self, user_id: i32) -> Result<Vec<crate::schema::user_aux::Model>, sea_orm::DbErr> {
crate::schema::user_aux::Entity::find()
.filter(crate::schema::user_aux::Column::UserId.eq(user_id))
.all(&self.orm)
.all(self.orm.as_ref())
.await
}
@@ -81,12 +85,12 @@ impl Database {
crate::schema::user_aux::Entity::find()
.filter(crate::schema::user_aux::Column::UserId.eq(user_id))
.filter(crate::schema::user_aux::Column::Descriptor.eq(descriptor))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn insert_user_aux(&self, entities: Vec<crate::schema::user_aux::ActiveModel>) -> Result<(), sea_orm::DbErr> {
crate::schema::user_aux::Entity::insert_many(entities.into_iter()).exec(&self.orm).await?;
crate::schema::user_aux::Entity::insert_many(entities.into_iter()).exec(self.orm.as_ref()).await?;
Ok(())
}
@@ -97,13 +101,13 @@ impl Database {
.filter(crate::schema::user_aux::Column::UserId.eq(user_id))
.filter(crate::schema::user_aux::Column::Descriptor.eq(descriptor.clone()))
.into_model::<crate::schema::common_query::Id>()
.one(&self.orm)
.one(self.orm.as_ref())
.await?;
if let Some(id) = id_opt {
// update
entity.id = sea_orm::ActiveValue::Set(id.id);
Ok(Some(crate::schema::user_aux::Entity::update(entity)
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?))
} else {
Ok(None)
@@ -142,12 +146,12 @@ impl Database {
pub async fn perms_by_user_id(&self, user_id: i32) -> Result<Option<crate::schema::permissions::Model>, sea_orm::DbErr> {
crate::schema::permissions::Entity::find()
.filter(crate::schema::permissions::Column::UserId.eq(user_id))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn insert_perms(&self, entity: crate::schema::permissions::ActiveModel) -> Result<crate::schema::permissions::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn update_perms_by_user_id(&self, mut entity: crate::schema::permissions::ActiveModel, user_id: i32) -> Result<Option<crate::schema::permissions::Model>, sea_orm::DbErr> {
@@ -156,12 +160,12 @@ impl Database {
.column(crate::schema::permissions::Column::Id)
.filter(crate::schema::permissions::Column::UserId.eq(user_id))
.into_model::<crate::schema::common_query::Id>()
.one(&self.orm)
.one(self.orm.as_ref())
.await?;
if let Some(id) = id_opt {
entity.id = sea_orm::ActiveValue::Set(id.id);
Ok(Some(crate::schema::permissions::Entity::update(entity)
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?))
} else {
Ok(None)
@@ -170,7 +174,7 @@ impl Database {
pub async fn garage_count(&self) -> Result<u64, sea_orm::DbErr> {
crate::schema::garage::Entity::find()
.count(&self.orm)
.count(self.orm.as_ref())
.await
}
@@ -180,7 +184,7 @@ impl Database {
.column_as(crate::schema::garage::Column::Slot.max(), "column")
.filter(crate::schema::garage::Column::UserId.eq(user_id))
.into_model::<crate::schema::common_query::SingleColumn<i32>>()
.one(&self.orm)
.one(self.orm.as_ref())
.await?;
Ok(result.map(|x| *x).unwrap_or(0))
}
@@ -189,7 +193,7 @@ impl Database {
crate::schema::garage::Entity::find()
.filter(crate::schema::garage::Column::UserId.eq(user_id))
.filter(crate::schema::garage::Column::Selected.eq(true))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -197,7 +201,7 @@ impl Database {
crate::schema::garage::Entity::find()
.filter(crate::schema::garage::Column::UserId.eq(user_id))
.filter(crate::schema::garage::Column::Slot.eq(garage_slot))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -205,35 +209,35 @@ impl Database {
crate::schema::garage::Entity::find()
.filter(crate::schema::garage::Column::UserId.eq(user_id))
.order_by_asc(crate::schema::garage::Column::Slot)
.all(&self.orm)
.all(self.orm.as_ref())
.await
}
pub async fn garage_by_uuid(&self, uuid: i64) -> Result<Option<crate::schema::garage::Model>, sea_orm::DbErr> {
crate::schema::garage::Entity::find()
.filter(crate::schema::garage::Column::Uuid.eq(uuid))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn garage_by_id(&self, id: i32) -> Result<Option<crate::schema::garage::Model>, sea_orm::DbErr> {
crate::schema::garage::Entity::find_by_id(id)
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn insert_garages(&self, entities: Vec<crate::schema::garage::ActiveModel>) -> Result<(), sea_orm::DbErr> {
crate::schema::garage::Entity::insert_many(entities.into_iter()).exec(&self.orm).await?;
crate::schema::garage::Entity::insert_many(entities.into_iter()).exec(self.orm.as_ref()).await?;
Ok(())
}
pub async fn insert_garage(&self, entity: crate::schema::garage::ActiveModel) -> Result<crate::schema::garage::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn update_garage(&self, entity: crate::schema::garage::ActiveModel) -> Result<crate::schema::garage::Model, sea_orm::DbErr> {
crate::schema::garage::Entity::update(entity)
.exec(&self.orm)
.exec(self.orm.as_ref())
.await
}
@@ -244,12 +248,12 @@ impl Database {
.filter(crate::schema::garage::Column::UserId.eq(user_id))
.filter(crate::schema::garage::Column::Slot.eq(slot))
.into_model::<crate::schema::common_query::Id>()
.one(&self.orm)
.one(self.orm.as_ref())
.await?;
if let Some(id) = id_opt {
entity.id = sea_orm::ActiveValue::Set(id.id);
Ok(Some(crate::schema::garage::Entity::update(entity)
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?))
} else {
Ok(None)
@@ -262,12 +266,12 @@ impl Database {
.column(crate::schema::garage::Column::Id)
.filter(crate::schema::garage::Column::Uuid.eq(uuid))
.into_model::<crate::schema::common_query::Id>()
.one(&self.orm)
.one(self.orm.as_ref())
.await?;
if let Some(id) = id_opt {
entity.id = sea_orm::ActiveValue::Set(id.id);
Ok(Some(crate::schema::garage::Entity::update(entity)
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?))
} else {
Ok(None)
@@ -307,7 +311,7 @@ impl Database {
.filter(crate::schema::sanction::Column::UserId.eq(user_id))
.filter(crate::schema::sanction::Column::Descriptor.eq(desc))
.filter(crate::schema::sanction::Column::Acknowledged.is_null())
.count(&self.orm)
.count(self.orm.as_ref())
.await
}
@@ -316,17 +320,17 @@ impl Database {
.filter(crate::schema::sanction::Column::UserId.eq(user_id))
.filter(crate::schema::sanction::Column::Acknowledged.is_null())
.order_by_asc(crate::schema::sanction::Column::CreationTime)
.all(&self.orm)
.all(self.orm.as_ref())
.await
}
pub async fn insert_sanction(&self, entity: crate::schema::sanction::ActiveModel) -> Result<crate::schema::sanction::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn game_count(&self) -> Result<u64, sea_orm::DbErr> {
crate::schema::multiplayer_game::Entity::find()
.count(&self.orm)
.count(self.orm.as_ref())
.await
}
@@ -334,7 +338,7 @@ impl Database {
crate::schema::multiplayer_game::Entity::find()
.filter(crate::schema::multiplayer_game::Column::Guid.eq(game_guid))
.order_by_desc(crate::schema::multiplayer_game::Column::CreationTime)
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -346,7 +350,7 @@ impl Database {
.filter(crate::schema::multiplayer_game_player::Column::UserId.eq(user_id))
.order_by_desc(crate::schema::multiplayer_game::Column::CreationTime)
//.into_model()
.one(&self.orm)
.one(self.orm.as_ref())
.await?
.map(|(x, _)| x))
}
@@ -359,7 +363,7 @@ impl Database {
.filter(crate::schema::multiplayer_game_player::Column::UserId.eq(user_id))
.order_by_asc(crate::schema::multiplayer_game::Column::CreationTime)
//.into_model()
.one(&self.orm)
.one(self.orm.as_ref())
.await?
.and_then(|(game, player)| player.map(|player| (game, player))))
}
@@ -368,7 +372,7 @@ impl Database {
crate::schema::multiplayer_game::Entity::update_many()
.col_expr(crate::schema::multiplayer_game::Column::IsComplete, sea_orm::sea_query::Expr::value(true))
.filter(crate::schema::multiplayer_game::Column::Guid.eq(game_guid))
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?;
Ok(())
}
@@ -377,13 +381,13 @@ impl Database {
crate::schema::multiplayer_game::Entity::update_many()
.col_expr(crate::schema::multiplayer_game::Column::IsComplete, sea_orm::sea_query::Expr::value(true))
.filter(crate::schema::multiplayer_game::Column::IsComplete.eq(false))
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?;
Ok(())
}
pub async fn insert_game(&self, entity: crate::schema::multiplayer_game::ActiveModel) -> Result<crate::schema::multiplayer_game::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
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> {
@@ -392,7 +396,7 @@ impl Database {
.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>()
.all(&self.orm)
.all(self.orm.as_ref())
.await?
.into_iter()
.map(|(player, _)| player)
@@ -407,7 +411,7 @@ impl Database {
//.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))
.all(&self.orm)
.all(self.orm.as_ref())
.await?
.into_iter()
.filter_map(|(player, user, _)| user.map(|user| (player, user)))
@@ -423,7 +427,7 @@ impl Database {
.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)
.all(self.orm.as_ref())
.await?
.into_iter()
.filter_map(|(player, user, _)| user.map(|user| (player, user)))
@@ -438,7 +442,7 @@ impl Database {
.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)
.all(self.orm.as_ref())
.await?
.into_iter()
.map(|(player, _)| player)
@@ -449,7 +453,7 @@ impl Database {
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)
.all(self.orm.as_ref())
.await?
.into_iter()
.map(|(player, _)| player)
@@ -462,17 +466,17 @@ impl Database {
.filter(crate::schema::multiplayer_game::Column::Guid.eq(game_guid))
.filter(crate::schema::multiplayer_game_player::Column::UserId.eq(user_id))
//.order_by_asc(crate::schema::multiplayer_game::Column::CreationTime)
.one(&self.orm)
.one(self.orm.as_ref())
.await?
.and_then(|(_, player)| player))
}
pub async fn insert_player(&self, entity: crate::schema::multiplayer_game_player::ActiveModel) -> Result<crate::schema::multiplayer_game_player::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn insert_players(&self, entities: Vec<crate::schema::multiplayer_game_player::ActiveModel>) -> Result<(), sea_orm::DbErr> {
crate::schema::multiplayer_game_player::Entity::insert_many(entities.into_iter()).exec(&self.orm).await?;
crate::schema::multiplayer_game_player::Entity::insert_many(entities.into_iter()).exec(self.orm.as_ref()).await?;
Ok(())
}
@@ -482,7 +486,7 @@ impl Database {
is_claimed: sea_orm::Set(is_claimed),
..Default::default()
})
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?;
Ok(())
}
@@ -493,18 +497,18 @@ impl Database {
.filter(crate::schema::game_event::Column::End.gte(time))
.filter(crate::schema::game_event::Column::Variant.eq(variant))
.order_by_desc(crate::schema::game_event::Column::Start)
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
pub async fn insert_game_event(&self, entity: crate::schema::game_event::ActiveModel) -> Result<crate::schema::game_event::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn score_by_player_id(&self, player_id: i32) -> Result<Option<crate::schema::multiplayer_game_score::Model>, sea_orm::DbErr> {
crate::schema::multiplayer_game_score::Entity::find()
.filter(crate::schema::multiplayer_game_score::Column::PlayerId.eq(player_id))
.one(&self.orm)
.one(self.orm.as_ref())
.await
}
@@ -514,17 +518,17 @@ impl Database {
.filter(crate::schema::multiplayer_game_player::Column::UserId.eq(user_id))
.filter(crate::schema::multiplayer_game_score::Column::IsClaimed.eq(is_claimed))
.order_by_asc(crate::schema::multiplayer_game_player::Column::CreationTime)
.one(&self.orm)
.one(self.orm.as_ref())
.await
.map(|opt| opt.and_then(|(_player, score)| score))
}
pub async fn insert_score(&self, entity: crate::schema::multiplayer_game_score::ActiveModel) -> Result<crate::schema::multiplayer_game_score::Model, sea_orm::DbErr> {
entity.insert(&self.orm).await
entity.insert(self.orm.as_ref()).await
}
pub async fn update_score(&self, entity: crate::schema::multiplayer_game_score::ActiveModel) -> Result<crate::schema::multiplayer_game_score::Model, sea_orm::DbErr> {
crate::schema::multiplayer_game_score::Entity::update(entity).exec(&self.orm).await
crate::schema::multiplayer_game_score::Entity::update(entity).exec(self.orm.as_ref()).await
}
pub async fn score_claim(&self, score_id: i32) -> Result<(), sea_orm::DbErr> {
@@ -533,7 +537,7 @@ impl Database {
is_claimed: sea_orm::Set(true),
..Default::default()
})
.exec(&self.orm)
.exec(self.orm.as_ref())
.await?;
Ok(())
}
@@ -544,7 +548,7 @@ impl Database {
.filter(crate::schema::multiplayer_game_player::Column::UserId.eq(user_id))
.filter(crate::schema::multiplayer_game_score::Column::IsClaimed.eq(is_claimed))
.order_by_asc(crate::schema::multiplayer_game_player::Column::CreationTime)
.count(&self.orm)
.count(self.orm.as_ref())
.await
}