fix how estimate range is fetched, /calculate route

2026-08-31 12:05:53 +00:00 · 2026-08-26 14:36:07 +01:00
parent 97c6ece304
commit 4ff6ebbe6c
20 changed files with 848 additions and 196 deletions
@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            date_available AS \"date_available!\",\n            SUM(amount) FILTER (WHERE NOT provisional) finalized_sum,\n            SUM(amount) FILTER (WHERE provisional) estimate_sum\n        FROM (\n            SELECT date_available, amount, FALSE provisional\n            FROM payouts_values\n            WHERE user_id = $1\n\n            UNION ALL\n\n            SELECT date_available, amount, TRUE provisional\n            FROM payout_estimates\n            WHERE user_id = $1\n        ) payout_amounts\n        GROUP BY date_available\n        ORDER BY date_available DESC\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "date_available!",
-        "type_info": "Timestamptz"
-      },
-      {
-        "ordinal": 1,
-        "name": "finalized_sum",
-        "type_info": "Numeric"
-      },
-      {
-        "ordinal": 2,
-        "name": "estimate_sum",
-        "type_info": "Numeric"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "01ac9da2281dd65c1b4a3eb5a2b941ba117decea2e953f400bbcabb1ad873a3f"
-}
@@ -1,58 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n\t\t\tSELECT\n\t\t\t\tpayout_periods.period,\n\t\t\t\tpayout_periods.raw_actual_aditude_revenue_usd,\n\t\t\t\tpayout_periods.adjustments AS \"adjustments: Json<Vec<Adjustment>>\",\n\t\t\t\t(\n\t\t\t\t\tSELECT payout_runs.payload\n\t\t\t\t\tFROM payout_runs\n\t\t\t\t\tWHERE payout_runs.period = payout_periods.period\n\t\t\t\t\t\tAND payout_runs.status IN ('scheduled', 'running')\n\t\t\t\t\tLIMIT 1\n\t\t\t\t) AS \"active_run_payload: Json<PayoutRunPayload>\",\n\t\t\t\tEXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM payout_runs\n\t\t\t\t\tWHERE payout_runs.period = payout_periods.period\n\t\t\t\t\t\tAND payout_runs.status = 'scheduled'\n\t\t\t\t) AS \"has_scheduled_run!\",\n\t\t\t\tEXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM payout_runs\n\t\t\t\t\tWHERE payout_runs.period = payout_periods.period\n\t\t\t\t\t\tAND payout_runs.status = 'running'\n\t\t\t\t) AS \"has_running_run!\",\n\t\t\t\tEXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM payout_runs\n\t\t\t\t\tWHERE payout_runs.period = payout_periods.period\n\t\t\t\t\t\tAND payout_runs.status = 'succeeded'\n\t\t\t\t) AS \"has_succeeded_run!\"\n\t\t\tFROM payout_periods\n\t\t\tWHERE payout_periods.period = ANY($1)\n\t\t\t",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "period",
-        "type_info": "Date"
-      },
-      {
-        "ordinal": 1,
-        "name": "raw_actual_aditude_revenue_usd",
-        "type_info": "Numeric"
-      },
-      {
-        "ordinal": 2,
-        "name": "adjustments: Json<Vec<Adjustment>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 3,
-        "name": "active_run_payload: Json<PayoutRunPayload>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 4,
-        "name": "has_scheduled_run!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 5,
-        "name": "has_running_run!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 6,
-        "name": "has_succeeded_run!",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "DateArray"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      null,
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "1d68f3585ac26a38955abf04703e26538972770ea7454fab132da87dad747669"
-}
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payout_estimates (\n                    period,\n                    user_id,\n                    mod_id,\n                    amount,\n                    created,\n                    date_available\n                )\n                VALUES ($1, $2, $3, 30, $4, $5)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Date",
+        "Int8",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "203e4a78f0be92cea79a800018418ab35b74370e7f8d1216e5f7d0a3e1615a4b"
+}
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO payout_periods (\n            period,\n            raw_actual_aditude_revenue_usd,\n            adjustments\n        )\n        VALUES ($1, 100, '[]'::jsonb)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Date"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "291b7a70925bdd5d748048fa08dea1901ce8c2b584ec86921efe6c4d2d279b29"
+}
@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT MAX(date)\n        FROM payout_period_days\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "max",
-        "type_info": "Date"
-      }
-    ],
-    "parameters": {
-      "Left": []
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "3962c046a8877433f2e5afd6064c0dfb11c7093d60093e8265d8cc5937c2c02c"
-}
@@ -0,0 +1,52 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n\t\t\tSELECT\n\t\t\t\tpayout_periods.period,\n\t\t\t\tpayout_periods.raw_actual_aditude_revenue_usd,\n\t\t\t\tpayout_periods.adjustments AS \"adjustments: Json<Vec<Adjustment>>\",\n\t\t\t\tactive_run.payload AS \"active_run_payload: Json<PayoutRunPayload>\",\n\t\t\t\tactive_run.execute_at AS active_run_execute_at,\n\t\t\t\tEXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM payout_runs\n\t\t\t\t\tWHERE payout_runs.period = payout_periods.period\n\t\t\t\t\t\tAND payout_runs.status = 'succeeded'\n\t\t\t\t) AS \"has_succeeded_run!\"\n\t\t\tFROM payout_periods\n\t\t\tLEFT JOIN payout_runs active_run\n\t\t\t\tON active_run.period = payout_periods.period\n\t\t\t\tAND active_run.status IN ('scheduled', 'running')\n\t\t\tWHERE payout_periods.period = ANY($1)\n\t\t\t",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "period",
+        "type_info": "Date"
+      },
+      {
+        "ordinal": 1,
+        "name": "raw_actual_aditude_revenue_usd",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 2,
+        "name": "adjustments: Json<Vec<Adjustment>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 3,
+        "name": "active_run_payload: Json<PayoutRunPayload>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 4,
+        "name": "active_run_execute_at",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 5,
+        "name": "has_succeeded_run!",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "DateArray"
+      ]
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      true,
+      null
+    ]
+  },
+  "hash": "56e3d8b2961562ef5a8be80f71814743f0cd95a7c26e4d0dd5b354d2ac3bbaf1"
+}
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payouts_values (\n                    user_id,\n                    mod_id,\n                    amount,\n                    created,\n                    date_available\n                )\n                VALUES\n                    ($1, $2, 70, $3, $4),\n                    ($1, $2, 30, $5, $6)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "7707d9dba71fde632b52807578af564ffc242b8ec5d081fe1f9272158658e6e1"
+}
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payouts_values (\n                    user_id,\n                    mod_id,\n                    amount,\n                    created,\n                    date_available,\n                    payout_run_id\n                )\n                VALUES ($1, $2, 80, $3, $4, 20002)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "a8928c794adfdaea6673e8dfb9040b0084e18ec880d11c05005c6eb7652e9f20"
+}
@@ -0,0 +1,17 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payouts_values (\n                    user_id,\n                    mod_id,\n                    amount,\n                    created,\n                    date_available,\n                    payout_run_id\n                )\n                VALUES ($1, $2, 40, $3, $4, 20001)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b0f5c8d0879b5d797a4aeaa6b80d040cc1a57429516061ae3ce33ee19fcb04e3"
+}
@@ -0,0 +1,19 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO payout_runs (\n            id,\n            period,\n            payload,\n            status,\n            started_at,\n            started_by,\n            execute_at,\n            processing_started_at,\n            finished_at\n        )\n        VALUES (\n            $1,\n            $2,\n            '{\"raw_actual_revenue_usd\":100,\"adjustments\":[]}'::jsonb,\n            'succeeded',\n            $3,\n            $4,\n            $5,\n            $5,\n            $6\n        )\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Date",
+        "Timestamptz",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "c30e4f1aad62a3a8c278340f051e91476a4fbe3d7774ef9fed712929a5816ecb"
+}
@@ -0,0 +1,46 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT\n            date_available AS \"date_available!\",\n            SUM(amount) FILTER (WHERE NOT provisional) finalized_sum,\n            SUM(amount) FILTER (WHERE provisional) estimate_sum,\n            SUM(amount) FILTER (WHERE authoritative) authoritative_sum,\n            SUM(amount) FILTER (\n                WHERE provisional AND authoritative\n            ) actionable_estimate_sum\n        FROM (\n            SELECT\n                payouts_values.date_available,\n                payouts_values.amount,\n                FALSE provisional,\n                payouts_values.payout_run_id IS NULL\n                    OR payout_runs.status = 'succeeded' authoritative\n            FROM payouts_values\n            LEFT JOIN payout_runs\n                ON payout_runs.id = payouts_values.payout_run_id\n            WHERE payouts_values.user_id = $1\n\n            UNION ALL\n\n            SELECT\n                payout_estimates.date_available,\n                payout_estimates.amount,\n                TRUE provisional,\n                succeeded_periods.period IS NULL authoritative\n            FROM payout_estimates\n            LEFT JOIN (\n                SELECT period\n                FROM payout_runs\n                WHERE status = 'succeeded'\n            ) succeeded_periods\n                ON succeeded_periods.period = payout_estimates.period\n            WHERE payout_estimates.user_id = $1\n        ) payout_amounts\n        GROUP BY date_available\n        ORDER BY date_available DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "date_available!",
+        "type_info": "Timestamptz"
+      },
+      {
+        "ordinal": 1,
+        "name": "finalized_sum",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 2,
+        "name": "estimate_sum",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 3,
+        "name": "authoritative_sum",
+        "type_info": "Numeric"
+      },
+      {
+        "ordinal": 4,
+        "name": "actionable_estimate_sum",
+        "type_info": "Numeric"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "d3ccc0901d209bc77843ab8d8d3c7dc5159b79d99010a7cd145beed301d24b36"
+}
@@ -0,0 +1,18 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                INSERT INTO payout_estimates (\n                    period,\n                    user_id,\n                    mod_id,\n                    amount,\n                    created,\n                    date_available\n                )\n                VALUES ($1, $2, $3, 100, $4, $5)\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Date",
+        "Int8",
+        "Int8",
+        "Timestamptz",
+        "Timestamptz"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f469644456f40b35ad4b56aec37bc8d02a346b77ccb033988aa2d28435d69732"
+}