Null safety bug fixed

GregoryKogan · Jun 30, 2022 · dfd4478 · dfd4478
1 parent b54e29f
commit dfd4478
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/questionnaire/data_preview.py b/src/questionnaire/data_preview.py
@@ -27,10 +27,10 @@ def get_user_data_preview(user_id: int) -> str:
     return data
 
 
-def get_check_data(user_id: int) -> (str, float):
+def get_check_data(user_id: int) -> (str, float) or None:
     user_data = db.users_table.get(user_id)
     if user_data is None:
-        return ""
+        return None
 
     total_price = SHIRT_PRICE
     data = f"Футболка '120' - {SHIRT_PRICE}р."

diff --git a/src/questionnaire/dialog.py b/src/questionnaire/dialog.py
@@ -136,7 +136,10 @@ async def skip_instagram(update, _):
 
 async def get_verification(update, _):
     if update.message.text == "Все верно":
-        message, amount = get_check_data(update.effective_user.id)
+        check_data = get_check_data(update.effective_user.id)
+        if check_data is None:
+            return ConversationHandler.END
+        message, amount = check_data
         await update.message.reply_text(
             text=message,
             reply_markup=go_to_payment(amount),