Updated DB variables

settings/base.py

@@ -2,20 +2,12 @@ import os
 import logging
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY")
 
-DATABASES = {
-    "PSQL":{
-        "DB_NAME": os.environ["DB_NAME"],
-        "DB_USER": os.environ["DB_USER"],
-        "DB_PASSWORD": os.environ["DB_PASSWORD"],
-        "DB_HOST": os.environ["DB_HOST"],
-        "DB_PORT": "5432",
-    }
-}
-DB_NAME = os.environ.get("DBNAME")
-DB_USER = os.environ.get("DBUSER")
-DB_PASSWORD = os.environ.get("DBPASSWORD") 
-DB_HOST = os.environ.get("DBHOST")
-DB_PORT = os.environ.get("DBPORT")
+
+DB_NAME = os.environ.get("DB_NAME")
+DB_USER = os.environ.get("DB_USER")
+DB_PASSWORD = os.environ.get("DB_PASSWORD") 
+DB_HOST = os.environ.get("DB_HOST")
+DB_PORT = os.environ.get("DB_PORT")
 
 def setup_logger():
     logger = logging.getLogger('app_logger')

user_auth/user_manager.py

@@ -1,15 +1,14 @@
 import psycopg2
 from user_auth.user import User
-from settings.base import setup_logger, DATABASES
+from settings.base import setup_logger, DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USER 
 
 
 logger = setup_logger()
 
 class UserManager:
-    PSQL = DATABASES["PSQL"]
     def __init__(self):
         self.conn = psycopg2.connect(
-            dbname=self.PSQL["DB_NAME"], user=self.PSQL["DB_USER"], password=self.PSQL["DB_PASSWORD"], host=self.PSQL["DB_HOST"], port=self.PSQL["DB_PORT"]
+            dbname=DB_NAME, user=DB_USER, password=DB_PASSWORD, host=DB_HOST, port=DB_PORT
         )
         self.cursor = self.conn.cursor()