eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Labrinth ID cleanup (#3681)

Browse Source 
* Put all ID types in the labrinth::models::ids, and reduce code duplication with them

* Rewrite labrinth::database::models::ids and rename most DB interface ID structs to be prefixed with DB

* Run sqlx prepare

---------

Co-authored-by: Alejandro González <7822554+AlexTMjugador@users.noreply.github.com>
This commit is contained in:
Josiah Glosson
2025-05-22 03:34:36 -05:00
committed by GitHub
parent c6022ad977
commit 9e527ff141
111 changed files with 1477 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/labrinth/src/database/models/collection_item.rs
View File

@@ -12,19 +12,19 @@ const COLLECTIONS_NAMESPACE: &str = "collections";
#[derive(Clone)]
pub struct CollectionBuilder {
pub collection_id: CollectionId,
pub user_id: UserId,
pub collection_id: DBCollectionId,
pub user_id: DBUserId,
pub name: String,
pub description: Option<String>,
pub status: CollectionStatus,
pub projects: Vec<ProjectId>,
pub projects: Vec<DBProjectId>,
}
impl CollectionBuilder {
pub async fn insert(
self,
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
) -> Result<CollectionId, DatabaseError> {
) -> Result<DBCollectionId, DatabaseError> {
let collection_struct = Collection {
id: self.collection_id,
name: self.name,
@@ -45,8 +45,8 @@ impl CollectionBuilder {
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Collection {
pub id: CollectionId,
pub user_id: UserId,
pub id: DBCollectionId,
pub user_id: DBUserId,
pub name: String,
pub description: Option<String>,
pub created: DateTime<Utc>,
@@ -55,7 +55,7 @@ pub struct Collection {
pub raw_icon_url: Option<String>,
pub color: Option<u32>,
pub status: CollectionStatus,
pub projects: Vec<ProjectId>,
pub projects: Vec<DBProjectId>,
}
impl Collection {
@@ -66,16 +66,16 @@ impl Collection {
sqlx::query!(
"
INSERT INTO collections (
id, user_id, name, description,
id, user_id, name, description,
created, icon_url, raw_icon_url, status
)
VALUES (
$1, $2, $3, $4,
$1, $2, $3, $4,
$5, $6, $7, $8
)
",
self.id as CollectionId,
self.user_id as UserId,
self.id as DBCollectionId,
self.user_id as DBUserId,
&self.name,
self.description.as_ref(),
self.created,
@@ -104,7 +104,7 @@ impl Collection {
}
pub async fn remove(
id: CollectionId,
id: DBCollectionId,
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
redis: &RedisPool,
) -> Result<Option<()>, DatabaseError> {
@@ -116,7 +116,7 @@ impl Collection {
DELETE FROM collections_mods
WHERE collection_id = $1
",
id as CollectionId,
id as DBCollectionId,
)
.execute(&mut **transaction)
.await?;
@@ -126,7 +126,7 @@ impl Collection {
DELETE FROM collections
WHERE id = $1
",
id as CollectionId,
id as DBCollectionId,
)
.execute(&mut **transaction)
.await?;
@@ -140,7 +140,7 @@ impl Collection {
}
pub async fn get<'a, 'b, E>(
id: CollectionId,
id: DBCollectionId,
executor: E,
redis: &RedisPool,
) -> Result<Option<Collection>, DatabaseError>
@@ -153,7 +153,7 @@ impl Collection {
}
pub async fn get_many<'a, E>(
collection_ids: &[CollectionId],
collection_ids: &[DBCollectionId],
exec: E,
redis: &RedisPool,
) -> Result<Vec<Collection>, DatabaseError>
@@ -181,8 +181,8 @@ impl Collection {
.fetch(exec)
.try_fold(DashMap::new(), |acc, m| {
let collection = Collection {
id: CollectionId(m.id),
user_id: UserId(m.user_id),
id: DBCollectionId(m.id),
user_id: DBUserId(m.user_id),
name: m.name.clone(),
description: m.description.clone(),
icon_url: m.icon_url.clone(),
@@ -195,7 +195,7 @@ impl Collection {
.mods
.unwrap_or_default()
.into_iter()
.map(ProjectId)
.map(DBProjectId)
.collect(),
};
@@ -213,7 +213,7 @@ impl Collection {
}
pub async fn clear_cache(
id: CollectionId,
id: DBCollectionId,
redis: &RedisPool,
) -> Result<(), DatabaseError> {
let mut redis = redis.connect().await?;