Final fixes payouts (#471)

* Final fixes payouts * add minimum payout
2022-11-01 09:53:43 -07:00 · 2022-11-01 09:53:43 -07:00 · 35891c74cd
commit 35891c74cd
parent 2ca6e67b37
3 changed files with 136 additions and 118 deletions
--- a/sqlx-data.json
+++ b/sqlx-data.json
@ -967,6 +967,38 @@
    },
    "query": "\n            SELECT id FROM loaders\n            WHERE loader = $1\n            "
  },
+  "2534464b06d567078bcfaa94e0c5e37729db111f5b46c4035cabe72634104b2e": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "user_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "payouts_split",
+          "ordinal": 2,
+          "type_info": "Numeric"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8Array"
+        ]
+      }
+    },
+    "query": "\n            SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split\n            FROM mods m\n            INNER JOIN team_members tm on m.team_id = tm.team_id AND tm.accepted = TRUE\n            WHERE m.id = ANY($1)\n            "
+  },
  "2576a47d17794598f9318d1b2d2892006c8af165a188a8695c0f0b4837082eb9": {
    "describe": {
      "columns": [],
@ -1243,44 +1275,6 @@
    },
    "query": "\n            SELECT u.id, u.github_id, u.name, u.email,\n                u.avatar_url, u.username, u.bio,\n                u.created, u.role, u.badges, u.paypal_email\n            FROM users u\n            WHERE LOWER(u.username) = LOWER($1)\n            "
  },
-  "31a689dcba742809681e02ab2d8803fda64420572f36311c324ce94322bcf42b": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "user_id",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "payouts_split",
-          "ordinal": 2,
-          "type_info": "Numeric"
-        },
-        {
-          "name": "project_type",
-          "ordinal": 3,
-          "type_info": "Varchar"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Int8Array"
-        ]
-      }
-    },
-    "query": "\n        SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split, pt.name project_type\n        FROM mods m\n        INNER JOIN team_members tm on m.team_id = tm.team_id\n        INNER JOIN project_types pt ON pt.id = m.project_type\n        WHERE m.id = ANY($1)\n        "
-  },
  "33a965c7dc615d3b701c05299889357db8dd36d378850625d2602ba471af4885": {
    "describe": {
      "columns": [],
@ -3822,6 +3816,44 @@
    },
    "query": "\n            SELECT id FROM mods\n            WHERE slug = LOWER($1)\n            "
  },
+  "96b2f4e0e619e7ed312d191dc90d64113235d72254fbda8f528ce866d1795cb5": {
+    "describe": {
+      "columns": [
+        {
+          "name": "id",
+          "ordinal": 0,
+          "type_info": "Int8"
+        },
+        {
+          "name": "user_id",
+          "ordinal": 1,
+          "type_info": "Int8"
+        },
+        {
+          "name": "payouts_split",
+          "ordinal": 2,
+          "type_info": "Numeric"
+        },
+        {
+          "name": "project_type",
+          "ordinal": 3,
+          "type_info": "Varchar"
+        }
+      ],
+      "nullable": [
+        false,
+        false,
+        false,
+        false
+      ],
+      "parameters": {
+        "Left": [
+          "Int8Array"
+        ]
+      }
+    },
+    "query": "\n        SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split, pt.name project_type\n        FROM mods m\n        INNER JOIN team_members tm on m.team_id = tm.team_id AND tm.accepted = TRUE\n        INNER JOIN project_types pt ON pt.id = m.project_type\n        WHERE m.id = ANY($1)\n        "
+  },
  "97690dda7edea8c985891cae5ad405f628ed81e333bc88df5493c928a4324d43": {
    "describe": {
      "columns": [
@ -4407,20 +4439,6 @@
    },
    "query": "\n            DELETE FROM dependencies WHERE mod_dependency_id = NULL AND dependency_id = NULL AND dependency_file_name = NULL\n            "
  },
-  "af4339fee915a3bca2faa1efe87afef33c7970794d1624626bcce9a3b5189518": {
-    "describe": {
-      "columns": [],
-      "nullable": [],
-      "parameters": {
-        "Left": [
-          "Int8",
-          "Numeric",
-          "Timestamptz"
-        ]
-      }
-    },
-    "query": "\n                    INSERT INTO payouts_values (user_id, amount, created)\n                    VALUES ($1, $2, $3)\n                    "
-  },
  "b030a9e0fdb75eee8ee50aafdcb6063a073e2aa53cc70d40ed46437c1d0dfe80": {
    "describe": {
      "columns": [],
@ -5022,38 +5040,6 @@
    },
    "query": "\n                    UPDATE versions\n                    SET version_type = $1\n                    WHERE (id = $2)\n                    "
  },
-  "c3cef0e5a0c22330376f34970a6906b80c9201a2f032ae686ff2a70500ccc59d": {
-    "describe": {
-      "columns": [
-        {
-          "name": "id",
-          "ordinal": 0,
-          "type_info": "Int8"
-        },
-        {
-          "name": "user_id",
-          "ordinal": 1,
-          "type_info": "Int8"
-        },
-        {
-          "name": "payouts_split",
-          "ordinal": 2,
-          "type_info": "Numeric"
-        }
-      ],
-      "nullable": [
-        false,
-        false,
-        false
-      ],
-      "parameters": {
-        "Left": [
-          "Int8Array"
-        ]
-      }
-    },
-    "query": "\n            SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split\n            FROM mods m\n            INNER JOIN team_members tm on m.team_id = tm.team_id\n            WHERE m.id = ANY($1)\n            "
-  },
  "c3dcb5a8b798ea6c0922698a007dbc8ab549f5f85bad780da59163f4d6371238": {
    "describe": {
      "columns": [
@ -5142,6 +5128,21 @@
    },
    "query": "\n            INSERT INTO mod_follows (follower_id, mod_id)\n            VALUES ($1, $2)\n            "
  },
+  "c5bfaf443d56825fb1f53ace39c5fecfa14957b66889197754fb3a4eef9a7538": {
+    "describe": {
+      "columns": [],
+      "nullable": [],
+      "parameters": {
+        "Left": [
+          "Int8",
+          "Int8",
+          "Numeric",
+          "Timestamptz"
+        ]
+      }
+    },
+    "query": "\n                        INSERT INTO payouts_values (user_id, mod_id, amount, created)\n                        VALUES ($1, $2, $3, $4)\n                        "
+  },
  "c5d44333c62223bd3e68185d1fb3f95152fafec593da8d06c9b2b665218a02be": {
    "describe": {
      "columns": [],
--- a/src/routes/admin.rs
+++ b/src/routes/admin.rs
@ -5,7 +5,7 @@ use crate::util::guards::admin_key_guard;
 use crate::util::payout_calc::get_claimable_time;
 use crate::DownloadQueue;
 use actix_web::{get, patch, post, web, HttpRequest, HttpResponse};
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, SecondsFormat, Utc};
 use rust_decimal::Decimal;
 use serde::Deserialize;
 use serde_json::json;
@ -99,7 +99,11 @@ pub async fn process_payout(
    pool: web::Data<PgPool>,
    data: web::Json<PayoutData>,
 ) -> Result<HttpResponse, ApiError> {
-    let start = data.date.date().and_hms(0, 0, 0);
+    let start = data
+        .date
+        .date()
+        .and_hms_nano(0, 0, 0, 0)
+        .with_timezone(&Utc);

    let client = reqwest::Client::new();
    let mut transaction = pool.begin().await?;
@ -107,16 +111,16 @@ pub async fn process_payout(
    #[derive(Deserialize)]
    struct PayoutMultipliers {
        sum: u64,
-        values: HashMap<i64, u64>,
+        values: HashMap<String, u64>,
    }

    let multipliers: PayoutMultipliers = client
-        .get(format!(
-            "{}multipliers?start_date=\"{}\"",
-            dotenvy::var("ARIADNE_URL")?,
-            start.to_rfc3339(),
-        ))
+        .get(format!("{}multipliers", dotenvy::var("ARIADNE_URL")?,))
        .header("Modrinth-Admin", dotenvy::var("ARIADNE_ADMIN_KEY")?)
+        .query(&[(
+            "start_date",
+            start.to_rfc3339_opts(SecondsFormat::Nanos, true),
+        )])
        .send()
        .await
        .map_err(|_| {
@ -146,8 +150,8 @@ pub async fn process_payout(
        project_type: String,
        // user_id, payouts_split
        team_members: Vec<(i64, Decimal)>,
-        // user_id, payouts_split
-        split_team_members: Vec<(i64, Decimal)>,
+        // user_id, payouts_split, actual_project_id
+        split_team_members: Vec<(i64, Decimal, i64)>,
    }

    let mut projects_map: HashMap<i64, Project> = HashMap::new();
@ -157,11 +161,11 @@ pub async fn process_payout(
        "
        SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split, pt.name project_type
        FROM mods m
-        INNER JOIN team_members tm on m.team_id = tm.team_id
+        INNER JOIN team_members tm on m.team_id = tm.team_id AND tm.accepted = TRUE
        INNER JOIN project_types pt ON pt.id = m.project_type
        WHERE m.id = ANY($1)
        ",
-        &multipliers.values.keys().map(|x| *x).collect::<Vec<i64>>()
+        &multipliers.values.keys().flat_map(|x| x.parse::<i64>().ok()).collect::<Vec<i64>>()
    )
        .fetch_many(&mut *transaction)
        .try_for_each(|e| {
@ -236,7 +240,7 @@ pub async fn process_payout(
            "
            SELECT m.id id, tm.user_id user_id, tm.payouts_split payouts_split
            FROM mods m
-            INNER JOIN team_members tm on m.team_id = tm.team_id
+            INNER JOIN team_members tm on m.team_id = tm.team_id AND tm.accepted = TRUE
            WHERE m.id = ANY($1)
            ",
            &*fetch_team_members
@ -256,10 +260,10 @@ pub async fn process_payout(
        })
        .await?;

-        for (project, dependencies) in project_dependencies {
+        for (project_id, dependencies) in project_dependencies {
            let dep_sum: i64 = dependencies.iter().map(|x| x.1).sum();

-            let project = projects_map.get_mut(&project);
+            let project = projects_map.get_mut(&project_id);

            if let Some(project) = project {
                for dependency in dependencies {
@ -276,6 +280,7 @@ pub async fn process_payout(
                            project.split_team_members.push((
                                member.0,
                                member_multiplier * project_multiplier,
+                                project_id,
                            ));
                        }
                    }
@ -285,7 +290,7 @@ pub async fn process_payout(
    }

    for (id, project) in projects_map {
-        if let Some(value) = &multipliers.values.get(&id) {
+        if let Some(value) = &multipliers.values.get(&id.to_string()) {
            let project_multiplier: Decimal =
                Decimal::from(**value) / Decimal::from(multipliers.sum);

@ -308,21 +313,23 @@ pub async fn process_payout(
                        &default_split_given
                    });

-                sqlx::query!(
-                    "
-                    INSERT INTO payouts_values (user_id, mod_id, amount, created)
-                    VALUES ($1, $2, $3, $4)
-                    ",
-                    user_id,
-                    id,
-                    payout,
-                    start
-                )
-                    .execute(&mut *transaction)
-                    .await?;
+                if payout > Decimal::from(0) {
+                    sqlx::query!(
+                        "
+                        INSERT INTO payouts_values (user_id, mod_id, amount, created)
+                        VALUES ($1, $2, $3, $4)
+                        ",
+                        user_id,
+                        id,
+                        payout,
+                        start
+                    )
+                        .execute(&mut *transaction)
+                        .await?;
+                }
            }

-            for (user_id, split) in project.split_team_members {
+            for (user_id, split, project_id) in project.split_team_members {
                let payout: Decimal = data.amount
                    * project_multiplier
                    * (split / sum_tm_splits)
@ -330,10 +337,11 @@ pub async fn process_payout(

                sqlx::query!(
                    "
-                    INSERT INTO payouts_values (user_id, amount, created)
-                    VALUES ($1, $2, $3)
+                    INSERT INTO payouts_values (user_id, mod_id, amount, created)
+                    VALUES ($1, $2, $3, $4)
                    ",
                    user_id,
+                    project_id,
                    payout,
                    start
                )
@ -357,7 +365,7 @@ pub async fn get_payout_data(

    use futures::stream::TryStreamExt;

-    let payouts = sqlx::query!(
+    let mut payouts: HashMap<String, Decimal> = sqlx::query!(
            "
            SELECT u.paypal_email, SUM(pv.amount) amount
            FROM payouts_values pv
@ -374,5 +382,8 @@ pub async fn get_payout_data(
        .try_collect::<HashMap<String, Decimal>>()
        .await?;

+    let mut minimum_payout = Decimal::from(5);
+    payouts.retain(|_k, v| v > &mut minimum_payout);
+
    Ok(HttpResponse::Ok().json(payouts))
 }
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@ -123,7 +123,8 @@ pub fn users_config(cfg: &mut web::ServiceConfig) {
            .service(users::user_edit)
            .service(users::user_icon_edit)
            .service(users::user_notifications)
-            .service(users::user_follows),
+            .service(users::user_follows)
+            .service(users::user_payouts),
    );
 }

@ -168,7 +169,12 @@ pub fn reports_config(cfg: &mut web::ServiceConfig) {
 }

 pub fn admin_config(cfg: &mut web::ServiceConfig) {
-    cfg.service(web::scope("admin").service(admin::count_download));
+    cfg.service(
+        web::scope("admin")
+            .service(admin::count_download)
+            .service(admin::process_payout)
+            .service(admin::get_payout_data),
+    );
 }

 pub fn midas_config(cfg: &mut web::ServiceConfig) {