Merge pull request #45 from eguaio/export_by_month

New `exportar_mes` command

Author: sofide

bot/handlers.py

@@ -11,6 +11,7 @@
     get_month_expenses,
     get_month_and_year,
     is_group,
+    get_month_filters,
     new_expense,
     new_payment,
     show_expenses,
@@ -97,6 +98,18 @@ async def export(update, context, user, group):
     )
 
 
+@user_and_group
+async def export_month(update, context, user, group):
+    month, year = get_month_and_year(context.args)
+    expense_filters = get_month_filters(year, month)
+    extra_name = f"{year}-{month}"
+    exporter = ExportExpenses(user, group, extra_name, expense_filters)
+    text = await exporter.run()
+    await context.bot.send_message(
+        chat_id=update.message.chat_id, text=text, parse_mode=ParseMode.MARKDOWN
+    )
+
+
 async def vianda(update, context):
     vianda_message = ViandaMessage(*context.args)
 
@@ -125,6 +138,7 @@ async def unknown(update, context):
     CommandHandler('asado', calc_asado),
     CommandHandler('a', calc_asado),
     CommandHandler('exportar', export),
+    CommandHandler('exportar_mes', export_month),
     CommandHandler('vianda', vianda),
     MessageHandler(filters.COMMAND, unknown),
 ]

bot/utils.py

@@ -329,7 +329,7 @@ async def show_expenses(group, **expense_filters):
     return text
 
 
-async def get_month_expenses(group, year, month):
+def get_month_filters(year, month):
     first_day_of_month = dt.date(year, month, 1)
     if month == 12:
         next_month = 1
@@ -342,6 +342,11 @@ async def get_month_expenses(group, year, month):
         'date__gte': first_day_of_month,
         'date__lt': first_day_of_next_month,
     }
+    return expense_filters
+
+
+async def get_month_expenses(group, year, month):
+    expense_filters = get_month_filters(year, month)
     text = "Gastos del mes {} del año {}\n\n".format(month, year)
     text += await show_expenses(group, **expense_filters)
     return text

use_cases/export.py

@@ -20,10 +20,11 @@ def only_beta_users(username):
 
 class ExportExpenses:
 
-    def __init__(self, user, group, **expense_filters):
+    def __init__(self, user, group, extra_name=None, expense_filters=None):
         self.user = user
         self.group = group
-        self.expense_filters = expense_filters
+        self.expense_filters = expense_filters if expense_filters is not None else {}
+        self.extra_name = extra_name
 
     async def get_expenses(self):
         """
@@ -95,6 +96,8 @@ def get_sheet_url_and_name(self):
         url = settings.GOOGLE_SHEET_URL
 
         name = self.group.name
+        if self.extra_name:
+            name += f"@{self.extra_name}"
 
         return url, name
 
@@ -124,4 +127,3 @@ async def run(self):
         text += f"- Nombre de la nueva pestaña: *\"{worksheet_name}\"*."
 
         return text
-