From 2b7fecb2487b4d3c5b9abb41a2b3390d9310b5bc Mon Sep 17 00:00:00 2001
From: Sweetbread <risdeveau@codrs.ru>
Date: Sun, 26 Oct 2025 14:55:43 +0300
Subject: [PATCH] fix(env): ensure the .env is loaded

---
 .env.tmp                  |  2 ++
 app.py                    |  5 ++++-
 dependencies.txt          |  2 +-
 utils/PostgressConnect.py |  2 +-
 utils/loadDotEnv.py       | 12 ++++++------
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 .env.tmp

diff --git a/.env.tmp b/.env.tmp
new file mode 100644
index 0000000..d121f85
--- /dev/null
+++ b/.env.tmp
@@ -0,0 +1,2 @@
+KEY=  # Key for JWT token
+POSTGRES_URL=postgresql://
diff --git a/app.py b/app.py
index 0f7ae34..f225ca0 100644
--- a/app.py
+++ b/app.py
@@ -1,9 +1,12 @@
+from sys import exit
 from flask import Flask
 from api.auth.loginapi import loginBP
 from utils.loadDotEnv import initializeENV
 from utils.PostgressConnect import PSQLConnect, PSQLCursor
 
-state = initializeENV()
+if not initializeENV():
+    exit(-1)
+
 #conn = PSQLConnect()
 #cur = PSQLCursor(conn)
 
diff --git a/dependencies.txt b/dependencies.txt
index 5758f3e..4fc4ead 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -1,4 +1,4 @@
 flask==3.1.2
 python-dotenv
-psycopg-binary
+psycopg2-binary
 pyjwt
diff --git a/utils/PostgressConnect.py b/utils/PostgressConnect.py
index d420fbf..ea6a485 100644
--- a/utils/PostgressConnect.py
+++ b/utils/PostgressConnect.py
@@ -2,7 +2,7 @@ import psycopg2
 import os
 
 def PSQLConnect():
-    conn = psycopg2.connect(os.getenv('POSTDRESS_CONNECTION'))
+    conn = psycopg2.connect(os.getenv('POSTGRES_URL'))
     return conn
 
 def PSQLCursor(conn):
diff --git a/utils/loadDotEnv.py b/utils/loadDotEnv.py
index ec6c9d5..85bbc72 100644
--- a/utils/loadDotEnv.py
+++ b/utils/loadDotEnv.py
@@ -2,14 +2,14 @@ import os
 from dotenv import load_dotenv
 from .createLogger import createLogger
 
+DOTENV_PATH = '.env'
 log = createLogger("ENV")
 
-def initializeENV():
-    dotenv_path = '../.env'
-    if os.path.exists(dotenv_path):
-        load_dotenv(dotenv_path)
+def initializeENV() -> bool:
+    if os.path.exists(DOTENV_PATH):
+        load_dotenv(DOTENV_PATH)
         log.info('.env is loaded')
-        return 1
+        return True
     else:
         log.error('.env isn`t loaded')
-        return 0
+        return False