Унификация использования конфигурации подключения к СУБД

This commit is contained in:
2024-12-06 15:12:21 +03:00
parent c1367bb47e
commit f8c79939b4
4 changed files with 27 additions and 9 deletions

View File

@@ -1,6 +1,8 @@
from dataclasses import dataclass
from Database.work import select_list, procedure
from Database.sql_provider import SQLProvider
from flask import current_app, session
from os import path
@@ -12,7 +14,9 @@ class InfoRespronse:
status: bool
def check_report(input_data: dict) -> bool:
result = procedure(current_app.config['db_config'], 'check_report', tuple(input_data.values()))
db_config = current_app.config['db_config']
result = procedure(db_config, 'check_report', tuple(input_data.values()))
if result is None or result['exist'] == 0:
return False
return True
@@ -32,9 +36,10 @@ def view_report_model(request, report_list: dict) -> InfoRespronse:
error_message = 'Отчет не найден',
status=False)
db_config = current_app.config['db_config']
view_script = report_list[id]['data']['view']
_sql = sql_provider.get(f'{view_script}.sql', data)
result = select_list(current_app.config['db_config'], _sql)
result = select_list(db_config, _sql)
if result is None:
return InfoRespronse((),
error_message = 'Ошибка в подключении к базе данных. Свяжитесь с администратором',
@@ -60,9 +65,10 @@ def create_report_model(request, report_list: dict) -> InfoRespronse:
error_message = 'Отчет уже существует',
status=False)
db_config = current_app.config['db_config']
proc_name = report_list[id]['data']['procedure']
args = tuple(data.values())
result = procedure(current_app.config['db_config'], proc_name, args)
result = procedure(db_config, proc_name, args)
if result is None:
return InfoRespronse((),