From 5ac0bd8a919eca773a667c709c9c9d30aff0d26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Giovanni=20Lagan=C3=A0?= Date: Sun, 3 Nov 2024 07:05:30 +0100 Subject: [PATCH] fix: fixed values unpacking --- callbacks/participants.py | 2 +- callbacks/set_day.py | 4 ++-- callbacks/set_description.py | 3 +-- callbacks/set_number.py | 3 +-- callbacks/set_pitch.py | 3 +-- callbacks/set_time.py | 5 ++--- test/test_callbacks.py | 2 +- 7 files changed, 9 insertions(+), 13 deletions(-) diff --git a/callbacks/participants.py b/callbacks/participants.py index 904135c..5f8290d 100644 --- a/callbacks/participants.py +++ b/callbacks/participants.py @@ -12,7 +12,7 @@ def participants(update: Update, context: CallbackContext): answer = "Prima di iniziare con le danze, avvia una partita, per farlo usa /start" context.bot.send_message(chat_id=update.effective_chat.id, parse_mode='markdown', text=answer) else: - players, day, time, target, default_message, pitch = find_all_info_by_chat_id(chat_id) + players, day, time, target, default_message, pitch, _, _ = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) msg = print_new_summary(current_situation, update, context) update_bot_last_message_id_on_db(chat_id, msg.message_id) diff --git a/callbacks/set_day.py b/callbacks/set_day.py index e9e1df2..36c42c6 100644 --- a/callbacks/set_day.py +++ b/callbacks/set_day.py @@ -23,12 +23,12 @@ def set_day(update: Update, context: CallbackContext): day = flatten_args(context.args) update_day_on_db(chat_id, day) remove_job_if_exists(str(chat_id), context) - players, day, time, target, custom_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id(chat_id) + players, day, time, target, _, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) trigger_payment_reminder(update, context, day, time) sender = "@" + get_sender_name(update) answer = "Ok, " + sender + "! Ho impostato il giorno della partita il " + day context.bot.send_message(chat_id=update.effective_chat.id, parse_mode='markdown', text=escape_markdown(answer)) - players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id(chat_id) + players, day, time, target, default_message, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) if bot_last_message_id is None: msg = print_new_summary(current_situation, update, context) diff --git a/callbacks/set_description.py b/callbacks/set_description.py index 3d2d1d4..3b5e181 100644 --- a/callbacks/set_description.py +++ b/callbacks/set_description.py @@ -23,8 +23,7 @@ def set_description(update: Update, context: CallbackContext): sender = "@" + get_sender_name(update) answer = "Ok, " + sender + "! Ho aggiornato la descrizione!" context.bot.send_message(chat_id=update.effective_chat.id, parse_mode='markdown', text=escape_markdown(answer)) - players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id( - chat_id) + players, day, time, target, default_message, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) if bot_last_message_id is None: msg = print_new_summary(current_situation, update, context) diff --git a/callbacks/set_number.py b/callbacks/set_number.py index 96b5a85..7c9e39b 100644 --- a/callbacks/set_number.py +++ b/callbacks/set_number.py @@ -46,8 +46,7 @@ def set_number(update: Update, context: CallbackContext): update_target_on_db(chat_id, choosen_number) answer = "Ok, " + sender + "! Ho impostato il numero di partecipanti a " + str(choosen_number) reached_target = players and participants_num == choosen_number - players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id( - chat_id) + players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) if bot_last_message_id is None: msg = print_new_summary(current_situation, update, context) diff --git a/callbacks/set_pitch.py b/callbacks/set_pitch.py index af62bcf..4d82386 100644 --- a/callbacks/set_pitch.py +++ b/callbacks/set_pitch.py @@ -23,8 +23,7 @@ def set_pitch(update: Update, context: CallbackContext): sender = "@" + get_sender_name(update) answer = "Ok, " + sender + "! Ho aggiornato il campo!" context.bot.send_message(chat_id=update.effective_chat.id, parse_mode='markdown', text=escape_markdown(answer)) - players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id( - chat_id) + players, day, time, target, default_message, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) if bot_last_message_id is None: msg = print_new_summary(current_situation, update, context) diff --git a/callbacks/set_time.py b/callbacks/set_time.py index 6268e77..6cb3246 100644 --- a/callbacks/set_time.py +++ b/callbacks/set_time.py @@ -23,13 +23,12 @@ def set_time(update: Update, context: CallbackContext): time = flatten_args(context.args) update_time_on_db(chat_id, time) remove_job_if_exists(str(chat_id), context) - players, day, time, target, custom_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id(chat_id) + players, day, time, target, _, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) trigger_payment_reminder(update, context, day, time) sender = "@" + get_sender_name(update) answer = "Ok, " + sender + "! Ho impostato l'orario della partita alle " + time context.bot.send_message(chat_id=update.effective_chat.id, parse_mode='markdown', text=escape_markdown(answer)) - players, day, time, target, default_message, pitch, teams, bot_last_message_id = find_all_info_by_chat_id( - chat_id) + players, day, time, target, default_message, pitch, _, bot_last_message_id = find_all_info_by_chat_id(chat_id) current_situation = format_summary(players, day, time, target, default_message, pitch) if bot_last_message_id is None: msg = print_new_summary(current_situation, update, context) diff --git a/test/test_callbacks.py b/test/test_callbacks.py index 9285a44..44296e2 100644 --- a/test/test_callbacks.py +++ b/test/test_callbacks.py @@ -67,7 +67,7 @@ def test_participants(self, mock_find_row_by_chat_id, mock_find_all_info_by_chat # Test case 2: row is not None with self.subTest("Row is not None"): mock_find_row_by_chat_id.return_value = "row" - mock_find_all_info_by_chat_id.return_value = ("player1, player2", "day", "time", "target", "default_message", "pitch") + mock_find_all_info_by_chat_id.return_value = ("player1, player2", "day", "time", "target", "default_message", "pitch", None, None) mock_format_summary.return_value = "formatted_summary" mock_print_new_summary.return_value = MagicMock(message_id=123)