Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Обновление заказных мероприятий и добавление примечания к theater_events #224

Merged
merged 10 commits into from
Feb 13, 2025
Merged

Обновление заказных мероприятий и добавление примечания к theater_events #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4a58abf
fix: уточнение текста для поля "age" в контексте birthday_data
MikiEremiki Feb 13, 2025
0f2e837
feat: добавлены новые идентификаторы для Google Sheets
MikiEremiki Feb 13, 2025
648aa77
fix: исправлен текст сообщения о возрасте именинника
MikiEremiki Feb 13, 2025
21201ce
refactor: передача идентификаторов таблиц в функции работы с Google S…
MikiEremiki Feb 13, 2025
f65c937
fix: исправлен диапазон в формуле Google Sheets
MikiEremiki Feb 13, 2025
6a856fc
feat: добавлено поле "note" для TheaterEvent
MikiEremiki Feb 13, 2025
fa032a4
refactor: исправление названий переменных и диапазонов таблиц
MikiEremiki Feb 13, 2025
3781730
refactor: изменение сигнатуры функции get_full_name_event
MikiEremiki Feb 13, 2025
600010a
feat: добавлено отображение примечания к полному имени мероприятия
MikiEremiki Feb 13, 2025
c65730d
feat: добавить колонку note в таблицу theater_events
MikiEremiki Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 56 additions & 58 deletions src/api/googlesheets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
from settings.settings import RANGE_NAME

config = parse_settings()
SPREADSHEET_ID = {}
SPREADSHEET_ID.setdefault('Домик', config.sheets.sheet_id)

filename = 'credentials.json'
path = os.getenv('CONFIG_PATH')
Expand Down Expand Up @@ -53,10 +51,14 @@ def get_values(
return result.get('values', [])


def get_data_from_spreadsheet(sheet, value_render_option='FORMATTED_VALUE'):
def get_data_from_spreadsheet(
spreadsheet_id,
sheet,
value_render_option='FORMATTED_VALUE'
):
try:
values = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
sheet,
value_render_option
)
Expand All @@ -71,36 +73,9 @@ def get_data_from_spreadsheet(sheet, value_render_option='FORMATTED_VALUE'):
raise ConnectionError


def get_quality_of_seats(event_id: str, keys: List[str]):
try:
dict_column_name, len_column = get_column_info('База спектаклей_')

values = get_values(
SPREADSHEET_ID['Домик'],
f'{RANGE_NAME['База спектаклей']}'
)

if not values:
googlesheets_logger.info('No data found')
raise ValueError

return_data = []
for row in values:
if event_id == row[dict_column_name['event_id']]:
for key in keys:
return_data.append(row[dict_column_name[key]])
return return_data
raise KeyError
except HttpError as err:
googlesheets_logger.error(err)
except KeyError:
googlesheets_logger.error(f'Показа с event_id = {event_id} не найдено')


def get_column_info(name_sheet):
def get_column_info(spreadsheet_id, name_sheet):
data_column_name = get_data_from_spreadsheet(
RANGE_NAME[name_sheet] + f'2:2'
)
spreadsheet_id, RANGE_NAME[name_sheet] + f'2:2')
dict_column_name: Dict[int | str, int] = {}
for i, item in enumerate(data_column_name[0]):
if item == '':
Expand All @@ -117,15 +92,17 @@ def get_column_info(name_sheet):


def write_data_reserve(
spreadsheet_id,
event_id,
numbers: List[int],
option: int = 1
) -> None:
try:
dict_column_name, len_column = get_column_info('База спектаклей_')
dict_column_name, len_column = get_column_info(
spreadsheet_id, 'База спектаклей_')

values = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
f'{RANGE_NAME['База спектаклей']}',
value_render_option='UNFORMATTED_VALUE'
)
Expand Down Expand Up @@ -204,7 +181,7 @@ def write_data_reserve(
'data': data
}
request = sheet.values().batchUpdate(
spreadsheetId=SPREADSHEET_ID['Домик'],
spreadsheetId=spreadsheet_id,
body=value_range_body
)
try:
Expand All @@ -226,10 +203,11 @@ def write_data_reserve(


async def write_client_reserve(
spreadsheet_id,
context: ContextTypes.DEFAULT_TYPE,
chat_id: int,
base_ticket: BaseTicket,
ticket_status_value,
ticket_status_value
) -> int:
# TODO Заменить на запись в другой лист
reserve_user_data = context.user_data['reserve_user_data']
Expand All @@ -240,7 +218,7 @@ async def write_client_reserve(

try:
values_column = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
RANGE_NAME['База клиентов']
)

Expand All @@ -259,9 +237,11 @@ async def write_client_reserve(
values[i].append(chat_id)
values[i].append(client_data['name_adult'])
values[i].append(client_data['phone'])
values[i].append(' | '.join([i[0] for i in client_data['data_children']]))
values[i].append(
' | '.join([i[0] for i in client_data['data_children']]))
values[i].append('')
values[i].append(' | '.join([i[1] for i in client_data['data_children']]))
values[i].append(
' | '.join([i[1] for i in client_data['data_children']]))

# Спектакль
values[i].append(event_id)
Expand Down Expand Up @@ -304,7 +284,8 @@ async def write_client_reserve(
range_sheet = (RANGE_NAME['База клиентов_'] +
f'R1C1:R1C{end_column_index}')

execute_append_googlesheet(sheet,
execute_append_googlesheet(spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
Expand All @@ -319,15 +300,17 @@ async def write_client_reserve(


def update_ticket_in_gspread(
spreadsheet_id,
ticket_id: int,
ticket_status: str,
option: int = 1
) -> None:
try:
dict_column_name, len_column = get_column_info('База клиентов_')
dict_column_name, len_column = get_column_info(
spreadsheet_id, 'База клиентов_')

values = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
f'{RANGE_NAME['База клиентов']}',
value_render_option='UNFORMATTED_VALUE'
)
Expand Down Expand Up @@ -374,7 +357,7 @@ def update_ticket_in_gspread(
'data': data
}
request = sheet.values().batchUpdate(
spreadsheetId=SPREADSHEET_ID['Домик'],
spreadsheetId=spreadsheet_id,
body=value_range_body
)
try:
Expand Down Expand Up @@ -420,12 +403,14 @@ def get_flags_by_ticket_status(ticket_status_value):


def write_client_cme(
custom_made_event: CustomMadeEvent,
spreadsheet_id,
custom_made_event: CustomMadeEvent
) -> None:
dict_column_name, len_column = get_column_info('База ДР_')
dict_column_name, len_column = get_column_info(
spreadsheet_id, 'База ДР_')

values_column = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
RANGE_NAME['База ДР']
)

Expand All @@ -452,7 +437,7 @@ def write_client_cme(
elif key == 'name_theater':
values[0].append(
'=VLOOKUP('
'INDEX($1:$66;ROW();MATCH("theater_event_id";$2:$2;0));'
'INDEX($A:$Z;ROW();MATCH("theater_event_id";$2:$2;0));'
'\'Репертуар\'!$A$3:$F;'
'MATCH("name";\'Репертуар\'!$2:$2;0)'
')'
Expand All @@ -473,17 +458,21 @@ def write_client_cme(
range_sheet = (RANGE_NAME['База ДР_'] +
f'R1C1:R1C{end_column_index}')

execute_append_googlesheet(sheet,
execute_append_googlesheet(spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
value_range_body)


def write_client_list_waiting(context: ContextTypes.DEFAULT_TYPE):
def write_client_list_waiting(
spreadsheet_id,
context: ContextTypes.DEFAULT_TYPE
):
try:
values_column = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
RANGE_NAME['Лист ожидания']
)

Expand Down Expand Up @@ -535,7 +524,8 @@ def write_client_list_waiting(context: ContextTypes.DEFAULT_TYPE):
range_sheet = (RANGE_NAME['Лист ожидания_'] +
f'R1C1:R1C{end_column_index}')

execute_append_googlesheet(sheet,
execute_append_googlesheet(spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
Expand All @@ -545,10 +535,15 @@ def write_client_list_waiting(context: ContextTypes.DEFAULT_TYPE):
googlesheets_logger.error(err)


def update_cme_in_gspread(cme_id, status) -> None:
dict_column_name, len_column = get_column_info('База ДР_')
def update_cme_in_gspread(
spreadsheet_id,
cme_id,
status
) -> None:
dict_column_name, len_column = get_column_info(
spreadsheet_id, 'База ДР_')
values = get_values(
SPREADSHEET_ID['Домик'],
spreadsheet_id,
f'{RANGE_NAME['База ДР']}',
value_render_option='UNFORMATTED_VALUE'
)
Expand Down Expand Up @@ -579,22 +574,24 @@ def update_cme_in_gspread(cme_id, status) -> None:
range_sheet = (f'{RANGE_NAME['База ДР_']}'
f'R{row_cme}C{col1}:R{row_cme}C{col2}')

execute_update_googlesheet(sheet,
execute_update_googlesheet(spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
value_range_body)


def execute_update_googlesheet(
spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
value_range_body
):
request = sheet.values().update(
spreadsheetId=SPREADSHEET_ID['Домик'],
spreadsheetId=spreadsheet_id,
range=range_sheet,
valueInputOption=value_input_option,
responseValueRenderOption=response_value_render_option,
Expand All @@ -618,14 +615,15 @@ def execute_update_googlesheet(


def execute_append_googlesheet(
spreadsheet_id,
sheet,
range_sheet,
value_input_option,
response_value_render_option,
value_range_body
):
request = sheet.values().append(
spreadsheetId=SPREADSHEET_ID['Домик'],
spreadsheetId=spreadsheet_id,
range=range_sheet,
valueInputOption=value_input_option,
insertDataOption='INSERT_ROWS',
Expand Down
Loading