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

20
apps/labrinth/src/routes/internal/billing.rs
View File

@@ -85,7 +85,7 @@ pub async fn products(
#[derive(Deserialize)]
struct SubscriptionsQuery {
pub user_id: Option<crate::models::ids::UserId>,
pub user_id: Option<ariadne::ids::UserId>,
}
#[get("subscriptions")]
@@ -600,7 +600,7 @@ pub async fn user_customer(
#[derive(Deserialize)]
pub struct ChargesQuery {
pub user_id: Option<crate::models::ids::UserId>,
pub user_id: Option<ariadne::ids::UserId>,
}
#[get("payments")]
@@ -944,7 +944,7 @@ pub async fn active_servers(
#[derive(Serialize)]
struct ActiveServer {
pub user_id: crate::models::ids::UserId,
pub user_id: ariadne::ids::UserId,
pub server_id: String,
pub price_id: crate::models::ids::ProductPriceId,
pub interval: PriceDuration,
@@ -1439,7 +1439,7 @@ pub async fn stripe_webhook(
let user_id = if let Some(user_id) = metadata
.get("modrinth_user_id")
.and_then(|x| parse_base62(x).ok())
.map(|x| crate::database::models::ids::UserId(x as i64))
.map(|x| crate::database::models::ids::DBUserId(x as i64))
{
user_id
} else {
@@ -1464,7 +1464,7 @@ pub async fn stripe_webhook(
let charge_id = if let Some(charge_id) = metadata
.get("modrinth_charge_id")
.and_then(|x| parse_base62(x).ok())
.map(|x| crate::database::models::ids::ChargeId(x as i64))
.map(|x| crate::database::models::ids::DBChargeId(x as i64))
{
charge_id
} else {
@@ -1557,7 +1557,7 @@ pub async fn stripe_webhook(
.get("modrinth_price_id")
.and_then(|x| parse_base62(x).ok())
.map(|x| {
crate::database::models::ids::ProductPriceId(
crate::database::models::ids::DBProductPriceId(
x as i64,
)
}) {
@@ -1601,7 +1601,7 @@ pub async fn stripe_webhook(
.get("modrinth_subscription_id")
.and_then(|x| parse_base62(x).ok())
.map(|x| {
crate::database::models::ids::UserSubscriptionId(x as i64)
crate::database::models::ids::DBUserSubscriptionId(x as i64)
}) {
subscription_id
} else {
@@ -1736,7 +1736,7 @@ pub async fn stripe_webhook(
",
badges.bits() as i64,
metadata.user_item.id
as crate::database::models::ids::UserId,
as crate::database::models::ids::DBUserId,
)
.execute(&mut *transaction)
.await?;
@@ -2061,7 +2061,7 @@ pub async fn stripe_webhook(
}
async fn get_or_create_customer(
user_id: crate::models::ids::UserId,
user_id: ariadne::ids::UserId,
stripe_customer_id: Option<&str>,
user_email: Option<&str>,
client: &stripe::Client,
@@ -2212,7 +2212,7 @@ pub async fn index_subscriptions(pool: PgPool, redis: RedisPool) {
WHERE (id = $2)
",
badges.bits() as i64,
user.id as crate::database::models::ids::UserId,
user.id as crate::database::models::ids::DBUserId,
)
.execute(&mut *transaction)
.await?;