Merge pull request #21 from HeySlava/by_category

Group by category and year_month

bot/services/report_service.py

@@ -51,7 +51,7 @@ def get_report_by_month(
     )
 
     return [
-            f'{getattr(r, by_month_year)}  |  {r.unit} {r.total}' for
+            f'{getattr(r, by_month_year)}  |  {r.total} {r.unit}' for
             r in
             session.execute(select(stmt))
         ]
@@ -61,9 +61,11 @@ def get_report_by_category(
         user: User,
         session: Session,
 ) -> List[str]:
-    stmt = (
+    by_month_year = 'month_year'
+    subq = (
         select(
             Expense.user_id,
+            func.strftime('%m-%Y', Expense.cdate_tz).label(by_month_year),
             Expense.item_name,
             Expense.unit,
             func.sum(Expense.price).label('total'),
@@ -72,9 +74,13 @@ def get_report_by_category(
             Expense.user_id == user.id,
             ~Expense.is_replenishment,
         )
-        .group_by(Expense.user_id, Expense.item_name, Expense.unit)
-        .order_by(Expense.item_name)
+        .group_by(Expense.user_id, by_month_year, Expense.item_name, Expense.unit)
+        .order_by(by_month_year, Expense.item_name)
+        .subquery()
     )
 
-    rows = session.execute(stmt)
-    return [f'{row.tuple()[1]}  |  {row.tuple()[3]} {row.tuple()[2]}' for row in rows]
+    return [
+            f'{r.item_name} ({getattr(r, by_month_year)})  |  {r.total} {r.unit}' for
+            r in
+            session.execute(select(subq))
+        ]