From d390c742972d54341b84dd609862441f4f6ca4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=B2?= Date: Fri, 29 Aug 2025 11:33:19 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BA=D0=B0=D0=BA=D0=B8=D1=85=20=D1=82?= =?UTF-8?q?=D0=B8=D0=BF=D0=B0=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D1=80=D0=B0=D0=B1=D0=B0=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/main.py | 5 ----- app/working_database.py | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index 652f556..2cca9f7 100644 --- a/app/main.py +++ b/app/main.py @@ -16,20 +16,15 @@ def parse_data_for_bd(dict_data: dict) -> list[list]: if date_from_str: date_from = parser.parse(date_from_str).date() date_from = str(date_from.strftime('%d.%m.%Y')) - #TODO date_from cannot be NULL\NONE else: print(f"Отсутсвует дата: {key_id}: {organ} {names}") continue if date_to_str: date_to = parser.parse(date_to_str).date() date_to = str(date_to.strftime('%d.%m.%Y')) - #TODO change to NULL else: date_to = None parametrs_list = [int(key_id), organ, names, date_to, date_from, ver] result_list.append(parametrs_list) - - print("Отправляемых агрументов: ", *parametrs_list) - print("Типо данных: ", list(map(type, parametrs_list))) return result_list result_dict_data = parse_saby.process_reports_parse() diff --git a/app/working_database.py b/app/working_database.py index 7beeeb9..23cb4cf 100644 --- a/app/working_database.py +++ b/app/working_database.py @@ -36,7 +36,6 @@ class SimpleDB: """ Подключение к Vault и получение параметров для подключеник к БД """ - #TODO разнести в разные try_exception try: # Подключение к Vault client = hvac.Client( @@ -91,9 +90,11 @@ class SimpleDB: with connection.cursor() as cursor: for list_argument_bd in list_data: id, organ, names, date_from, date_to, ver = list_argument_bd - + parametrs_list = [id, organ, names, date_to, date_from, ver] + print("Отправляемых агрументов: ", *parametrs_list) + print("Типо данных: ", list(map(type, parametrs_list))) cursor.callproc('P_RK_GOVERNMENT_REPORTS_INSERS', [ - int(id), + id, organ, names, date_from,