dao-treasury 0.1.1__cp311-cp311-win_amd64.whl → 0.1.2__cp311-cp311-win_amd64.whl

dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow (Including Unsorted).json

@@ -73,7 +73,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -134,7 +134,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Expenses' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -195,7 +195,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Cost of Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -256,7 +256,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Income' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Other Income' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -317,7 +317,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Other Expenses' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -379,7 +379,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN p.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Other Income' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Other Expenses' THEN p.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)' THEN p.value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum p\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT (\n  SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Expenses' THEN value_usd ELSE 0 END)\n  + SUM(CASE WHEN top_category = 'Other Income' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n  + SUM(CASE WHEN top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum\nWHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -495,7 +495,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT to_timestamp(p.timestamp) AS \"timestamp\",\n       SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN p.value_usd ELSE 0 END) AS \"Total Received\",\n       SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)') THEN p.value_usd ELSE 0 END) * -1 AS \"Total Sent\",\n       SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN p.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)') THEN p.value_usd ELSE 0 END) AS \"Net\"\nFROM usdvalue_presum AS p\nJOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
+          "rawSql": "SELECT to_timestamp(timestamp) AS \"timestamp\",\n       SUM(CASE WHEN top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN value_usd ELSE 0 END) AS \"Total Received\",\n       SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)') THEN value_usd ELSE 0 END) * -1 AS \"Total Sent\",\n       SUM(CASE WHEN top_category in ('Revenue', 'Other Income','Sort Me (Inbound)') THEN value_usd ELSE 0 END) - SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses','Other Expenses','Sort Me (Outbound)') THEN value_usd ELSE 0 END) AS \"Net\"\nFROM usdvalue_presum\nWHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000\nGROUP BY timestamp\nORDER BY timestamp;",
           "refId": "A",
           "timeColumns": ["timestamp"]
         }
@@ -647,7 +647,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Sort Me (Inbound)' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Sort Me (Inbound)' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -708,7 +708,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Sort Me (Outbound)' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Sort Me (Outbound)' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -769,7 +769,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN p.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Other Income' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Other Expenses' THEN p.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Sort Me (Inbound)' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Sort Me (Outbound)' THEN p.value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum p\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT (\n  SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Expenses' THEN value_usd ELSE 0 END)\n  + SUM(CASE WHEN top_category = 'Other Income' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n  + SUM(CASE WHEN top_category = 'Sort Me (Inbound)' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Sort Me (Outbound)' THEN value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum\nWHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -794,5 +794,5 @@
   "title": "Total Cashflow Summary (Including Unsorted)",
   "description": "Offers a complete picture of all DAO cashflows, including both sorted and unsorted transactions. This dashboard is ideal for tracking transactions still pending categorization and understanding their impact on overall cashflow.",
   "uid": "2b6e7c1d-8f4a-4e3b-9b2a-1c7d8e9f0a2b",
-  "version": 105
+  "version": 106
 }

dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json

@@ -73,7 +73,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -134,7 +134,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Expenses' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -195,7 +195,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Cost of Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -256,7 +256,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Income' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Other Income' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -317,7 +317,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Other Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Other Expenses' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -379,7 +379,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN p.value_usd ELSE 0 END)\n  + SUM(CASE WHEN gh.top_category = 'Other Income' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Other Expenses' THEN p.value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum p\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT (\n  SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Expenses' THEN value_usd ELSE 0 END)\n  + SUM(CASE WHEN top_category = 'Other Income' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Other Expenses' THEN value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum\nWHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -495,7 +495,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT to_timestamp(p.timestamp) AS \"timestamp\", SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN p.value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN p.value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN gh.top_category in ('Revenue', 'Other Income') THEN p.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN p.value_usd ELSE 0 END) AS \"Net\" FROM usdvalue_presum AS p JOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id WHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
+          "rawSql": "SELECT to_timestamp(timestamp) AS \"timestamp\", SUM(CASE WHEN top_category in ('Revenue', 'Other Income') THEN value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN top_category in ('Revenue', 'Other Income') THEN value_usd ELSE 0 END) - SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses','Other Expenses') THEN value_usd ELSE 0 END) AS \"Net\" FROM usdvalue_presum WHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
           "refId": "A",
           "timeColumns": ["timestamp"]
         }
@@ -591,5 +591,5 @@
   "title": "Total Cashflow Summary",
   "description": "Shows all sorted cashflows, including Revenue, Cost of Revenue, Expenses, Other Income, and Other Expense, but omits transactions pending categorization. Useful for analyzing the DAO's complete sorted financial flows.",
   "uid": "7e2b1c8a-4e2d-4b7a-9c1a-2f8e6b7d9c3f",
-  "version": 105
+  "version": 107
 }

dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json

@@ -73,7 +73,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -134,7 +134,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Cost of Revenue' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Cost of Revenue' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -195,7 +195,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT SUM(p.value_usd) AS total_revenue FROM usdvalue_presum p JOIN txgroup_hierarchy gh USING (txgroup_id) WHERE gh.top_category = 'Expenses' AND p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT SUM(value_usd) AS total_revenue FROM usdvalue_presum WHERE top_category = 'Expenses' AND timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -257,7 +257,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT (\n  SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Cost of Revenue' THEN p.value_usd ELSE 0 END)\n  - SUM(CASE WHEN gh.top_category = 'Expenses' THEN p.value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum p\nJOIN txgroup_hierarchy gh USING (txgroup_id)\nWHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000",
+          "rawSql": "SELECT (\n  SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Cost of Revenue' THEN value_usd ELSE 0 END)\n  - SUM(CASE WHEN top_category = 'Expenses' THEN value_usd ELSE 0 END)\n) AS total_net\nFROM usdvalue_presum\nWHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000",
           "refId": "A",
           "timeColumns": ["time", "ts"]
         }
@@ -373,7 +373,7 @@
         {
           "datasource": "PostgreSQL",
           "format": "table",
-          "rawSql": "SELECT to_timestamp(p.timestamp) AS \"timestamp\", SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN p.value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN gh.top_category = 'Revenue' THEN p.value_usd ELSE 0 END) - SUM(CASE WHEN gh.top_category in ('Cost of Revenue','Expenses') THEN p.value_usd ELSE 0 END) AS \"Net\" FROM usdvalue_presum AS p JOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id WHERE p.timestamp >= $__from/1000 AND p.timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
+          "rawSql": "SELECT to_timestamp(timestamp) AS \"timestamp\", SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END) AS \"Total Revenue\", SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses') THEN value_usd ELSE 0 END) * -1 AS \"Total Expenses\", SUM(CASE WHEN top_category = 'Revenue' THEN value_usd ELSE 0 END) - SUM(CASE WHEN top_category in ('Cost of Revenue','Expenses') THEN value_usd ELSE 0 END) AS \"Net\" FROM usdvalue_presum WHERE timestamp >= $__from/1000 AND timestamp <= $__to/1000 GROUP BY timestamp ORDER BY timestamp;",
           "refId": "A",
           "timeColumns": ["timestamp"]
         }
@@ -469,5 +469,5 @@
   "title": "Operating Cashflow Summary",
   "description": "Provides a focused view of core operational cashflows, including only sorted transactions in Revenue, Cost of Revenue, and Expenses categories. Excludes unsorted transactions and non-operational activity, helping monitor specifically the DAO's operational financial flows.",
   "uid": "fdf9969c-357a-4203-ae7b-12816e87bc7e",
-  "version": 105
+  "version": 106
 }

dao_treasury/db.py

@@ -1481,11 +1481,13 @@ def create_usdval_presum_matview() -> None:
         DROP MATERIALIZED VIEW IF EXISTS usdvalue_presum;
         CREATE MATERIALIZED VIEW usdvalue_presum AS
         SELECT
-            txgroup_id,
-            timestamp,
+            gl.txgroup_id,
+            gh.top_category,
+            gl.timestamp,
             SUM(value_usd) AS value_usd
-        FROM general_ledger
-        GROUP BY txgroup_id, timestamp;
+        FROM general_ledger gl
+        JOIN txgroup_hierarchy gh USING (txgroup_id)
+        GROUP BY gl.txgroup_id, gh.top_category, gl.timestamp;
         
         -- Indexes
         CREATE UNIQUE INDEX idx_usdvalue_presum_txgroup_id_timestamp
@@ -1493,6 +1495,18 @@ def create_usdval_presum_matview() -> None:
 
         CREATE UNIQUE INDEX idx_usdvalue_presum_timestamp_txgroup_id
             ON usdvalue_presum (timestamp, txgroup_id);
+
+        CREATE INDEX idx_usdvalue_presum_top_category_timestamp
+            ON usdvalue_presum (top_category, timestamp);
+
+        CREATE INDEX idx_usdvalue_presum_timestamp_top_category
+            ON usdvalue_presum (timestamp, top_category);
+
+        CREATE UNIQUE INDEX idx_usdvalue_presum_top_category_txgroup_id_timestamp
+            ON usdvalue_presum (top_category, txgroup_id, timestamp);
+
+        CREATE UNIQUE INDEX idx_usdvalue_presum_timestamp_top_category_txgroup_id
+            ON usdvalue_presum (timestamp, top_category, txgroup_id);
         """
     )
 
@@ -1507,14 +1521,13 @@ def create_usdval_presum_revenue_matview() -> None:
         SELECT
             p.txgroup_id,
             t.name AS txgroup_name,
-            gh.top_category,
+            p.top_category,
             p.timestamp,
             SUM(p.value_usd) AS value_usd
-        FROM general_ledger p
-        JOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id
+        FROM usdvalue_presum p
         JOIN txgroups t ON p.txgroup_id = t.txgroup_id
-        WHERE gh.top_category IN ('Revenue', 'Other Income')
-        GROUP BY p.txgroup_id, t.name, gh.top_category, p.timestamp;
+        WHERE p.top_category IN ('Revenue', 'Other Income')
+        GROUP BY p.txgroup_id, t.name, p.top_category, p.timestamp;
 
         -- Indexes
         CREATE UNIQUE INDEX idx_usdvalue_presum_revenue_txgroup_id_timestamp
@@ -1548,14 +1561,14 @@ def create_usdval_presum_expenses_matview() -> None:
         SELECT
             p.txgroup_id,
             g.name AS txgroup_name,
-            gh.top_category,
+            p.top_category,
             p.timestamp,
             SUM(p.value_usd) AS value_usd
-        FROM general_ledger p
+        FROM usdvalue_presum p
         JOIN txgroup_hierarchy gh ON p.txgroup_id = gh.txgroup_id
         JOIN txgroups g ON p.txgroup_id = g.txgroup_id
-        WHERE gh.top_category IN ('Expenses', 'Cost of Revenue', 'Other Expense')
-        GROUP BY p.txgroup_id, g.name, gh.top_category, p.timestamp;
+        WHERE p.top_category IN ('Expenses', 'Cost of Revenue', 'Other Expense')
+        GROUP BY p.txgroup_id, g.name, p.top_category, p.timestamp;
 
         -- Indexes
         CREATE UNIQUE INDEX idx_usdvalue_presum_expenses_txgroup_id_timestamp

{dao_treasury-0.1.1.dist-info → dao_treasury-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.1.1
+Version: 0.1.2
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers

{dao_treasury-0.1.1.dist-info → dao_treasury-0.1.2.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dao_treasury__mypyc.cp311-win_amd64.pyd,sha256=EgbH2bP9FGZEWLznZ58naiEBC2wdcoK92hcAkaK4tgc,279552
+dao_treasury__mypyc.cp311-win_amd64.pyd,sha256=NZVGtxvVdKjkxDUPZ0YvATxbLeI5gYT68ufr9IKuTeQ,279552
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=LS_D4ALB3BO-vYKyh1tzRHi10QBE6f654Zy8pmJ_xPY,656
 dao_treasury/__init__.py,sha256=fEHZYMeNqVUI9YAVXCHozxDB7cvJJnaF4HBRyeAlOiw,1435
-dao_treasury/_docker.cp311-win_amd64.pyd,sha256=xV1vXf4k0Y1UpJ6T0gZCPG0zAXY9Yz8Mb6yGEh5rKZk,10752
+dao_treasury/_docker.cp311-win_amd64.pyd,sha256=lbvN_icLAcGkqRrv_Gfk69wabttAcM-F_76iFsZdcss,10752
 dao_treasury/_docker.py,sha256=yAMcwXl48hGPN2sH5b56O_XP3wrd1gap959Xrk8KpKM,6337
-dao_treasury/_nicknames.cp311-win_amd64.pyd,sha256=vWALUm21t1Z0aSs2aSAOXaItPZWghXYpfKlmr88Zb3k,10752
+dao_treasury/_nicknames.cp311-win_amd64.pyd,sha256=5FYQBA4CP92NsDSjwqZJtZO_hLIlP6hNWXNnQENS_kE,10752
 dao_treasury/_nicknames.py,sha256=4Smlv4y5248PM-yDEyybbR1Of1-tIHgf0PCBAXTE3Aw,1071
-dao_treasury/_wallet.cp311-win_amd64.pyd,sha256=xqt3Fl8cMmttAxP75ysWjLFr4OJ_O7keT9QOy4NC6FI,10752
+dao_treasury/_wallet.cp311-win_amd64.pyd,sha256=OUH3Wt1Nhhsya3wLupaN_nQlElnWIZjC1gVC9d0LkzE,10752
 dao_treasury/_wallet.py,sha256=nHBAKFJstdKuYbvpskGVx2KU80YrZHGHsEh5V3TwIHs,10712
-dao_treasury/constants.cp311-win_amd64.pyd,sha256=8TqggPTdOS0Q6m5HRHKPBWrMXKALR3VcaAhJ3przuwo,10752
+dao_treasury/constants.cp311-win_amd64.pyd,sha256=RX8GGxe1Map-PGMoq6JrL8AAV8KRnohxTY-bOX-Fkfk,10752
 dao_treasury/constants.py,sha256=-T0oPw7lC5YeaiplHAtYL-2ss7knvKrJKQ1LCc8kX8g,1483
-dao_treasury/db.py,sha256=5-S8Ax2Buwhfg8Mo9Jad1hbn7hrbWj_r6HgCzgCmsZg,59827
+dao_treasury/db.py,sha256=Oqas3o8Fdy3_ktAzMaSMWH0WxfyJP7X0tJdBeh4n8yE,60436
 dao_treasury/docker-compose.yaml,sha256=Javd6LIxF2nOpKWRsDYe-VVWBjMGprsXyUK4DGaLLO8,1670
 dao_treasury/main.py,sha256=THzDHwJQPbLXUpHqbiCncQeqpvKQUz6ae63frX5LlzU,9733
 dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/treasury.py,sha256=K4XOg-5BHoP5HoRlHNu4afNpYs2-8sjCOOGwdt3M21w,7541
-dao_treasury/types.cp311-win_amd64.pyd,sha256=j3AKrqWkPJ0r7-LHv8OEmkpD1_bH2qOQELzhQPy5N6Q,10752
+dao_treasury/types.cp311-win_amd64.pyd,sha256=PR8RtzCgiZuBrlxnZSIeGbpFMzlrRobVzCdid_FOeqc,10752
 dao_treasury/types.py,sha256=KFz4WKPp4t_RBwIT6YGwOcgbzw8tdHIOcXTFsUA0pJA,3818
 dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=to_cVfl8X6-5zVskkDxNtTE191TH52XO2peGfHPI5F0,201
 dao_treasury/.grafana/provisioning/dashboards/breakdowns/Expenses.json,sha256=aBwKDj5HBkSXlSt5L7Cg_Ce5yK0VaRKAWVe19j-HCgQ,17809
@@ -23,31 +23,31 @@ dao_treasury/.grafana/provisioning/dashboards/streams/LlamaPay.json,sha256=ukfBK
 dao_treasury/.grafana/provisioning/dashboards/summary/Monthly.json,sha256=KMGAaagwRWBHw3IN4NljCUIIOwu-3Gp0VSnkMzDrcO4,12708
 dao_treasury/.grafana/provisioning/dashboards/transactions/Treasury Transactions.json,sha256=lRPynOn4Zy6WpZLz8-Px2kjflZLRcT8TA6VIz-_VGNM,13815
 dao_treasury/.grafana/provisioning/dashboards/transactions/Unsorted Transactions.json,sha256=cBY3EqFpf9F7B8TaM9yESQatBpe4yFFmyLAiZEul_IE,19107
-dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow (Including Unsorted).json,sha256=k6hU_pZTmaWd2bYP8762yF_WoqR0PlVuoyiVgfrfwoM,24542
-dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=GZmgROCKfRQnCV7TP_yBJZRFdPy3TsTs6d6GNilqyP8,17829
+dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow (Including Unsorted).json,sha256=mfKHcSzP2p1_34wOa5LNyv_j2M2hqOlYB4u5mlIpYfc,23886
+dao_treasury/.grafana/provisioning/dashboards/treasury/Cashflow.json,sha256=4DowQdq-4w8VZrdVXzyl56Ngd-EbvSxsRkXstIa0SAg,17383
 dao_treasury/.grafana/provisioning/dashboards/treasury/Current Treasury Assets.json,sha256=4tsEWzkBM9eQVNnDECM9lGOO26mvcFJofltY-QDfU2M,25112
 dao_treasury/.grafana/provisioning/dashboards/treasury/Historical Treasury Balances.json,sha256=53fCotzJSElELRS1ABNkXX0_CG1_gBLHpjOthhYTDnw,136157
-dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=78QjkFAWl6ySUvLvpbDt0OE-WzL2hg_qC_YLYOq_faY,14155
+dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=16Ue5dPjrDWP--YWnPZlBUqeXoys510gqxM3ALE_R8k,13831
 dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=TGuZ9h4aHsDkDW39aSjoy9HZYwvht7zX_0oosAGdE98,427
-dao_treasury/sorting/__init__.cp311-win_amd64.pyd,sha256=K0OwfCF8aRJ2cPq5t4cTYbD1TLvlHkOnidUAdVa__is,10752
+dao_treasury/sorting/__init__.cp311-win_amd64.pyd,sha256=4fis-uzZ4Xv3cd4cyFdPBdJ1OWj9TispPuzbihcF0EU,10752
 dao_treasury/sorting/__init__.py,sha256=z3Bd2HUZjilZfV1cWSHUHagAPEPGyI0S8h6DtBf6w78,11448
-dao_treasury/sorting/_matchers.cp311-win_amd64.pyd,sha256=Jf3u9eQTe3i3hw2RA7e29LNlZIqijhLOVfy_bweNh1k,10752
+dao_treasury/sorting/_matchers.cp311-win_amd64.pyd,sha256=NA4Zmh-C1CkyOwUje95E-SFk1ZblBzoH1NhZKKP-Ks8,10752
 dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp311-win_amd64.pyd,sha256=jsRhrWLOhe10xwle2cg-GUMPCF8E0sHt0iBg10udFFY,10752
+dao_treasury/sorting/_rules.cp311-win_amd64.pyd,sha256=UtSyoGdokLJK56PlSE8EGfrAhZx9sTNYSMdiYsIeLAs,10752
 dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp311-win_amd64.pyd,sha256=i98SUhA_kb7wyYOqghKyLa1mWgBv0lXPAM0YojZyDjU,10752
+dao_treasury/sorting/factory.cp311-win_amd64.pyd,sha256=nC6ao5KtDtW5NdMvzPYglfG_WoKAq1X-tqt47to6ytw,10752
 dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp311-win_amd64.pyd,sha256=_S3RF2vIzjsDe7V330EZK7eKt7C8JBB464eMpmphHmI,10752
+dao_treasury/sorting/rule.cp311-win_amd64.pyd,sha256=Ve8r-gvk652OO26esn28KyUv8J2b3pqEBCoDmf65s0Q,10752
 dao_treasury/sorting/rule.py,sha256=wbL8s0-6dxcCKghUtEDSkLDBnyvggsJ3gt_RawQ6kB4,11972
-dao_treasury/sorting/rules/__init__.cp311-win_amd64.pyd,sha256=KEH83Ia6RAmo1Phl5zQedQKEd5KqEfKmKlLXWjOaJsM,10752
+dao_treasury/sorting/rules/__init__.cp311-win_amd64.pyd,sha256=zIx_eLwBELQZORZ9AR8f8TlTWfH4gYJc9fkDr1nqN4U,10752
 dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
-dao_treasury/sorting/rules/ignore/__init__.cp311-win_amd64.pyd,sha256=TUcCLsbINFEULPu-LttiHbWLwC_xOXbXvAryu2nAgmM,10752
+dao_treasury/sorting/rules/ignore/__init__.cp311-win_amd64.pyd,sha256=Bni0v74J7_akiyUB3MjrGJs3Atqa2t_nf42Pe8R2dRw,10752
 dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
-dao_treasury/sorting/rules/ignore/llamapay.cp311-win_amd64.pyd,sha256=vmHBl6ISIERhg-svL_on-2re5DU2UH-idfrBQ78wEpg,10752
+dao_treasury/sorting/rules/ignore/llamapay.cp311-win_amd64.pyd,sha256=3_Kq_PiY4xR_pm8e_oYdz6r96r1YuCouoRbDzB0yQOQ,10752
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/streams/llamapay.py,sha256=rO1Mh2ndTziR6pnRkKHnQ22a_Yx9PM_-BG7I4dspEZ8,13535
-dao_treasury-0.1.1.dist-info/METADATA,sha256=mJmkyOOAPKNQD6_VxkS-TzRCLT9DJtpPVP2xyii3lOA,8306
-dao_treasury-0.1.1.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
-dao_treasury-0.1.1.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
-dao_treasury-0.1.1.dist-info/RECORD,,
+dao_treasury-0.1.2.dist-info/METADATA,sha256=dYiCD8dHyNXNyZU2kr-q-o-4Hcb432ORsKfwyB4dcTA,8306
+dao_treasury-0.1.2.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
+dao_treasury-0.1.2.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
+dao_treasury-0.1.2.dist-info/RECORD,,