Switch to Trolley for Modrinth Payments (#727)

* most of trolley

* Switch to trolley for payments

* run prepare

* fix clippy

* fix more

* Fix most tests + bitflags

* Update src/auth/flows.rs

Co-authored-by: Jackson Kruger <jak.kruger@gmail.com>

* Finish trolley

* run prep for merge

* Update src/queue/payouts.rs

Co-authored-by: Jackson Kruger <jak.kruger@gmail.com>

---------

Co-authored-by: Jackson Kruger <jak.kruger@gmail.com>

src/models/collections.rs

@@ -80,7 +80,7 @@ impl std::fmt::Display for CollectionStatus {
 }
 
 impl CollectionStatus {
-    pub fn from_str(string: &str) -> CollectionStatus {
+    pub fn from_string(string: &str) -> CollectionStatus {
         match string {
             "listed" => CollectionStatus::Listed,
             "unlisted" => CollectionStatus::Unlisted,

src/models/pats.rs

@@ -1,4 +1,5 @@
 use super::ids::Base62Id;
+use crate::bitflags_serde_impl;
 use crate::models::ids::UserId;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
@@ -10,8 +11,7 @@ use serde::{Deserialize, Serialize};
 pub struct PatId(pub u64);
 
 bitflags::bitflags! {
-    #[derive(Serialize, Deserialize)]
-    #[serde(transparent)]
+    #[derive(Copy, Clone, Debug)]
     pub struct Scopes: u64 {
         // read a user's email
         const USER_READ_EMAIL = 1 << 0;
@@ -107,6 +107,8 @@ bitflags::bitflags! {
     }
 }
 
+bitflags_serde_impl!(Scopes, u64);
+
 impl Scopes {
     // these scopes cannot be specified in a personal access token
     pub fn restricted() -> Scopes {

src/models/projects.rs

@@ -247,7 +247,7 @@ impl SideType {
         }
     }
 
-    pub fn from_str(string: &str) -> SideType {
+    pub fn from_string(string: &str) -> SideType {
         match string {
             "required" => SideType::Required,
             "optional" => SideType::Optional,
@@ -308,7 +308,7 @@ impl std::fmt::Display for ProjectStatus {
 }
 
 impl ProjectStatus {
-    pub fn from_str(string: &str) -> ProjectStatus {
+    pub fn from_string(string: &str) -> ProjectStatus {
         match string {
             "processing" => ProjectStatus::Processing,
             "rejected" => ProjectStatus::Rejected,
@@ -433,7 +433,7 @@ impl std::fmt::Display for MonetizationStatus {
 }
 
 impl MonetizationStatus {
-    pub fn from_str(string: &str) -> MonetizationStatus {
+    pub fn from_string(string: &str) -> MonetizationStatus {
         match string {
             "force-demonetized" => MonetizationStatus::ForceDemonetized,
             "demonetized" => MonetizationStatus::Demonetized,
@@ -537,7 +537,7 @@ impl From<QueryVersion> for Version {
                     version_id: d.version_id.map(|i| VersionId(i.0 as u64)),
                     project_id: d.project_id.map(|i| ProjectId(i.0 as u64)),
                     file_name: d.file_name,
-                    dependency_type: DependencyType::from_str(d.dependency_type.as_str()),
+                    dependency_type: DependencyType::from_string(d.dependency_type.as_str()),
                 })
                 .collect(),
             game_versions: data.game_versions.into_iter().map(GameVersion).collect(),
@@ -570,7 +570,7 @@ impl std::fmt::Display for VersionStatus {
 }
 
 impl VersionStatus {
-    pub fn from_str(string: &str) -> VersionStatus {
+    pub fn from_string(string: &str) -> VersionStatus {
         match string {
             "listed" => VersionStatus::Listed,
             "draft" => VersionStatus::Draft,
@@ -718,7 +718,7 @@ impl DependencyType {
         }
     }
 
-    pub fn from_str(string: &str) -> DependencyType {
+    pub fn from_string(string: &str) -> DependencyType {
         match string {
             "required" => DependencyType::Required,
             "optional" => DependencyType::Optional,
@@ -753,7 +753,7 @@ impl FileType {
         }
     }
 
-    pub fn from_str(string: &str) -> FileType {
+    pub fn from_string(string: &str) -> FileType {
         match string {
             "required-resource-pack" => FileType::RequiredResourcePack,
             "optional-resource-pack" => FileType::OptionalResourcePack,

src/models/teams.rs

@@ -1,4 +1,5 @@
 use super::ids::Base62Id;
+use crate::bitflags_serde_impl;
 use crate::models::users::User;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -22,8 +23,7 @@ pub struct Team {
 }
 
 bitflags::bitflags! {
-    #[derive(Serialize, Deserialize)]
-    #[serde(transparent)]
+    #[derive(Copy, Clone, Debug)]
     pub struct ProjectPermissions: u64 {
         const UPLOAD_VERSION = 1 << 0;
         const DELETE_VERSION = 1 << 1;
@@ -40,6 +40,8 @@ bitflags::bitflags! {
     }
 }
 
+bitflags_serde_impl!(ProjectPermissions, u64);
+
 impl Default for ProjectPermissions {
     fn default() -> ProjectPermissions {
         ProjectPermissions::UPLOAD_VERSION | ProjectPermissions::DELETE_VERSION
@@ -77,8 +79,7 @@ impl ProjectPermissions {
 }
 
 bitflags::bitflags! {
-    #[derive(Serialize, Deserialize)]
-    #[serde(transparent)]
+    #[derive(Copy, Clone, Debug)]
     pub struct OrganizationPermissions: u64 {
         const EDIT_DETAILS = 1 << 0;
         const EDIT_BODY = 1 << 1;
@@ -94,6 +95,8 @@ bitflags::bitflags! {
     }
 }
 
+bitflags_serde_impl!(OrganizationPermissions, u64);
+
 impl Default for OrganizationPermissions {
     fn default() -> OrganizationPermissions {
         OrganizationPermissions::NONE

src/models/threads.rs

@@ -78,7 +78,7 @@ impl ThreadType {
         }
     }
 
-    pub fn from_str(string: &str) -> ThreadType {
+    pub fn from_string(string: &str) -> ThreadType {
         match string {
             "report" => ThreadType::Report,
             "project" => ThreadType::Project,

src/models/users.rs

@@ -1,5 +1,6 @@
 use super::ids::Base62Id;
 use crate::auth::flows::AuthProvider;
+use crate::bitflags_serde_impl;
 use chrono::{DateTime, Utc};
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
@@ -12,8 +13,7 @@ pub struct UserId(pub u64);
 pub const DELETED_USER: UserId = UserId(127155982985829);
 
 bitflags::bitflags! {
-    #[derive(Serialize, Deserialize)]
-    #[serde(transparent)]
+    #[derive(Copy, Clone, Debug)]
     pub struct Badges: u64 {
         // 1 << 0 unused - ignore + replace with something later
         const MIDAS = 1 << 0;
@@ -29,6 +29,8 @@ bitflags::bitflags! {
     }
 }
 
+bitflags_serde_impl!(Badges, u64);
+
 impl Default for Badges {
     fn default() -> Badges {
         Badges::NONE
@@ -46,12 +48,12 @@ pub struct User {
     pub role: Role,
     pub badges: Badges,
 
-    pub payout_data: Option<UserPayoutData>,
     pub auth_providers: Option<Vec<AuthProvider>>,
     pub email: Option<String>,
     pub email_verified: Option<bool>,
     pub has_password: Option<bool>,
     pub has_totp: Option<bool>,
+    pub payout_data: Option<UserPayoutData>,
 
     // DEPRECATED. Always returns None
     pub github_id: Option<u64>,
@@ -60,77 +62,8 @@ pub struct User {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct UserPayoutData {
     pub balance: Decimal,
-    pub payout_wallet: Option<RecipientWallet>,
-    pub payout_wallet_type: Option<RecipientType>,
-    pub payout_address: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, Clone, Eq, PartialEq, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum RecipientType {
-    Email,
-    Phone,
-    UserHandle,
-}
-
-impl std::fmt::Display for RecipientType {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-        fmt.write_str(self.as_str())
-    }
-}
-
-impl RecipientType {
-    pub fn from_string(string: &str) -> RecipientType {
-        match string {
-            "user_handle" => RecipientType::UserHandle,
-            "phone" => RecipientType::Phone,
-            _ => RecipientType::Email,
-        }
-    }
-
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            RecipientType::Email => "email",
-            RecipientType::Phone => "phone",
-            RecipientType::UserHandle => "user_handle",
-        }
-    }
-}
-
-#[derive(Serialize, Deserialize, Clone, Eq, PartialEq, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum RecipientWallet {
-    Venmo,
-    Paypal,
-}
-
-impl std::fmt::Display for RecipientWallet {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
-        fmt.write_str(self.as_str())
-    }
-}
-
-impl RecipientWallet {
-    pub fn from_string(string: &str) -> RecipientWallet {
-        match string {
-            "venmo" => RecipientWallet::Venmo,
-            _ => RecipientWallet::Paypal,
-        }
-    }
-
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            RecipientWallet::Paypal => "paypal",
-            RecipientWallet::Venmo => "venmo",
-        }
-    }
-
-    pub fn as_str_api(&self) -> &'static str {
-        match self {
-            RecipientWallet::Paypal => "PayPal",
-            RecipientWallet::Venmo => "Venmo",
-        }
-    }
+    pub trolley_id: Option<String>,
+    pub trolley_status: Option<RecipientStatus>,
 }
 
 use crate::database::models::user_item::User as DBUser;
@@ -201,3 +134,89 @@ impl Role {
         }
     }
 }
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Clone, Debug)]
+#[serde(rename_all = "lowercase")]
+pub enum RecipientStatus {
+    Active,
+    Incomplete,
+    Disabled,
+    Archived,
+    Suspended,
+    Blocked,
+}
+
+impl RecipientStatus {
+    pub fn from_string(string: &str) -> RecipientStatus {
+        match string {
+            "active" => RecipientStatus::Active,
+            "incomplete" => RecipientStatus::Incomplete,
+            "disabled" => RecipientStatus::Disabled,
+            "archived" => RecipientStatus::Archived,
+            "suspended" => RecipientStatus::Suspended,
+            "blocked" => RecipientStatus::Blocked,
+            _ => RecipientStatus::Disabled,
+        }
+    }
+
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            RecipientStatus::Active => "active",
+            RecipientStatus::Incomplete => "incomplete",
+            RecipientStatus::Disabled => "disabled",
+            RecipientStatus::Archived => "archived",
+            RecipientStatus::Suspended => "suspended",
+            RecipientStatus::Blocked => "blocked",
+        }
+    }
+}
+
+#[derive(Serialize)]
+pub struct Payout {
+    pub created: DateTime<Utc>,
+    pub amount: Decimal,
+    pub status: PayoutStatus,
+}
+
+#[derive(Serialize, Deserialize, PartialEq, Eq, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum PayoutStatus {
+    Pending,
+    Failed,
+    Processed,
+    Returned,
+    Processing,
+}
+
+impl PayoutStatus {
+    pub fn from_string(string: &str) -> PayoutStatus {
+        match string {
+            "pending" => PayoutStatus::Pending,
+            "failed" => PayoutStatus::Failed,
+            "processed" => PayoutStatus::Processed,
+            "returned" => PayoutStatus::Returned,
+            "processing" => PayoutStatus::Processing,
+            _ => PayoutStatus::Processing,
+        }
+    }
+
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            PayoutStatus::Pending => "pending",
+            PayoutStatus::Failed => "failed",
+            PayoutStatus::Processed => "processed",
+            PayoutStatus::Returned => "returned",
+            PayoutStatus::Processing => "processing",
+        }
+    }
+
+    pub fn is_failed(&self) -> bool {
+        match self {
+            PayoutStatus::Pending => false,
+            PayoutStatus::Failed => true,
+            PayoutStatus::Processed => false,
+            PayoutStatus::Returned => true,
+            PayoutStatus::Processing => false,
+        }
+    }
+}