Removed static logics
This commit is contained in:
parent
317a7312cc
commit
3fd3b7c45a
3 changed files with 16 additions and 4 deletions
|
|
@ -19,6 +19,9 @@ class Settings(BaseSettings):
|
||||||
utilisateur: str = "Administrateur"
|
utilisateur: str = "Administrateur"
|
||||||
mot_de_passe: str
|
mot_de_passe: str
|
||||||
|
|
||||||
|
sql_server_name: str
|
||||||
|
sql_server_database: str
|
||||||
|
|
||||||
sage_gateway_token: str
|
sage_gateway_token: str
|
||||||
|
|
||||||
smtp_host: Optional[str] = None
|
smtp_host: Optional[str] = None
|
||||||
|
|
@ -40,6 +43,8 @@ def validate_settings():
|
||||||
"""Validation au démarrage"""
|
"""Validation au démarrage"""
|
||||||
if not settings.chemin_base or not settings.mot_de_passe:
|
if not settings.chemin_base or not settings.mot_de_passe:
|
||||||
raise ValueError(" CHEMIN_BASE ou MOT_DE_PASSE requis dans .env")
|
raise ValueError(" CHEMIN_BASE ou MOT_DE_PASSE requis dans .env")
|
||||||
|
if not settings.sql_server_database or not settings.sql_server_name:
|
||||||
|
raise ValueError(" Infos de la base de données requises dans .env")
|
||||||
if not settings.sage_gateway_token:
|
if not settings.sage_gateway_token:
|
||||||
raise ValueError(" SAGE_GATEWAY_TOKEN requis (doit être identique sur Linux)")
|
raise ValueError(" SAGE_GATEWAY_TOKEN requis (doit être identique sur Linux)")
|
||||||
return True
|
return True
|
||||||
|
|
|
||||||
2
main.py
2
main.py
|
|
@ -91,7 +91,7 @@ def startup():
|
||||||
raise
|
raise
|
||||||
|
|
||||||
sage = SageConnector(
|
sage = SageConnector(
|
||||||
settings.chemin_base, settings.utilisateur, settings.mot_de_passe
|
settings.chemin_base, settings.sql_server_name, settings.sql_server_database, settings.utilisateur, settings.mot_de_passe
|
||||||
)
|
)
|
||||||
|
|
||||||
if not sage.connecter():
|
if not sage.connecter():
|
||||||
|
|
|
||||||
|
|
@ -89,14 +89,21 @@ logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class SageConnector:
|
class SageConnector:
|
||||||
def __init__(self, chemin_base, utilisateur="<Administrateur>", mot_de_passe=""):
|
def __init__(
|
||||||
|
self,
|
||||||
|
chemin_base,
|
||||||
|
sql_server_name,
|
||||||
|
sql_server_database,
|
||||||
|
utilisateur="<Administrateur>",
|
||||||
|
mot_de_passe="",
|
||||||
|
):
|
||||||
self.chemin_base = chemin_base
|
self.chemin_base = chemin_base
|
||||||
self.utilisateur = utilisateur
|
self.utilisateur = utilisateur
|
||||||
self.mot_de_passe = mot_de_passe
|
self.mot_de_passe = mot_de_passe
|
||||||
self.cial = None
|
self.cial = None
|
||||||
|
|
||||||
self.sql_server = "OV-FDDDC6\\SAGE100"
|
self.sql_server = sql_server_name
|
||||||
self.sql_database = "BIJOU"
|
self.sql_database = sql_server_database
|
||||||
self.sql_conn_string = (
|
self.sql_conn_string = (
|
||||||
f"DRIVER={{ODBC Driver 17 for SQL Server}};"
|
f"DRIVER={{ODBC Driver 17 for SQL Server}};"
|
||||||
f"SERVER={self.sql_server};"
|
f"SERVER={self.sql_server};"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue