Labrinth ID cleanup (#3681)

* 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>

Author: Gaming32

Cargo.lock

@@ -31,6 +31,7 @@ futures.workspace = true
 futures-util.workspace = true
 async-trait.workspace = true
 dashmap.workspace = true
+paste.workspace = true
 
 meilisearch-sdk = { workspace = true, features = ["reqwest"] }
 rust-s3.workspace = true

apps/labrinth/.sqlx/query-06bf1b34b70f5e61bf619c4d7706d07d6db413751ecab86896a708c8539e38b6.json renamed to apps/labrinth/.sqlx/query-0fcbb92442bdab97fd1b44a0eecb28c05a4c6d482b3fa7874902ee8e846d20b0.json

@@ -90,7 +90,7 @@ pub async fn filter_visible_project_ids(
     user_option: &Option<User>,
     pool: &PgPool,
     hide_unlisted: bool,
-) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBProjectId>, ApiError> {
     let mut return_projects = Vec::new();
     let mut check_projects = Vec::new();
 
@@ -129,11 +129,11 @@ pub async fn filter_enlisted_projects_ids(
     projects: Vec<&Project>,
     user_option: &Option<User>,
     pool: &PgPool,
-) -> Result<Vec<crate::database::models::ProjectId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBProjectId>, ApiError> {
     let mut return_projects = vec![];
 
     if let Some(user) = user_option {
-        let user_id: models::ids::UserId = user.id.into();
+        let user_id: models::ids::DBUserId = user.id.into();
 
         use futures::TryStreamExt;
 
@@ -154,7 +154,7 @@ pub async fn filter_enlisted_projects_ids(
                 .iter()
                 .filter_map(|x| x.organization_id.map(|x| x.0))
                 .collect::<Vec<_>>(),
-            user_id as database::models::ids::UserId,
+            user_id as database::models::ids::DBUserId,
         )
         .fetch(pool)
         .map_ok(|row| {
@@ -236,7 +236,7 @@ pub async fn filter_visible_version_ids(
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
-) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBVersionId>, ApiError> {
     let mut return_versions = Vec::new();
     let mut check_versions = Vec::new();
 
@@ -291,7 +291,7 @@ pub async fn filter_enlisted_version_ids(
     user_option: &Option<User>,
     pool: &PgPool,
     redis: &RedisPool,
-) -> Result<Vec<crate::database::models::VersionId>, ApiError> {
+) -> Result<Vec<crate::database::models::DBVersionId>, ApiError> {
     let mut return_versions = Vec::new();
 
     // Get project ids of versions

apps/labrinth/.sqlx/query-1243d13d622a9970240c8f26b5031b4c68d08607f7a0142b662b53eb05b4723a.json renamed to apps/labrinth/.sqlx/query-282ec0ee4a4ef739fc24af40d2c9be2a335ea9a32a1d19a450aef02f1c58334e.json

@@ -116,7 +116,7 @@ pub enum OAuthErrorType {
     AuthenticationError(#[from] AuthenticationError),
     #[error("Client {} has no redirect URIs specified", .client_id.0)]
     ClientMissingRedirectURI {
-        client_id: crate::database::models::OAuthClientId,
+        client_id: crate::database::models::DBOAuthClientId,
     },
     #[error(
         "The provided redirect URI did not match any configured in the client"
@@ -133,7 +133,7 @@ pub enum OAuthErrorType {
     #[error("The provided flow id was invalid")]
     InvalidAcceptFlowId,
     #[error("The provided client id was invalid")]
-    InvalidClientId(crate::database::models::OAuthClientId),
+    InvalidClientId(crate::database::models::DBOAuthClientId),
     #[error("The provided ID could not be decoded: {0}")]
     MalformedId(#[from] DecodingError),
     #[error("Failed to authenticate client")]

apps/labrinth/.sqlx/query-9abdd9a2018e7bfe26836dd5463ba0923ef0a76c32ca258faf55fc3301c567bf.json renamed to apps/labrinth/.sqlx/query-2d2cb03a63c4692080dd58f88f34ac63b20f89c9e7d6f520865133de60b9e911.json

@@ -6,7 +6,7 @@ use crate::database::models::oauth_client_authorization_item::OAuthClientAuthori
 use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
 use crate::database::models::oauth_token_item::OAuthAccessToken;
 use crate::database::models::{
-    OAuthClientAuthorizationId, generate_oauth_access_token_id,
+    DBOAuthClientAuthorizationId, generate_oauth_access_token_id,
     generate_oauth_client_authorization_id,
 };
 use crate::database::redis::RedisPool;
@@ -417,9 +417,9 @@ fn generate_access_token() -> String {
 }
 
 async fn init_oauth_code_flow(
-    user_id: crate::database::models::UserId,
+    user_id: crate::database::models::DBUserId,
     client_id: OAuthClientId,
-    authorization_id: OAuthClientAuthorizationId,
+    authorization_id: DBOAuthClientAuthorizationId,
     scopes: Scopes,
     redirect_uris: OAuthRedirectUris,
     state: Option<String>,

apps/labrinth/.sqlx/query-46c32719ad68b667e816f58f55b5b4829bff8f0fbb039a0eda7bf08a430ba466.json

@@ -1,6 +1,6 @@
 use super::errors::OAuthError;
 use crate::auth::oauth::OAuthErrorType;
-use crate::database::models::OAuthClientId;
+use crate::database::models::DBOAuthClientId;
 use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
@@ -16,7 +16,7 @@ impl ValidatedRedirectUri {
     pub fn validate<'a>(
         to_validate: &Option<String>,
         validate_against: impl IntoIterator<Item = &'a str> + Clone,
-        client_id: OAuthClientId,
+        client_id: DBOAuthClientId,
     ) -> Result<Self, OAuthError> {
         if let Some(first_client_redirect_uri) =
             validate_against.clone().into_iter().next()
@@ -61,7 +61,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &None,
             validate_against.clone(),
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         )
         .unwrap();
 
@@ -82,7 +82,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &Some(to_validate.clone()),
             validate_against,
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         )
         .unwrap();
 
@@ -97,7 +97,7 @@ mod tests {
         let validated = ValidatedRedirectUri::validate(
             &Some(to_validate),
             validate_against,
-            OAuthClientId(0),
+            DBOAuthClientId(0),
         );
 
         assert!(validated.is_err_and(|e| matches!(

apps/labrinth/.sqlx/query-061a3e43df9464263aaf1555a27c1f4b6a0f381282f4fa75cc13b1d354857578.json renamed to apps/labrinth/.sqlx/query-a91d793778d92844cfe338007e8f25daca0d711e0569b99f14d820ddb1685405.json

@@ -1,5 +1,5 @@
 use crate::database::models::{
-    ChargeId, DatabaseError, ProductPriceId, UserId, UserSubscriptionId,
+    DBChargeId, DBProductPriceId, DBUserId, DBUserSubscriptionId, DatabaseError,
 };
 use crate::models::billing::{
     ChargeStatus, ChargeType, PaymentPlatform, PriceDuration,
@@ -8,23 +8,23 @@ use chrono::{DateTime, Utc};
 use std::convert::{TryFrom, TryInto};
 
 pub struct ChargeItem {
-    pub id: ChargeId,
-    pub user_id: UserId,
-    pub price_id: ProductPriceId,
+    pub id: DBChargeId,
+    pub user_id: DBUserId,
+    pub price_id: DBProductPriceId,
     pub amount: i64,
     pub currency_code: String,
     pub status: ChargeStatus,
     pub due: DateTime<Utc>,
     pub last_attempt: Option<DateTime<Utc>>,
 
     pub type_: ChargeType,
-    pub subscription_id: Option<UserSubscriptionId>,
+    pub subscription_id: Option<DBUserSubscriptionId>,
     pub subscription_interval: Option<PriceDuration>,
 
     pub payment_platform: PaymentPlatform,
     pub payment_platform_id: Option<String>,
 
-    pub parent_charge_id: Option<ChargeId>,
+    pub parent_charge_id: Option<DBChargeId>,
 
     // Net is always in USD
     pub net: Option<i64>,
@@ -53,22 +53,22 @@ impl TryFrom<ChargeResult> for ChargeItem {
 
     fn try_from(r: ChargeResult) -> Result<Self, Self::Error> {
         Ok(ChargeItem {
-            id: ChargeId(r.id),
-            user_id: UserId(r.user_id),
-            price_id: ProductPriceId(r.price_id),
+            id: DBChargeId(r.id),
+            user_id: DBUserId(r.user_id),
+            price_id: DBProductPriceId(r.price_id),
             amount: r.amount,
             currency_code: r.currency_code,
             status: ChargeStatus::from_string(&r.status),
             due: r.due,
             last_attempt: r.last_attempt,
             type_: ChargeType::from_string(&r.charge_type),
-            subscription_id: r.subscription_id.map(UserSubscriptionId),
+            subscription_id: r.subscription_id.map(DBUserSubscriptionId),
             subscription_interval: r
                 .subscription_interval
                 .map(|x| PriceDuration::from_string(&x)),
             payment_platform: PaymentPlatform::from_string(&r.payment_platform),
             payment_platform_id: r.payment_platform_id,
-            parent_charge_id: r.parent_charge_id.map(ChargeId),
+            parent_charge_id: r.parent_charge_id.map(DBChargeId),
             net: r.net,
         })
     }
@@ -100,7 +100,7 @@ impl ChargeItem {
     pub async fn upsert(
         &self,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
-    ) -> Result<ChargeId, DatabaseError> {
+    ) -> Result<DBChargeId, DatabaseError> {
         sqlx::query!(
             r#"
             INSERT INTO charges (id, user_id, price_id, amount, currency_code, charge_type, status, due, last_attempt, subscription_id, subscription_interval, payment_platform, payment_platform_id, parent_charge_id, net)
@@ -144,7 +144,7 @@ impl ChargeItem {
     }
 
     pub async fn get(
-        id: ChargeId,
+        id: DBChargeId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Option<ChargeItem>, DatabaseError> {
         let id = id.0;
@@ -156,7 +156,7 @@ impl ChargeItem {
     }
 
     pub async fn get_from_user(
-        user_id: UserId,
+        user_id: DBUserId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Vec<ChargeItem>, DatabaseError> {
         let user_id = user_id.0;
@@ -174,7 +174,7 @@ impl ChargeItem {
     }
 
     pub async fn get_children(
-        charge_id: ChargeId,
+        charge_id: DBChargeId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Vec<ChargeItem>, DatabaseError> {
         let charge_id = charge_id.0;
@@ -192,7 +192,7 @@ impl ChargeItem {
     }
 
     pub async fn get_open_subscription(
-        user_subscription_id: UserSubscriptionId,
+        user_subscription_id: DBUserSubscriptionId,
         exec: impl sqlx::Executor<'_, Database = sqlx::Postgres>,
     ) -> Result<Option<ChargeItem>, DatabaseError> {
         let user_subscription_id = user_subscription_id.0;
@@ -255,7 +255,7 @@ impl ChargeItem {
     }
 
     pub async fn remove(
-        id: ChargeId,
+        id: DBChargeId,
         transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
     ) -> Result<(), DatabaseError> {
         sqlx::query!(