Fixed issue with montly exenses.

Author: halfdata

app/handlers/books.py

@@ -647,6 +647,10 @@ async def _categories(
                     text=__(messages.BUTTON_TITLE, lang=from_user.language_code),
                     callback_data='/update_title'
                 ),
+                # InlineKeyboardButton(
+                #     text=__(messages.BUTTON_LIMIT, lang=from_user.language_code),
+                #     callback_data='/set_limits'
+                # ),
                 InlineKeyboardButton(
                     text=__(messages.BUTTON_REMOVE, lang=from_user.language_code),
                     callback_data='/delete'
@@ -707,6 +711,10 @@ async def categories_callback(self, call: CallbackQuery, state: FSMContext) -> N
             await state.update_data(category=data['parent_category'])
             await self.category_title(call.message, state, call.from_user)
             return
+        # if call.data == '/set_limits':
+        #     await state.update_data(category=data['parent_category'])
+        #     await self.category_limits(call.message, state, call.from_user)
+        #     return
         if call.data == '/delete':
             category = self.db.get_category_by(
                 book_id=book.id,
@@ -756,6 +764,22 @@ async def categories_callback(self, call: CallbackQuery, state: FSMContext) -> N
         await state.update_data(parent_category=category_id)
         await self._categories(call.message, state, call.from_user)
 
+    # async def category_limits(
+    #     self,
+    #     message: Message,
+    #     state: FSMContext,
+    #     from_user: Optional[User] = None
+    # ) -> None:
+    #     """Displays message to request category limits."""
+    #     await state.set_state(BooksState.category_title)
+    #     from_user = from_user or message.from_user
+    #     await message.answer(
+    #         text=__(
+    #             text_dict=messages.CATEGORIES_SET_LIMITS,
+    #             lang=from_user.language_code
+    #         ).format(title=title),
+    #     )
+
     async def category_title(
         self,
         message: Message,

app/handlers/expenses.py

@@ -215,7 +215,6 @@ async def selector_categories_callback(
                 category_id=(0 if not category else category.id),
                 year=created.year,
                 month=created.month,
-                day=created.day,
             )
             await state.clear()
             if category:

app/utils/messages.py

@@ -249,6 +249,17 @@
     'ru': 'Введите название категории.',
 }
 
+CATEGORIES_SET_LIMITS = {
+    'default': (
+        'Please send monthly limit for category <strong>{title}</strong>. '
+        'Current limit: <strong>{limit}</strong>.'
+    ),
+    'ru': (
+        'Введите месячный лимит для категории <strong>{title}</strong>. '
+        'Текущий лимит: <strong>{limit}</strong>.'
+    ),
+}
+
 EXPENSES_ADD_AMOUNT = {
     'default': (
         'Add <strong>{amount} {currency}</strong> to the book '
@@ -433,6 +444,11 @@
     'ru': '✎ Название',
 }
 
+BUTTON_LIMIT = {
+    'default': '✎ Limits',
+    'ru': '✎ Лимиты',
+}
+
 BUTTON_CURRENCY = {
     'default': '✎ Currency',
     'ru': '✎ Валюта',

app/utils/models.py

@@ -4,7 +4,7 @@
 from typing import Any, Optional
 
 from sqlalchemy import Table, Index, Column
-from sqlalchemy import Integer, String, DateTime, Boolean, Text, Float, Enum
+from sqlalchemy import Integer, String, DateTime, Boolean, Text, Float, Enum, Text
 from sqlalchemy import MetaData, DDL
 from sqlalchemy import create_engine, Engine
 from sqlalchemy import select, insert, update, func, asc
@@ -46,7 +46,6 @@ def _define_db_tables(self) -> None:
             Index("idx_log_username", "username"),
             Index("idx_log_created", "created"),
         )
-
         self.user_table = Table(
             "users",
             self.metadata_obj,
@@ -78,6 +77,7 @@ def _define_db_tables(self) -> None:
             Column("book_id", Integer),
             Column("category_type", Enum(CategoryType), default=CategoryType.EXPENSE),
             Column("title", String(255)),
+            Column("options", Text, default=''),
             Column("deleted", Boolean, default=False),
             Index("idx_categories_parent_id", "parent_id"),
             Index("idx_categories_book_title", "book_id", "title"),
@@ -116,6 +116,18 @@ def _define_db_tables(self) -> None:
 
     def _alter_schema(self) -> None:
         """Alter database schema, if necessary."""
+        column = Column("options", Text, default='')
+        column_name = column.compile(dialect=self.engine.dialect)
+        column_type = column.type.compile(self.engine.dialect)
+        try:
+            with self.engine.connect() as connection:
+                connection.execute(DDL(
+                    f"ALTER TABLE categories ADD COLUMN {column_name} "
+                    f"{column_type} DEFAULT('')"
+                ))
+                connection.commit()
+        except OperationalError:
+            pass
         column = Column("category_type", Enum(CategoryType), default=CategoryType.EXPENSE)
         column_name = column.compile(dialect=self.engine.dialect)
         column_type = column.type.compile(self.engine.dialect)