Integrate with Aditude API for payouts (#965)

* Integrate with Aditude API for payouts * Update expiry * Fix tests
modrinth · Sep 12, 2024 · edb7e5f · edb7e5f
1 parent 5b55991
commit edb7e5f
Show file tree

Hide file tree

Showing 19 changed files with 485 additions and 242 deletions.
diff --git a/.env b/.env
@@ -98,9 +98,9 @@ CLICKHOUSE_DATABASE=staging_ariadne
 
 MAXMIND_LICENSE_KEY=none
 
-PAYOUTS_BUDGET=100
-
 FLAME_ANVIL_URL=none
 
 STRIPE_API_KEY=none
-STRIPE_WEBHOOK_SECRET=none
+STRIPE_WEBHOOK_SECRET=none
+
+ADITUDE_API_KEY=none
diff --git a/.sqlx/query-0379424a41b12db94c7734086fca5b96c8cdfe0a9f9c00e5c67e6b95a33c8c6b.json b/.sqlx/query-0379424a41b12db94c7734086fca5b96c8cdfe0a9f9c00e5c67e6b95a33c8c6b.json
diff --git a/.sqlx/query-0a31f7b04f4b68c556bdbfe373ef7945741f915d4ae657363fe67db46e8bd4cf.json b/.sqlx/query-0a31f7b04f4b68c556bdbfe373ef7945741f915d4ae657363fe67db46e8bd4cf.json
diff --git a/.sqlx/query-0bd68c1b7c90ddcdde8c8bbd8362c6d0c7fb15e375d734bf34c365e71d623780.json b/.sqlx/query-0bd68c1b7c90ddcdde8c8bbd8362c6d0c7fb15e375d734bf34c365e71d623780.json
diff --git a/.sqlx/query-1280600bf1bf7b4f0d19d0de0ca5adc8115925320edc35d189bf177ad2b7317a.json b/.sqlx/query-1280600bf1bf7b4f0d19d0de0ca5adc8115925320edc35d189bf177ad2b7317a.json
diff --git a/.sqlx/query-3db83286f5aea07f399db451bfd6d90c9bb2bd94b6d8accb3d2e0906bb289798.json b/.sqlx/query-3db83286f5aea07f399db451bfd6d90c9bb2bd94b6d8accb3d2e0906bb289798.json
diff --git a/...4388ab4ec25c0d81c2d5809cf011e49d0a6c.json → ...2075dd09094b44d2aea2910011eb56778ee0.json b/...4388ab4ec25c0d81c2d5809cf011e49d0a6c.json → ...2075dd09094b44d2aea2910011eb56778ee0.json
diff --git a/.sqlx/query-67d494c0b8818b3df09d091400626271156754cabcaad1df7c0d9576b3273a6c.json b/.sqlx/query-67d494c0b8818b3df09d091400626271156754cabcaad1df7c0d9576b3273a6c.json
diff --git a/.sqlx/query-e1c24a57013cbc64f463d3a49cb68989eced49b475c0bbab90b21908ae0e77b4.json b/.sqlx/query-e1c24a57013cbc64f463d3a49cb68989eced49b475c0bbab90b21908ae0e77b4.json
diff --git a/...8e131513dd7e9d2c46432ca797f6422c6ecf.json → ...b0c1930289eb797cf340d961ac69d2c2ceba.json b/...8e131513dd7e9d2c46432ca797f6422c6ecf.json → ...b0c1930289eb797cf340d961ac69d2c2ceba.json
diff --git a/.sqlx/query-ff474fba4d18f7788b1a1900a6e5549f0899689e857634cfc5d85bd7b8718c46.json b/.sqlx/query-ff474fba4d18f7788b1a1900a6e5549f0899689e857634cfc5d85bd7b8718c46.json
diff --git a/migrations/20240911044738_payouts-updates.sql b/migrations/20240911044738_payouts-updates.sql
@@ -0,0 +1,2 @@
+ALTER TABLE payouts_values ADD COLUMN date_available timestamptz NOT NULL DEFAULT now();
+ALTER TABLE payouts_values ALTER COLUMN date_available DROP DEFAULT;
diff --git a/src/auth/validate.rs b/src/auth/validate.rs
@@ -9,6 +9,7 @@ use crate::routes::internal::session::get_session_metadata;
 use actix_web::http::header::{HeaderValue, AUTHORIZATION};
 use actix_web::HttpRequest;
 use chrono::Utc;
+use rust_decimal::Decimal;
 
 pub async fn get_user_from_headers<'a, E>(
  req: &HttpRequest,
@@ -66,7 +67,7 @@ where
  paypal_address: db_user.paypal_email,
  paypal_country: db_user.paypal_country,
  venmo_handle: db_user.venmo_handle,
- balance: db_user.balance,
+ balance: Decimal::ZERO,
  }),
  stripe_customer_id: db_user.stripe_customer_id,
  };

diff --git a/src/database/models/user_item.rs b/src/database/models/user_item.rs
@@ -7,7 +7,6 @@ use crate::models::ids::base62_impl::{parse_base62, to_base62};
 use crate::models::users::Badges;
 use chrono::{DateTime, Utc};
 use dashmap::DashMap;
-use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use std::fmt::{Debug, Display};
 use std::hash::Hash;
@@ -45,8 +44,6 @@ pub struct User {
  pub created: DateTime<Utc>,
  pub role: String,
  pub badges: Badges,
-
- pub balance: Decimal,
 }
 
 impl User {
@@ -169,7 +166,6 @@ impl User {
  SELECT id, email,
  avatar_url, raw_avatar_url, username, bio,
  created, role, badges,
- balance,
  github_id, discord_id, gitlab_id, google_id, steam_id, microsoft_id,
  email_verified, password, totp_secret, paypal_id, paypal_country, paypal_email,
  venmo_handle, stripe_customer_id
@@ -198,7 +194,6 @@ impl User {
  created: u.created,
  role: u.role,
  badges: Badges::from_bits(u.badges as u64).unwrap_or_default(),
- balance: u.balance,
  password: u.password,
  paypal_id: u.paypal_id,
  paypal_country: u.paypal_country,