From 089451745c5fa04945c17b02dd4da2ef4e5867b4 Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Sun, 28 Nov 2021 02:36:52 +0300
Subject: [PATCH] Remove hardcoded values

---
 model/__init__.py       |  2 --
 model/postgres_model.py | 11 ++++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/model/__init__.py b/model/__init__.py
index dd1cc4f..648c1be 100644
--- a/model/__init__.py
+++ b/model/__init__.py
@@ -7,8 +7,6 @@ logger = get_main_logger()
 
 env_choose = os.getenv('DB_NAME')
 
-env_choose = 'sqlite'  # TODO: remove
-
 if env_choose == 'postgres':
     logger.info('Using postgres DB')
     from .import postgres_model as model
diff --git a/model/postgres_model.py b/model/postgres_model.py
index 2678914..d1b3f71 100644
--- a/model/postgres_model.py
+++ b/model/postgres_model.py
@@ -1,4 +1,5 @@
 import json
+import os
 import sqlite3
 import typing
 
@@ -14,11 +15,11 @@ logger = get_main_logger()
 logger.propagate = False
 
 db: psycopg2.extensions.connection = psycopg2.connect(
-    user='user2',
-    password='1',
-    host='192.168.1.68',
-    port='5432',
-    database='test0',
+    user=os.environ['DB_USERNAME'],  # user2
+    password=os.environ['DB_PASSWORD'],  # 1
+    host=os.environ['DB_HOSTNAME'],  # 192.168.1.68
+    port=os.environ['DB_PORT'],  # 5432
+    database=os.environ['DB_DATABASE'],  # test0
     cursor_factory=psycopg2.extras.DictCursor)
 
 with db: