Also load available last month

postgres/categories.sql.go

@@ -169,6 +169,7 @@ type GetCategoriesWithBalanceRow struct {
 	Name               string
 	Group              string
 	Available          Numeric
+	AvailableLastMonth Numeric
 	Activity           Numeric
 	Assigned           Numeric
 }
@@ -187,6 +188,7 @@ func (q *Queries) GetCategoriesWithBalance(ctx context.Context, arg GetCategorie
 			&i.Name,
 			&i.Group,
 			&i.Available,
+			&i.AvailableLastMonth,
 			&i.Activity,
 			&i.Assigned,
 		); err != nil {

postgres/queries/categories.sql

@@ -21,37 +21,32 @@ WHERE category_groups.budget_id = $1;
 
 -- name: GetCategoriesWithBalance :many
 SELECT categories.id, categories.name, category_groups.name as group, 
-    (COALESCE(
     (
-            SELECT SUM(a_hist.amount)
+        COALESCE((
-            FROM assignments a_hist
+            SELECT SUM(a_hist.amount) FROM assignments a_hist
-            WHERE categories.id = a_hist.category_id 
+            WHERE categories.id = a_hist.category_id AND a_hist.date < @to_date
-            AND a_hist.date < @to_date
+        ), 0)+COALESCE((
-        )
+            SELECT SUM(t_hist.amount) FROM transactions t_hist
-    , 0)+COALESCE(
+            WHERE categories.id = t_hist.category_id AND t_hist.date < @to_date
+        ), 0)
+    )::decimal(12,2) as available,
     (
-            SELECT SUM(t_hist.amount)
+        COALESCE((
-            FROM transactions t_hist
+            SELECT SUM(a_hist.amount) FROM assignments a_hist
-            WHERE categories.id = t_hist.category_id 
+            WHERE categories.id = a_hist.category_id AND a_hist.date < @from_date
-            AND t_hist.date < @to_date
+        ), 0)+COALESCE((
-        )
+            SELECT SUM(t_hist.amount) FROM transactions t_hist
-    , 0))::decimal(12,2) as available, 
+            WHERE categories.id = t_hist.category_id AND t_hist.date < @from_date
-    COALESCE(
+        ), 0)
-        (
+    )::decimal(12,2) as available_last_month, 
-            SELECT SUM(t_this.amount)
+    COALESCE((
-            FROM transactions t_this
+            SELECT SUM(t_this.amount) FROM transactions t_this
-            WHERE categories.id = t_this.category_id 
+            WHERE categories.id = t_this.category_id AND t_this.date >= @from_date AND t_this.date < @to_date
-            AND t_this.date >= @from_date AND t_this.date < @to_date
+        ), 0)::decimal(12,2) as activity,
-        )
+    COALESCE((
-    , 0)::decimal(12,2) as activity,
+            SELECT SUM(a_hist.amount) FROM assignments a_hist
-    COALESCE(
+            WHERE categories.id = a_hist.category_id AND a_hist.date >= @from_date AND a_hist.date < @to_date
-        (
+        ), 0)::decimal(12,2) as assigned
-            SELECT SUM(a_hist.amount)
-            FROM assignments a_hist
-            WHERE categories.id = a_hist.category_id 
-            AND a_hist.date >= @from_date AND a_hist.date < @to_date
-        )
-    ,0)::decimal(12,2) as assigned
 
 FROM categories
 INNER JOIN category_groups ON categories.category_group_id = category_groups.id