diff --git a/.env.local.example b/.env.local.example index 7194652..aee093d 100644 --- a/.env.local.example +++ b/.env.local.example @@ -3,8 +3,14 @@ KAFKA_TIMEOUT=1000.0 KAFKA_BROKER="10.20.30.50:9092" KAFKA_TOPICS=PROCESS_PAYMENT,LOAN_REPAYMENT -DATABASE_USER=firstadvance -DATABASE_PASSWORD=FirstAdvance! -DATABASE_HOST=10.20.30.60 -DATABASE_PORT=5432 -DATABASE_NAME=firstadvancedev \ No newline at end of file +# DATABASE_USER=firstadvance +# DATABASE_PASSWORD=FirstAdvance! +# DATABASE_HOST=10.20.30.60 +# DATABASE_PORT=5432 +# DATABASE_NAME=firstadvancedev + +DATABASE_USER=system +DATABASE_PASSWORD=FIRSTADV_PASS +DATABASE_HOST=10.10.33.65 +DATABASE_PORT=1521 +DATABASE_SID=FREE \ No newline at end of file diff --git a/.env.remote.example b/.env.remote.example index bed36e7..642890d 100644 --- a/.env.remote.example +++ b/.env.remote.example @@ -3,8 +3,14 @@ KAFKA_TIMEOUT=1000.0 KAFKA_BROKER="dev-events.simbrellang.net:9085" KAFKA_TOPICS=PROCESS_PAYMENT,LOAN_REPAYMENT -DATABASE_USER=firstadvance -DATABASE_PASSWORD=FirstAdvance! -DATABASE_HOST=dev-data.simbrellang.net -DATABASE_PORT=10532 -DATABASE_NAME=firstadvancedev \ No newline at end of file +# DATABASE_USER=firstadvance +# DATABASE_PASSWORD=FirstAdvance! +# DATABASE_HOST=dev-data.simbrellang.net +# DATABASE_PORT=10532 +# DATABASE_NAME=firstadvancedev + +DATABASE_USER=system +DATABASE_PASSWORD=FIRSTADV_PASS +DATABASE_HOST=10.10.33.65 +DATABASE_PORT=1521 +DATABASE_SID=FREE \ No newline at end of file diff --git a/app/config.py b/app/config.py index 684aca4..04cc785 100644 --- a/app/config.py +++ b/app/config.py @@ -32,9 +32,16 @@ class Config: DATABASE_HOST = os.getenv("DATABASE_HOST") DATABASE_NAME = os.getenv("DATABASE_NAME") DATABASE_PORT = os.getenv("DATABASE_PORT", 10532) + DATABASE_SID = os.environ.get("DATABASE_SID", "FREE") + DNS = f"(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST={DATABASE_HOST})(PORT={DATABASE_PORT}))(CONNECT_DATA=(SID={DATABASE_SID})))" - SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" + + SQLALCHEMY_DATABASE_URI = (f"oracle+oracledb://{DATABASE_USER}:{DATABASE_PASSWORD}@{DNS}") + + # SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{DATABASE_USER}:{DATABASE_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{DATABASE_NAME}" SQLALCHEMY_TRACK_MODIFICATIONS = False + # SQLALCHEMY_ECHO = True + BANK_CALL_BASE_URL = os.getenv("BANK_CALL_BASE_URL", "https://bank-emulator.dev.simbrellang.net/api") BANK_CALL_SMS_BASE_URL= os.getenv("BANK_CALL_SMS_BASE_URL","https://first-advance-middleware-develop.fbn-devops-dev-asenv.appserviceenvironment.net/SMS") diff --git a/requirements.txt b/requirements.txt index 4784744..32e6887 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,3 +10,4 @@ flask-sqlalchemy psycopg2-binary alembic python-dateutil +oracledb