Skip to content

Commit f2c637a

Browse files
gnatykdmgnatykdm
authored
Merge pull request #37 from gnatykdm/Logger
Logger-Fixed-Message-Formatting
2 parents afcc417 + b2641f1 commit f2c637a

File tree

5 files changed

+44
-45
lines changed

5 files changed

+44
-45
lines changed

‎telegram_bot_project/bot/callbacks.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ async def start_callback_language(callback_query: types.CallbackQuery) -> None:
2626

2727
match callback_query.data:
2828
case "lang_ua":
29-
print(f"--[INFO] - User {user_id} ({user_name}) set language to ua.")
29+
print(f"[INFO] - User {user_id} ({user_name}) set language to ua.")
3030
await UserService.update_user_language(user_id, 'UKRANIAN')
3131
await callback_query.message.answer(MESSAGES['UKRANIAN']["LANGUAGE_OK"], reply_markup=menu_reply_keyboard())
3232
case "lang_en":
33-
print(f"--[INFO] - User {user_id} ({user_name}) set language to en.")
33+
print(f"[INFO] - User {user_id} ({user_name}) set language to en.")
3434
await UserService.update_user_language(user_id, 'ENGLISH')
3535
await callback_query.message.answer(MESSAGES['ENGLISH']["LANGUAGE_OK"], reply_markup=menu_reply_keyboard())
3636

3737
case _:
38-
print(f"--[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
38+
print(f"[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
3939
await callback_query.message.answer(MESSAGES[language]["LANGUAGE_INVALID"])
4040

4141

@@ -55,7 +55,7 @@ async def callback_idea_process(callback_query: types.CallbackQuery, state: FSMC
5555

5656
match callback_query.data:
5757
case "delete_idea":
58-
print(f"--[INFO] - User {user_id} ({user_name}) deleted idea.")
58+
print(f"[INFO] - User {user_id} ({user_name}) deleted idea.")
5959
await callback_query.message.answer(MESSAGES[language]["IDEA_DELETE"], reply_markup=idea_reply_keyboard())
6060
await state.clear()
6161
case "save_idea":
@@ -64,21 +64,21 @@ async def callback_idea_process(callback_query: types.CallbackQuery, state: FSMC
6464
idea: str = data.get("idea")
6565

6666
if not idea:
67-
print(f"--[INFO] - User {user_id} ({user_name}) sent empty idea.")
67+
print(f"[INFO] - User {user_id} ({user_name}) sent empty idea.")
6868
await callback_query.message.answer(MESSAGES[language]["IDEA_PROBLEM"], reply_markup=idea_reply_keyboard())
6969
return
7070
else:
7171
await IdeaService.create_user_idea(user_id, idea)
7272
await MyDayService.increment_idea_count(user_id)
7373

74-
print(f"--[INFO] - User {user_id} ({user_name}) saved idea: {idea}")
74+
print(f"[INFO] - User {user_id} ({user_name}) saved idea: {idea}")
7575
await callback_query.message.answer(MESSAGES[language]["IDEA_SAVED"], reply_markup=idea_reply_keyboard())
7676
await state.clear()
7777
except Exception as e:
78-
print(f"--[ERROR] - User {user_id} ({user_name}) failed to save idea: {e}")
78+
print(f"[ERROR] - User {user_id} ({user_name}) failed to save idea: {e}")
7979
await callback_query.message.answer(MESSAGES[language]["IDEA_PROBLEM"])
8080
case _:
81-
print(f"--[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
81+
print(f"[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
8282
await callback_query.message.answer(MESSAGES[language]["IDEA_PROBLEM"], reply_markup=idea_reply_keyboard())
8383

8484
async def callback_task_deadline(callback_query: types.CallbackQuery, state: FSMContext) -> None:
@@ -101,14 +101,14 @@ async def callback_task_deadline(callback_query: types.CallbackQuery, state: FSM
101101
case "no_task":
102102
data = await state.get_data()
103103
saved_task = data.get("task")
104-
print(f"--[INFO] - User {user_id} ({user_name}) saved task: {saved_task}")
104+
print(f"[INFO] - User {user_id} ({user_name}) saved task: {saved_task}")
105105

106106
await TaskService.create_task(user_id, saved_task, False)
107107
await MyDayService.increment_task_count(user_id)
108108
await callback_query.message.answer(MESSAGES[language]["TASK_DEADLINE_NO"], reply_markup=task_menu_keyboard())
109109
await state.clear()
110110
case _:
111-
print(f"--[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
111+
print(f"[INFO] - User {user_id} ({user_name}) sent invalid callback: {callback_query.data}")
112112
await callback_query.message.answer(MESSAGES[language]["TASK_DEADLINE_INVALID"])
113113

114114
async def callback_routines(callback_query: types.CallbackQuery) -> None:

‎telegram_bot_project/bot/commands.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ async def start_command(message: types.Message):
1616
user_id: int = message.from_user.id
1717
user_name: str = message.from_user.username or "unknown"
1818

19-
print(f"--[INFO] - User {user_id} ({user_name}) - started the bot")
19+
print(f"[INFO] - User {user_id} ({user_name}) - started the bot")
2020
user_find = await UserService.get_user_by_id(user_id)
2121
language: str = await UserService.get_user_language(user_id)
2222
if user_find:
@@ -34,7 +34,7 @@ async def help_command(message: types.Message):
3434
user_name: str = message.from_user.username or "unknown"
3535

3636
language: str = await UserService.get_user_language(user_id)
37-
print(f"--[INFO] - User {user_id} ({user_name}) - asked for help")
37+
print(f"[INFO] - User {user_id} ({user_name}) - asked for help")
3838
await message.answer(MESSAGES[language]["HELP_MSG"])
3939

4040
# Language Command Handler
@@ -64,7 +64,7 @@ async def idea_command(message: types.Message, state: FSMContext):
6464
user_find: Any = await UserService.get_user_by_id(user_id)
6565
language: str = await UserService.get_user_language(user_id)
6666

67-
print(f"--[INFO] - User with id: {user_id} - opened /idea.")
67+
print(f"[INFO] - User with id: {user_id} - opened /idea.")
6868
if not user_find:
6969
await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
7070
else:
@@ -82,10 +82,10 @@ async def ideas_command(message: types.Message):
8282
else:
8383
ideas: List[str] = await IdeaService.get_all_ideas_by_user_id(user_id)
8484
if not ideas:
85-
print(f"--[INFO] - User with id: {user_id} - has no ideas.")
85+
print(f"[INFO] - User with id: {user_id} - has no ideas.")
8686
await message.answer(MESSAGES[language]['NO_IDEAS'])
8787
else:
88-
print(f"--[INFO] - User with id: {user_id} - has ideas: {ideas}")
88+
print(f"[INFO] - User with id: {user_id} - has ideas: {ideas}")
8989

9090
dividers: str = "\n" + ("-" * int(len(MESSAGES[language]['IDEAS_SHOW']) * 1.65))
9191

@@ -129,7 +129,7 @@ async def task_command(message: types.Message, state: FSMContext):
129129
if not user_find:
130130
await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
131131
else:
132-
print(f"--[INFO] - User with id: {user_id} - opened /task.")
132+
print(f"[INFO] - User with id: {user_id} - opened /task.")
133133

134134
await message.answer(MESSAGES[language]['TASK_ADD'])
135135
await state.set_state(DialogStates.confirm_task)
@@ -313,7 +313,7 @@ async def show_morning_routines(message: types.Message):
313313
await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
314314
return
315315

316-
print(f"--[INFO] - User with id: {user_id} - opened /morning_routines.")
316+
print(f"[INFO] - User with id: {user_id} - opened /morning_routines.")
317317
morning_routine = await RoutineService.get_user_routines(user_id, routine_type="morning")
318318
if not morning_routine:
319319
await message.answer(MESSAGES[language]['NO_MORNING_ROUTINE'])
@@ -382,7 +382,7 @@ async def show_evening_routines(message: types.Message):
382382
await message.answer(MESSAGES['ENGLISH']['AUTHORIZATION_PROBLEM'])
383383
return
384384

385-
print(f"--[INFO] - User with id: {user_id} - opened /evening_routines.")
385+
print(f"[INFO] - User with id: {user_id} - opened /evening_routines.")
386386
evening_routine = await RoutineService.get_user_routines(user_id, routine_type="evening")
387387
if not evening_routine:
388388
await message.answer(MESSAGES[language]['NO_MORNING_ROUTINE'])
@@ -436,4 +436,4 @@ async def show_daily_stats_command(message: types.Message):
436436
created_tasks = stats.get("created_tasks", 0)
437437

438438
text = generate_daily_stats_message(language, created_ideas, completed_tasks, created_tasks)
439-
await message.answer(text, parse_mode="Markdown", reply_markup=menu_reply_keyboard())
439+
await message.answer(text, parse_mode="Markdown", reply_markup=menu_reply_keyboard())

‎telegram_bot_project/bot/fallbacks.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Fallback
77
async def fallback(message: types.Message, state: FSMContext):
88
current_state = await state.get_state()
9-
print(f"-- [DEBUG] - Current state: {current_state}")
9+
print(f"[DEBUG] - Current state: {current_state}")
1010
if current_state == DialogStates.waiting_for_idea.state:
1111
await process_idea_save(message, state)
1212
elif current_state == DialogStates.delete_idea.state:

‎telegram_bot_project/bot/handlers.py‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ async def process_idea_save(message: Message, state: FSMContext) -> None:
3131
)
3232
return
3333

34-
print(f"--[INFO] User with id: {user_id} provided idea.")
34+
print(f"[INFO] - User with id: {user_id} provided idea.")
3535

3636
try:
3737
await state.update_data(idea=idea)
@@ -46,7 +46,7 @@ async def process_idea_save(message: Message, state: FSMContext) -> None:
4646
)
4747

4848
except Exception as e:
49-
print(f"[ERROR] Saving idea failed: {e}")
49+
print(f"[ERROR] - Saving idea failed: {e}")
5050
await message.answer(
5151
MESSAGES[language]['ERROR_SAVING_IDEA'],
5252
reply_markup=idea_reply_keyboard()
@@ -62,7 +62,7 @@ async def process_idea_delete(message: Message, state: FSMContext) -> None:
6262
language = await UserService.get_user_language(user_id) or "ENGLISH"
6363
ideas = await IdeaService.get_all_ideas_by_user_id(user_id)
6464

65-
print(f"--[DEBUG] User {user_id} ideas: {ideas}")
65+
print(f"[DEBUG] - User {user_id} ideas: {ideas}")
6666

6767
try:
6868
user_number = int(message.text.strip())
@@ -78,10 +78,10 @@ async def process_idea_delete(message: Message, state: FSMContext) -> None:
7878
idea_to_delete = ideas[index]
7979
real_id = idea_to_delete["id"]
8080

81-
print(f"--[DEBUG] Deleting idea with id {real_id} for user {user_id}")
81+
print(f"[DEBUG] - Deleting idea with id {real_id} for user {user_id}")
8282

8383
await IdeaService.delete_user_idea(real_id)
84-
await MyDayService.dicrement_idea_count(user_id)
84+
await MyDayService.decrement_idea_count(user_id)
8585

8686
await message.answer(MESSAGES[language]['IDEA_DELETED'].format(user_number, idea_to_delete['idea_name']), reply_markup=idea_reply_keyboard())
8787
await state.clear()
@@ -97,7 +97,7 @@ async def process_idea_update(message: Message, state: FSMContext) -> None:
9797
language = await UserService.get_user_language(user_id) or "ENGLISH"
9898
ideas = await IdeaService.get_all_ideas_by_user_id(user_id)
9999

100-
print(f"--[DEBUG] User {user_id} ideas: {ideas}")
100+
print(f"[DEBUG] - User {user_id} ideas: {ideas}")
101101

102102
try:
103103
user_number = int(message.text.strip())
@@ -119,7 +119,7 @@ async def process_idea_update(message: Message, state: FSMContext) -> None:
119119
idea_to_update = ideas[index]
120120
real_id = idea_to_update["id"]
121121

122-
print(f"--[DEBUG] Selected idea with id {real_id} for update by user {user_id}")
122+
print(f"[DEBUG] - Selected idea with id {real_id} for update by user {user_id}")
123123

124124
await state.update_data(idea_id=real_id, idea_number=user_number)
125125
await state.set_state(DialogStates.waiting_for_update_text)
@@ -163,7 +163,7 @@ async def process_task_save(message: Message, state: FSMContext):
163163
return
164164
else:
165165
task = message.text.strip()
166-
print(f"--[INFO] User with id: {user_id} provided task: {task}")
166+
print(f"[INFO] - User with id: {user_id} provided task: {task}")
167167

168168
await message.answer(MESSAGES[language]['TASK_DEADLINE_ASK'], reply_markup=task_reply_keyboard())
169169
await state.update_data(task=task)
@@ -186,7 +186,7 @@ async def process_task_deadline(message: Message, state: FSMContext):
186186
time_obj = datetime.strptime(deadline_str, "%H:%M").time()
187187
deadline_dt = datetime.combine(datetime.now().date(), time_obj)
188188

189-
print(f"--[INFO] User with id: {user_id} provided deadline: {deadline_dt}")
189+
print(f"[INFO] - User with id: {user_id} provided deadline: {deadline_dt}")
190190

191191
await TaskService.create_task(user_id, task, False, deadline_dt)
192192
await MyDayService.increment_task_count(user_id)
@@ -220,9 +220,9 @@ async def process_task_delete(message: Message, state: FSMContext):
220220
task_to_delete = tasks[user_number - 1]
221221
real_id = task_to_delete["id"]
222222

223-
print(f"--[INFO] User with id: {user_id} deleted task with id: {real_id}")
223+
print(f"[INFO] - User with id: {user_id} deleted task with id: {real_id}")
224224
await TaskService.delete_task(real_id)
225-
await MyDayService.dicrement_task_count(user_id)
225+
await MyDayService.decrement_task_count(user_id)
226226
await message.answer(MESSAGES[language]['TASK_DELETED'].format(user_number, task_to_delete['task_name']), reply_markup=task_menu_keyboard())
227227
await state.clear()
228228

@@ -252,7 +252,7 @@ async def process_task_complete(message: Message, state: FSMContext):
252252
task_to_complete = tasks[user_number - 1]
253253
real_id = task_to_complete["id"]
254254

255-
print(f"--[INFO] User with id: {user_id} completed task with id: {real_id}")
255+
print(f"[INFO] - User with id: {user_id} completed task with id: {real_id}")
256256
await TaskService.toggle_task_status(real_id)
257257
await MyDayService.increment_completed_tasks(user_id)
258258
await message.answer(MESSAGES[language]['COMPLETE_TASK_SUCCESS'].format(user_number, task_to_complete['task_name']), reply_markup=task_menu_keyboard())
@@ -301,7 +301,7 @@ async def process_save_updated_task_name(message: Message, state: FSMContext):
301301
await message.answer(MESSAGES["ENGLISH"]['UPDATE_TASK_NAME_INVALID'], reply_markup=task_menu_keyboard())
302302
return
303303
else:
304-
print(f"--[INFO] User with id: {message.from_user.id} updated task name: {new_task_name}")
304+
print(f"[INFO] - User with id: {message.from_user.id} updated task name: {new_task_name}")
305305
await TaskService.update_task(task_id=task_id, task_name=new_task_name)
306306
await message.answer(MESSAGES["ENGLISH"]['UPDATE_TASK_SUCCESS'].format(user_number), reply_markup=task_menu_keyboard())
307307
await state.clear()
@@ -332,7 +332,7 @@ async def process_set_wake_time(message: Message, state: FSMContext):
332332
)
333333
return
334334

335-
print(f"--User with id: {user_id} set wake time to: {new_wake_time}")
335+
print(f"[INFO] - User with id: {user_id} set wake time to: {new_wake_time}")
336336
await UserService.update_wake_time(user_id, time_obj)
337337
await message.answer(
338338
MESSAGES[language]['TIMER_SET'].format(new_wake_time),
@@ -367,7 +367,7 @@ async def process_set_sleep_time(message: Message, state: FSMContext):
367367
)
368368
return
369369

370-
print(f"--User with id: {user_id} set sleep time to: {new_sleep_time}")
370+
print(f"[INFO] - User with id: {user_id} set sleep time to: {new_sleep_time}")
371371
await UserService.update_sleep_time(user_id, time_obj)
372372
await message.answer(
373373
MESSAGES[language]['TIMER_SET'].format(new_sleep_time),
@@ -393,7 +393,7 @@ async def process_set_routine(message: Message, state: FSMContext, type: str):
393393
try:
394394
await RoutineService.create_routine(user_id, routine_type=type, routine_name=routine_title)
395395

396-
print(f"User with id: {user_id} set routine title: {routine_title}")
396+
print(f"[INFO] - User with id: {user_id} set routine title: {routine_title}")
397397
await message.answer(MESSAGES[language]['ROUTINE_SAVED'].format(routine_title), reply_markup=routine_keyboard)
398398
await state.clear()
399399
except:
@@ -421,7 +421,7 @@ async def process_delete_morning_routine(message: Message, state: FSMContext, ty
421421
real_id = routine_to_delete["id"]
422422

423423
await RoutineService.delete_routine(real_id)
424-
print(f"User with id: {user_id} deleted routine with id: {real_id}")
424+
print(f"[INFO] - User with id: {user_id} deleted routine with id: {real_id}")
425425

426426
await message.answer(MESSAGES[language]['ROUTINE_DELETED'].format(routine_num, routine_to_delete['routine_name']), reply_markup=routine_keyboard)
427427
await state.clear()
@@ -471,7 +471,7 @@ async def process_save_updated_morning_routine(message: Message, state: FSMConte
471471

472472
try:
473473
await RoutineService.update_routine(routine_id, routine_title)
474-
print(f"User with id: {user_id} updated routine title: {routine_title}")
474+
print(f"[INFO] - User with id: {user_id} updated routine title: {routine_title}")
475475
await message.answer(MESSAGES[language]['ROUTINE_NAME_SET'].format(routine_title), reply_markup=routine_keyboard)
476476
await state.clear()
477477
except:
@@ -493,8 +493,7 @@ async def process_feedback_message(message: Message, state: FSMContext):
493493
await message.answer(MESSAGES["ENGLISH"]['INVALID_MESSAGE'])
494494
return
495495

496-
print("-- [INFO] - Feedback message from user with id: {user_id} is: {feedback_message}")
496+
print(f"[INFO] - Feedback message from user with id: {user_id} is: {feedback_message}")
497497
await SmtpService.send_feedback_message(feedback_message, user_id, user_name)
498498
await message.answer(MESSAGES[language]['SMTP_MESSAGE_SENT'], reply_markup=settings_menu_keyboard())
499-
await state.clear()
500-
499+
await state.clear()

‎telegram_bot_project/service/smtp.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
smtp_data: SmtpData = get_smtp_data()
99
if not smtp_data:
10-
raise Exception("-- [ERROR] - SMTP data not found.")
10+
raise Exception("[ERROR] - SMTP data not found.")
1111

1212
class SmtpService:
1313
@staticmethod
1414
async def send_feedback_message(user_message: str, user_id: int, user_name: str):
1515
if not validate_text(user_message):
16-
print("-- [ERROR] - Invalid message.")
16+
print("[ERROR] - Invalid message.")
1717
return
1818

1919
email_body: str = USER_FEEDBACK_MAIL_TEXT.format(
@@ -37,6 +37,6 @@ async def send_feedback_message(user_message: str, user_id: int, user_name: str)
3737
username=smtp_data.smtp_user,
3838
password=smtp_data.smtp_password,
3939
)
40-
print("-- [INFO] - Feedback message sent successfully.")
40+
print("[INFO] - Feedback message sent successfully.")
4141
except Exception as e:
42-
print(f"-- [ERROR] - Failed to send feedback message: {e}")
42+
print(f"[ERROR] - Failed to send feedback message: {e}")

0 commit comments

Comments
 (0)