Skip to content

Commit 5a069e6

Browse files
CopilotMarkShidran
andcommitted
Fix black formatting to match CI requirements
Co-authored-by: MarkShidran <15670678+MarkShidran@users.noreply.github.com>
1 parent 829fe11 commit 5a069e6

12 files changed

Lines changed: 117 additions & 56 deletions

File tree

handlers/admin/ban_handlers.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
from controllerBD.db_loader import Session
77
from controllerBD.models import BanList, Holidays, UserStatus
88
from handlers.admin.handlers import admin_menu
9-
from handlers.admin.validators import (ban_validator, comment_validator,
10-
unban_validator)
9+
from handlers.admin.validators import ban_validator, comment_validator, unban_validator
1110
from handlers.decorators import admin_handlers
12-
from keyboards.admin import (add_to_ban_list, admin_ban_markup,
13-
admin_cancel_markup, back_to_main_markup,
14-
ban_list, cancel, remove_from_ban_list)
11+
from keyboards.admin import (
12+
add_to_ban_list,
13+
admin_ban_markup,
14+
admin_cancel_markup,
15+
back_to_main_markup,
16+
ban_list,
17+
cancel,
18+
remove_from_ban_list,
19+
)
1520
from keyboards.user import back_to_main
1621
from loader import bot, logger
1722
from states import AdminData

handlers/admin/handlers.py

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,33 @@
66

77
from controllerBD.db_loader import Session
88
from controllerBD.models import UserStatus
9-
from controllerBD.services import (get_active_user_names_from_db,
10-
get_user_count_from_db)
11-
from handlers.admin.admin_report import (prepare_report_message,
12-
prepare_user_info)
9+
from controllerBD.services import get_active_user_names_from_db, get_user_count_from_db
10+
from handlers.admin.admin_report import prepare_report_message, prepare_user_info
1311
from handlers.decorators import admin_handlers
1412
from handlers.user.check_message import prepare_user_list, send_message
1513
from handlers.user.get_info_from_table import get_id_from_user_info_table
16-
from keyboards.admin import (admin_cancel_markup, admin_change_status_markup,
17-
admin_inform_markup, admin_menu_button,
18-
admin_menu_markup, admin_pair_generation_markup,
19-
cancel, change_pair_generation_date,
20-
change_status, do_not_take_part_button,
21-
force_pair_generation, go_back, inform,
22-
inform_active_users, inform_bad_users,
23-
pair_generation, renew_pair_generation,
24-
send_message_to_all_button, stop_pair_generation,
25-
take_part_button)
14+
from keyboards.admin import (
15+
admin_cancel_markup,
16+
admin_change_status_markup,
17+
admin_inform_markup,
18+
admin_menu_button,
19+
admin_menu_markup,
20+
admin_pair_generation_markup,
21+
cancel,
22+
change_pair_generation_date,
23+
change_status,
24+
do_not_take_part_button,
25+
force_pair_generation,
26+
go_back,
27+
inform,
28+
inform_active_users,
29+
inform_bad_users,
30+
pair_generation,
31+
renew_pair_generation,
32+
send_message_to_all_button,
33+
stop_pair_generation,
34+
take_part_button,
35+
)
2636
from loader import bot, logger
2737
from match_algoritm.MatchingHelper import start_algoritm
2838
from states import AdminData

handlers/user/handlers.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
from controllerBD.models import MetInfo
66
from handlers.decorators import user_handlers
77
from handlers.user.add_username import check_username
8-
from handlers.user.get_info_from_table import (get_full_user_info_by_id,
9-
get_holidays_status_from_db,
10-
get_id_from_user_info_table,
11-
get_user_data_from_db,
12-
get_user_status_from_db)
8+
from handlers.user.get_info_from_table import (
9+
get_full_user_info_by_id,
10+
get_holidays_status_from_db,
11+
get_id_from_user_info_table,
12+
get_user_data_from_db,
13+
get_user_status_from_db,
14+
)
1315
from handlers.user.new_member import get_gender_from_db, start_registration
1416
from handlers.user.reviews import get_met_id_with_user_last_week
1517
from handlers.user.work_with_date import date_from_db_to_message

handlers/user/holidays.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,18 @@
99
from handlers.decorators import user_handlers
1010
from handlers.user.check_message import send_message
1111
from handlers.user.get_info_from_table import (
12-
get_id_from_user_info_table, get_teleg_id_from_user_info_table)
12+
get_id_from_user_info_table,
13+
get_teleg_id_from_user_info_table,
14+
)
1315
from handlers.user.work_with_date import date_from_db_to_message
14-
from keyboards.user import (holidays_length, one_week_holidays_message,
15-
set_holiday_message, three_week_holidays_message,
16-
turn_off_holidays, two_week_holidays_message)
16+
from keyboards.user import (
17+
holidays_length,
18+
one_week_holidays_message,
19+
set_holiday_message,
20+
three_week_holidays_message,
21+
turn_off_holidays,
22+
two_week_holidays_message,
23+
)
1724
from loader import bot, logger
1825

1926

handlers/user/new_member.py

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,30 @@
77
from handlers.admin.ban_handlers import back_to_main_markup
88
from handlers.user.add_username import check_username
99
from handlers.user.first_check import check_and_add_registration_button
10-
from handlers.user.get_info_from_table import (check_user_in_base,
11-
get_id_from_user_info_table)
12-
from handlers.user.validators import (validate_about, validate_birthday,
13-
validate_check_info, validate_gender,
14-
validate_name)
10+
from handlers.user.get_info_from_table import (
11+
check_user_in_base,
12+
get_id_from_user_info_table,
13+
)
14+
from handlers.user.validators import (
15+
validate_about,
16+
validate_birthday,
17+
validate_check_info,
18+
validate_gender,
19+
validate_name,
20+
)
1521
from handlers.user.work_with_date import date_from_message_to_db
16-
from keyboards.user import (back_message, confirm_markup, man_message,
17-
register_can_skip_reply_markup,
18-
register_man_or_woman_markup, registr_message,
19-
return_to_begin_button, return_to_begin_markup,
20-
skip_message, woman_message)
22+
from keyboards.user import (
23+
back_message,
24+
confirm_markup,
25+
man_message,
26+
register_can_skip_reply_markup,
27+
register_man_or_woman_markup,
28+
registr_message,
29+
return_to_begin_button,
30+
return_to_begin_markup,
31+
skip_message,
32+
woman_message,
33+
)
2134
from loader import bot, logger
2235
from states.states import UserData
2336

handlers/user/review_history.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010
from controllerBD.services import get_tg_username_from_db_by_base_id
1111
from handlers.decorators import user_handlers
1212
from handlers.user.add_username import check_username
13-
from handlers.user.get_info_from_table import (get_id_from_user_info_table,
14-
get_user_info_by_id)
13+
from handlers.user.get_info_from_table import (
14+
get_id_from_user_info_table,
15+
get_user_info_by_id,
16+
)
1517
from handlers.user.work_with_date import date_from_db_to_message
1618
from keyboards.user import my_reviews, review_yes_or_no
1719
from loader import bot, logger

handlers/user/reviews.py

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,23 @@
88
from controllerBD.models import MetInfo, MetsReview
99
from handlers.decorators import admin_handlers
1010
from handlers.user.get_info_from_table import (
11-
get_id_from_user_info_table, get_teleg_id_from_user_info_table)
12-
from handlers.user.validators import (validate_about, validate_review_grade,
13-
validate_review_yes_or_no)
11+
get_id_from_user_info_table,
12+
get_teleg_id_from_user_info_table,
13+
)
14+
from handlers.user.validators import (
15+
validate_about,
16+
validate_review_grade,
17+
validate_review_yes_or_no,
18+
)
1419
from keyboards.admin import review_messages
15-
from keyboards.user import (menu_markup, no_button, review_skip,
16-
review_yes_or_no, skip_message, yes_button)
20+
from keyboards.user import (
21+
menu_markup,
22+
no_button,
23+
review_skip,
24+
review_yes_or_no,
25+
skip_message,
26+
yes_button,
27+
)
1728
from loader import bot, logger
1829
from states import ReviewState
1930

handlers/user/validators/validators.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33

44
from aiogram import types
55

6-
from keyboards.user import (all_right_message, back_message, man_message,
7-
no_button, skip_message, woman_message, yes_button)
6+
from keyboards.user import (
7+
all_right_message,
8+
back_message,
9+
man_message,
10+
no_button,
11+
skip_message,
12+
woman_message,
13+
yes_button,
14+
)
815
from loader import bot
916

1017

keyboards/admin/admin_markups.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
from aiogram.types import ReplyKeyboardMarkup
33

44
from data import ADMIN_TG_ID
5-
from keyboards.user.defalt_markups import (back_to_main, menu_markup,
6-
menu_message)
5+
from keyboards.user.defalt_markups import back_to_main, menu_markup, menu_message
76

87
admin_menu_button = "Меню администратора"
98
inform = "Отчет"

main.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
from handlers.admin.handlers import register_admin_handlers
1010
from handlers.user.handlers import register_user_handlers
1111
from handlers.user.help_texts import register_help_texts_handlers
12-
from handlers.user.holidays import (register_holidays_handlers,
13-
sheduled_check_holidays)
12+
from handlers.user.holidays import register_holidays_handlers, sheduled_check_holidays
1413
from handlers.user.new_member import register_new_member_handler
1514
from handlers.user.review_history import register_review_history_handler
1615
from handlers.user.reviews import register_review_handlers

0 commit comments

Comments
 (0)