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>

apps/labrinth/src/models/v2/notifications.rs

@@ -1,14 +1,14 @@
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-
+use crate::models::ids::{ThreadMessageId, VersionId};
 use crate::models::{
     ids::{
         NotificationId, OrganizationId, ProjectId, ReportId, TeamId, ThreadId,
-        ThreadMessageId, UserId, VersionId,
     },
     notifications::{Notification, NotificationAction, NotificationBody},
     projects::ProjectStatus,
 };
+use ariadne::ids::UserId;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize)]
 pub struct LegacyNotification {

apps/labrinth/src/models/v2/projects.rs

@@ -3,17 +3,15 @@ use std::convert::TryFrom;
 use std::collections::HashMap;
 
 use super::super::ids::OrganizationId;
-use super::super::teams::TeamId;
-use super::super::users::UserId;
 use crate::database::models::{DatabaseError, version_item};
 use crate::database::redis::RedisPool;
-use crate::models::ids::{ProjectId, VersionId};
+use crate::models::ids::{ProjectId, TeamId, ThreadId, VersionId};
 use crate::models::projects::{
     Dependency, License, Link, Loader, ModeratorMessage, MonetizationStatus,
     Project, ProjectStatus, Version, VersionFile, VersionStatus, VersionType,
 };
-use crate::models::threads::ThreadId;
 use crate::routes::v2_reroute::{self, capitalize_first};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};

apps/labrinth/src/models/v2/reports.rs

@@ -1,5 +1,6 @@
-use crate::models::ids::{ReportId, ThreadId, UserId};
+use crate::models::ids::{ReportId, ThreadId};
 use crate::models::reports::{ItemType, Report};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 

apps/labrinth/src/models/v2/threads.rs

@@ -2,7 +2,8 @@ use crate::models::ids::{
     ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId,
 };
 use crate::models::projects::ProjectStatus;
-use crate::models::users::{User, UserId};
+use crate::models::users::User;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 

apps/labrinth/src/models/v2/user.rs

@@ -1,10 +1,8 @@
 use crate::{
     auth::AuthProvider,
-    models::{
-        ids::UserId,
-        users::{Badges, Role, UserPayoutData},
-    },
+    models::users::{Badges, Role, UserPayoutData},
 };
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 

apps/labrinth/src/models/v3/billing.rs

@@ -1,14 +1,11 @@
-use crate::models::ids::Base62Id;
-use crate::models::ids::UserId;
+use crate::models::ids::{
+    ChargeId, ProductId, ProductPriceId, UserSubscriptionId,
+};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProductId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Product {
     pub id: ProductId,
@@ -29,11 +26,6 @@ pub enum ProductMetadata {
     },
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProductPriceId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct ProductPrice {
     pub id: ProductPriceId,
@@ -87,11 +79,6 @@ impl PriceDuration {
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct UserSubscriptionId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct UserSubscription {
     pub id: UserSubscriptionId,
@@ -151,11 +138,6 @@ pub enum SubscriptionMetadata {
     Pyro { id: String },
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ChargeId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Charge {
     pub id: ChargeId,

apps/labrinth/src/models/v3/collections.rs

@@ -1,17 +1,10 @@
-use super::{
-    ids::{Base62Id, ProjectId},
-    users::UserId,
-};
+use super::ids::ProjectId;
 use crate::database;
+use crate::models::ids::CollectionId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a specific collection, encoded as base62 for usage in the API
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct CollectionId(pub u64);
-
 /// A collection returned from the API
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Collection {

apps/labrinth/src/models/v3/ids.rs

@@ -1,41 +1,25 @@
-pub use super::collections::CollectionId;
-pub use super::images::ImageId;
-pub use super::notifications::NotificationId;
-pub use super::oauth_clients::OAuthClientAuthorizationId;
-pub use super::oauth_clients::{OAuthClientId, OAuthRedirectUriId};
-pub use super::organizations::OrganizationId;
-pub use super::pats::PatId;
-pub use super::payouts::PayoutId;
-pub use super::projects::{ProjectId, VersionId};
-pub use super::reports::ReportId;
-pub use super::sessions::SessionId;
-pub use super::teams::TeamId;
-pub use super::threads::ThreadId;
-pub use super::threads::ThreadMessageId;
-pub use crate::models::billing::{
-    ChargeId, ProductId, ProductPriceId, UserSubscriptionId,
-};
-pub use ariadne::ids::Base62Id;
-use ariadne::ids::base62_id_impl;
-pub use ariadne::users::UserId;
+use ariadne::ids::base62_id;
 
-base62_id_impl!(ProjectId, ProjectId);
-base62_id_impl!(VersionId, VersionId);
-base62_id_impl!(CollectionId, CollectionId);
-base62_id_impl!(TeamId, TeamId);
-base62_id_impl!(OrganizationId, OrganizationId);
-base62_id_impl!(ReportId, ReportId);
-base62_id_impl!(NotificationId, NotificationId);
-base62_id_impl!(ThreadId, ThreadId);
-base62_id_impl!(ThreadMessageId, ThreadMessageId);
-base62_id_impl!(SessionId, SessionId);
-base62_id_impl!(PatId, PatId);
-base62_id_impl!(ImageId, ImageId);
-base62_id_impl!(OAuthClientId, OAuthClientId);
-base62_id_impl!(OAuthRedirectUriId, OAuthRedirectUriId);
-base62_id_impl!(OAuthClientAuthorizationId, OAuthClientAuthorizationId);
-base62_id_impl!(PayoutId, PayoutId);
-base62_id_impl!(ProductId, ProductId);
-base62_id_impl!(ProductPriceId, ProductPriceId);
-base62_id_impl!(UserSubscriptionId, UserSubscriptionId);
-base62_id_impl!(ChargeId, ChargeId);
+base62_id!(ChargeId);
+base62_id!(CollectionId);
+base62_id!(FileId);
+base62_id!(ImageId);
+base62_id!(NotificationId);
+base62_id!(OAuthAccessTokenId);
+base62_id!(OAuthClientAuthorizationId);
+base62_id!(OAuthClientId);
+base62_id!(OAuthRedirectUriId);
+base62_id!(OrganizationId);
+base62_id!(PatId);
+base62_id!(PayoutId);
+base62_id!(ProductId);
+base62_id!(ProductPriceId);
+base62_id!(ProjectId);
+base62_id!(ReportId);
+base62_id!(SessionId);
+base62_id!(TeamId);
+base62_id!(TeamMemberId);
+base62_id!(ThreadId);
+base62_id!(ThreadMessageId);
+base62_id!(UserSubscriptionId);
+base62_id!(VersionId);

apps/labrinth/src/models/v3/images.rs

@@ -1,18 +1,13 @@
 use super::{
-    ids::{Base62Id, ProjectId, ThreadMessageId, VersionId},
+    ids::{ProjectId, ThreadMessageId, VersionId},
     pats::Scopes,
-    reports::ReportId,
-    users::UserId,
 };
 use crate::database::models::image_item::Image as DBImage;
+use crate::models::ids::{ImageId, ReportId};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ImageId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Image {
     pub id: ImageId,

apps/labrinth/src/models/v3/notifications.rs

@@ -1,20 +1,15 @@
-use super::ids::Base62Id;
 use super::ids::OrganizationId;
-use super::users::UserId;
 use crate::database::models::notification_item::Notification as DBNotification;
 use crate::database::models::notification_item::NotificationAction as DBNotificationAction;
 use crate::models::ids::{
-    ProjectId, ReportId, TeamId, ThreadId, ThreadMessageId, VersionId,
+    NotificationId, ProjectId, ReportId, TeamId, ThreadId, ThreadMessageId,
+    VersionId,
 };
 use crate::models::projects::ProjectStatus;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct NotificationId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Notification {
     pub id: NotificationId,

apps/labrinth/src/models/v3/oauth_clients.rs

@@ -1,29 +1,14 @@
-use super::{
-    ids::{Base62Id, UserId},
-    pats::Scopes,
-};
-use chrono::{DateTime, Utc};
-use serde::{Deserialize, Serialize};
-use serde_with::serde_as;
-
+use super::pats::Scopes;
 use crate::database::models::oauth_client_authorization_item::OAuthClientAuthorization as DBOAuthClientAuthorization;
 use crate::database::models::oauth_client_item::OAuthClient as DBOAuthClient;
 use crate::database::models::oauth_client_item::OAuthRedirectUri as DBOAuthRedirectUri;
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthClientId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthClientAuthorizationId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OAuthRedirectUriId(pub u64);
+use crate::models::ids::{
+    OAuthClientAuthorizationId, OAuthClientId, OAuthRedirectUriId,
+};
+use ariadne::ids::UserId;
+use chrono::{DateTime, Utc};
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 
 #[derive(Deserialize, Serialize)]
 pub struct OAuthRedirectUri {

apps/labrinth/src/models/v3/organizations.rs

@@ -1,15 +1,7 @@
-use super::{
-    ids::{Base62Id, TeamId},
-    teams::TeamMember,
-};
+use super::teams::TeamMember;
+use crate::models::ids::{OrganizationId, TeamId};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct OrganizationId(pub u64);
-
 /// An organization of users who control a project
 #[derive(Serialize, Deserialize)]
 pub struct Organization {

apps/labrinth/src/models/v3/pats.rs

@@ -1,15 +1,9 @@
-use super::ids::Base62Id;
 use crate::bitflags_serde_impl;
-use crate::models::ids::UserId;
+use crate::models::ids::PatId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct PatId(pub u64);
-
 bitflags::bitflags! {
     #[derive(Copy, Clone, Debug)]
     pub struct Scopes: u64 {

apps/labrinth/src/models/v3/payouts.rs

@@ -1,13 +1,9 @@
-use crate::models::ids::{Base62Id, UserId};
+use crate::models::ids::PayoutId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct PayoutId(pub u64);
-
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Payout {
     pub id: PayoutId,

apps/labrinth/src/models/v3/projects.rs

@@ -1,28 +1,16 @@
 use std::collections::{HashMap, HashSet};
 
-use super::ids::{Base62Id, OrganizationId};
-use super::teams::TeamId;
-use super::users::UserId;
 use crate::database::models::loader_fields::VersionField;
 use crate::database::models::project_item::{LinkUrl, QueryProject};
 use crate::database::models::version_item::QueryVersion;
-use crate::models::threads::ThreadId;
+use crate::models::ids::{
+    OrganizationId, ProjectId, TeamId, ThreadId, VersionId,
+};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use validator::Validate;
 
-/// The ID of a specific project, encoded as base62 for usage in the API
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug, Hash)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ProjectId(pub u64);
-
-/// The ID of a specific version of a project
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct VersionId(pub u64);
-
 /// A project returned from the API
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Project {

apps/labrinth/src/models/v3/reports.rs

@@ -1,14 +1,9 @@
-use super::ids::Base62Id;
 use crate::database::models::report_item::QueryReport as DBReport;
-use crate::models::ids::{ProjectId, ThreadId, UserId, VersionId};
+use crate::models::ids::{ProjectId, ReportId, ThreadId, VersionId};
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ReportId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Report {
     pub id: ReportId,

apps/labrinth/src/models/v3/sessions.rs

@@ -1,13 +1,8 @@
-use super::ids::Base62Id;
-use crate::models::users::UserId;
+use crate::models::ids::SessionId;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Hash, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct SessionId(pub u64);
-
 #[derive(Serialize, Deserialize, Clone)]
 pub struct Session {
     pub id: SessionId,

apps/labrinth/src/models/v3/teams.rs

@@ -1,15 +1,9 @@
-use super::ids::Base62Id;
 use crate::bitflags_serde_impl;
+use crate::models::ids::TeamId;
 use crate::models::users::User;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 
-/// The ID of a team
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct TeamId(pub u64);
-
 pub const DEFAULT_ROLE: &str = "Member";
 
 /// A team of users who control a project

apps/labrinth/src/models/v3/threads.rs

@@ -1,20 +1,12 @@
-use super::ids::{Base62Id, ImageId};
-use crate::models::ids::{ProjectId, ReportId};
+use crate::models::ids::{
+    ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId,
+};
 use crate::models::projects::ProjectStatus;
-use crate::models::users::{User, UserId};
+use crate::models::users::User;
+use ariadne::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ThreadId(pub u64);
-
-#[derive(Copy, Clone, PartialEq, Eq, Serialize, Deserialize, Debug)]
-#[serde(from = "Base62Id")]
-#[serde(into = "Base62Id")]
-pub struct ThreadMessageId(pub u64);
-
 #[derive(Serialize, Deserialize)]
 pub struct Thread {
     pub id: ThreadId,

apps/labrinth/src/models/v3/users.rs

@@ -1,5 +1,6 @@
 use crate::{auth::AuthProvider, bitflags_serde_impl};
-pub use ariadne::users::{UserId, UserStatus};
+use ariadne::ids::UserId;
+pub use ariadne::users::UserStatus;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};