From a4499ab861eaa795f871697e72b727d4b41987f9 Mon Sep 17 00:00:00 2001
From: Zvonimir Sabljic <zvonimir@pythagora.io>
Date: Wed, 16 Aug 2023 16:13:22 +0200
Subject: [PATCH] Refactored db info to the .env file

---
 pilot/const/db.py                               |  5 -----
 pilot/database/models/components/base_models.py | 17 +++++++++++------
 pilot/main.py                                   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 pilot/const/db.py

diff --git a/pilot/const/db.py b/pilot/const/db.py
deleted file mode 100644
index 14bcddb..0000000
--- a/pilot/const/db.py
+++ /dev/null
@@ -1,5 +0,0 @@
-DB_NAME = 'pilot'
-DB_HOST = 'localhost'
-DB_PORT = '5432'
-DB_USER = 'admin'
-DB_PASSWORD = 'admin'
diff --git a/pilot/database/models/components/base_models.py b/pilot/database/models/components/base_models.py
index 6edc650..22f01f3 100644
--- a/pilot/database/models/components/base_models.py
+++ b/pilot/database/models/components/base_models.py
@@ -1,17 +1,22 @@
+import os
 from peewee import *
 from datetime import datetime
 from uuid import uuid4
 
-from const import db
+DB_NAME = os.getenv("DB_NAME")
+DB_HOST = os.getenv("DB_HOST")
+DB_PORT = os.getenv("DB_PORT")
+DB_USER = os.getenv("DB_USER")
+DB_PASSWORD = os.getenv("DB_PASSWORD")
 
 
 # Establish connection to the database
 database = PostgresqlDatabase(
-    db.DB_NAME,
-    user=db.DB_USER,
-    password=db.DB_PASSWORD,
-    host=db.DB_HOST,
-    port=db.DB_PORT
+    DB_NAME,
+    user=DB_USER,
+    password=DB_PASSWORD,
+    host=DB_HOST,
+    port=DB_PORT
 )
 
 
diff --git a/pilot/main.py b/pilot/main.py
index fd21b0e..f51edb9 100644
--- a/pilot/main.py
+++ b/pilot/main.py
@@ -2,6 +2,8 @@
 from __future__ import print_function, unicode_literals
 
 from dotenv import load_dotenv
+load_dotenv()
+
 from helpers.Project import Project
 
 from utils.arguments import get_arguments
@@ -9,8 +11,6 @@ from logger.logger import logger
 
 
 def init():
-    load_dotenv()
-
     arguments = get_arguments()
 
     logger.info(f"Starting with args: {arguments}")