diff --git a/DB/db_creation.sql b/DB/db_creation.sql index 142e9be..c229c4c 100644 --- a/DB/db_creation.sql +++ b/DB/db_creation.sql @@ -13,7 +13,8 @@ create table creds user_id varchar(255), petition_no varchar(255), pin varchar(255), - language varchar + language varchar, + email varchar(255) ); diff --git a/db_operations.py b/db_operations.py index 93538fa..82a84d1 100644 --- a/db_operations.py +++ b/db_operations.py @@ -203,7 +203,7 @@ def user_pin_from_db(user_id): ) -def new_user_creds_record(user_id, language): +def new_user_creds_record(user_id, language, user_username, user_full_name): try: connection = psycopg2.connect( database=database, @@ -214,8 +214,8 @@ def new_user_creds_record(user_id, language): ) cursor = connection.cursor() sql_insert_query = \ - f""" INSERT INTO creds (user_id, petition_no, pin, language, email) VALUES (%s,%s,%s,%s,%s)""" - record_to_insert = (user_id, '0', '0', language, '0') + f""" INSERT INTO creds (user_id, petition_no, pin, language, email, username, full_name) VALUES (%s,%s,%s,%s,%s,%s,%s)""" + record_to_insert = (user_id, '0', '0', language, '0', user_username, user_full_name) cursor.execute(sql_insert_query, record_to_insert) connection.commit() except (Exception, psycopg2.Error) as error: diff --git a/main.py b/main.py index 9fcf20b..195ac41 100644 --- a/main.py +++ b/main.py @@ -127,13 +127,15 @@ async def regular_choice(update: Update, context: ContextTypes.DEFAULT_TYPE) -> context.user_data["button"] = text user_id = update.message.from_user.id + user_name = update.message.from_user.username + user_full_name = update.message.from_user.full_name language_code = update.message.from_user.language_code if language_code != 'ru': language_code = 'en' if user_pin_from_db(user_id) is None or user_petition_number_from_db(user_id) is None: - new_user_creds_record(user_id, language_code) + new_user_creds_record(user_id, language_code, user_name, user_full_name) if text == 'pin': reply_text = get_translated_message('give_me_your_pin', language_code)