Reorganize and refactor DB API

- Move corresponding code elements to a specific `src` directory - Create `conn.py` to abstract DB connection functionality
OpenSUTD · Jul 19, 2021 · 7efd785 · 7efd785
1 parent 3f42cf9
commit 7efd785
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 38 deletions.
diff --git a/apis/db/psql/conn.py b/apis/db/psql/conn.py
diff --git a/apis/db/requirements.txt b/apis/db/requirements.txt
@@ -1,4 +1,5 @@
 flask
 flask-cors
-psycopg2-binary
-docker
+gunicorn
+psycopg2
+requests
diff --git a/apis/db/run.sh b/apis/db/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-gunicorn -b 127.0.0.1:8001 app:app
+gunicorn -b 127.0.0.1:8001 --chdir src app:app
diff --git a/apis/db/app.py → apis/db/src/app.py b/apis/db/app.py → apis/db/src/app.py
diff --git a/apis/db/psql/__init__.py → apis/db/src/psql/__init__.py b/apis/db/psql/__init__.py → apis/db/src/psql/__init__.py
diff --git a/apis/db/psql/account.py → apis/db/src/psql/account.py b/apis/db/psql/account.py → apis/db/src/psql/account.py
diff --git a/apis/db/psql/balance.py → apis/db/src/psql/balance.py b/apis/db/psql/balance.py → apis/db/src/psql/balance.py
diff --git a/apis/db/psql/command.py → apis/db/src/psql/command.py b/apis/db/psql/command.py → apis/db/src/psql/command.py
diff --git a/apis/db/src/psql/conn.py b/apis/db/src/psql/conn.py
@@ -0,0 +1,15 @@
+import os
+import psycopg2
+from typing import Tuple
+
+DB_HOST = os.environ.get('DB_HOST', '127.0.0.1')
+DB_PORT = os.environ.get('DB_PORT', 5432)
+
+
+def get_connection():
+    conn = psycopg2.connect(dbname='evs',
+                            user='postgres',
+                            password='docker',
+                            host=DB_HOST,
+                            port=DB_PORT)
+    return conn
diff --git a/apis/db/psql/exec.py → apis/db/src/psql/exec.py b/apis/db/psql/exec.py → apis/db/src/psql/exec.py
diff --git a/apis/db/psql/notification.py → apis/db/src/psql/notification.py b/apis/db/psql/notification.py → apis/db/src/psql/notification.py
diff --git a/apis/db/psql/subscription.py → apis/db/src/psql/subscription.py b/apis/db/psql/subscription.py → apis/db/src/psql/subscription.py
diff --git a/apis/db/psql/web.py → apis/db/src/psql/web.py b/apis/db/psql/web.py → apis/db/src/psql/web.py
@@ -1,8 +1,9 @@
 import json
+import os
 import requests
 
-WEB_API_HOST = 'localhost'
-WEB_API_PORT = 5000
+WEB_API_HOST = os.environ.get('WEB_API_HOST', 'localhost')
+WEB_API_PORT = os.environ.get('WEB_API_PORT', 5000)
 
 
 def get_amount(username: str, password: str) -> float: