Commonize and distinguish a lot of struct names in labrinth::database::models (#3691)

This commit is contained in:
Josiah Glosson
2025-05-24 04:38:43 -05:00
committed by GitHub
parent 9c1bdf16e4
commit 4e4a7be7ef
78 changed files with 1075 additions and 1009 deletions

View File

@@ -45,13 +45,13 @@ pub async fn get_pats(
.1;
let pat_ids =
database::models::pat_item::PersonalAccessToken::get_user_pats(
database::models::pat_item::DBPersonalAccessToken::get_user_pats(
user.id.into(),
&**pool,
&redis,
)
.await?;
let pats = database::models::pat_item::PersonalAccessToken::get_many_ids(
let pats = database::models::pat_item::DBPersonalAccessToken::get_many_ids(
&pat_ids, &**pool, &redis,
)
.await?;
@@ -116,7 +116,7 @@ pub async fn create_pat(
let token = format!("mrp_{token}");
let name = info.name.clone();
database::models::pat_item::PersonalAccessToken {
database::models::pat_item::DBPersonalAccessToken {
id,
name: name.clone(),
access_token: token.clone(),
@@ -130,7 +130,7 @@ pub async fn create_pat(
.await?;
transaction.commit().await?;
database::models::pat_item::PersonalAccessToken::clear_cache(
database::models::pat_item::DBPersonalAccessToken::clear_cache(
vec![(None, None, Some(user.id.into()))],
&redis,
)
@@ -180,7 +180,7 @@ pub async fn edit_pat(
.1;
let id = id.into_inner().0;
let pat = database::models::pat_item::PersonalAccessToken::get(
let pat = database::models::pat_item::DBPersonalAccessToken::get(
&id, &**pool, &redis,
)
.await?;
@@ -242,7 +242,7 @@ pub async fn edit_pat(
}
transaction.commit().await?;
database::models::pat_item::PersonalAccessToken::clear_cache(
database::models::pat_item::DBPersonalAccessToken::clear_cache(
vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
&redis,
)
@@ -271,7 +271,7 @@ pub async fn delete_pat(
.await?
.1;
let id = id.into_inner().0;
let pat = database::models::pat_item::PersonalAccessToken::get(
let pat = database::models::pat_item::DBPersonalAccessToken::get(
&id, &**pool, &redis,
)
.await?;
@@ -279,13 +279,13 @@ pub async fn delete_pat(
if let Some(pat) = pat {
if pat.user_id == user.id.into() {
let mut transaction = pool.begin().await?;
database::models::pat_item::PersonalAccessToken::remove(
database::models::pat_item::DBPersonalAccessToken::remove(
pat.id,
&mut transaction,
)
.await?;
transaction.commit().await?;
database::models::pat_item::PersonalAccessToken::clear_cache(
database::models::pat_item::DBPersonalAccessToken::clear_cache(
vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
&redis,
)