From 03a3c5a35ba4bfec2ed4bac39bd6e1c3d19658a1 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Mon, 8 Aug 2022 12:28:10 -0500
Subject: [PATCH] Added test suite to main app

---
 CollegiateHouseWars/settings/dev.py  |  8 +++++---
 CollegiateHouseWars/settings/prod.py | 18 ++++++++++--------
 CollegiateHouseWars/settings/test.py |  4 +++-
 CollegiateHouseWars/wsgi.py          |  3 ++-
 housewars/tests/__init__.py          |  0
 5 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 housewars/tests/__init__.py

diff --git a/CollegiateHouseWars/settings/dev.py b/CollegiateHouseWars/settings/dev.py
index 0f88db5..3a3d0e6 100644
--- a/CollegiateHouseWars/settings/dev.py
+++ b/CollegiateHouseWars/settings/dev.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 import os
 from django.contrib.messages import constants
+from dotenv import dotenv_values
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
@@ -11,7 +12,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 # SECURITY WARNING: keep the secret key used in production secret!
 DOTENV_FILE = BASE_DIR / '.env'
-SECRET_KEY = os.environ.get('SECRET_KEY')
+CONFIG = dotenv_values(DOTENV_FILE)
+SECRET_KEY = CONFIG.get('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
@@ -78,8 +80,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'dev',
-        'USER': os.environ.get('DATABASE_USERNAME'),
-        'PASSWORD': os.environ.get('DATABASE_PASSWORD'),
+        'USER': CONFIG.get('DATABASE_USERNAME'),
+        'PASSWORD': CONFIG.get('DATABASE_PASSWORD'),
         'HOST': 'mysqldb',
         'PORT': '3306'
     }
diff --git a/CollegiateHouseWars/settings/prod.py b/CollegiateHouseWars/settings/prod.py
index ca83e42..ad686b0 100644
--- a/CollegiateHouseWars/settings/prod.py
+++ b/CollegiateHouseWars/settings/prod.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 import os
 from django.contrib.messages import constants
+from dotenv import dotenv_values
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
@@ -11,7 +12,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 # SECURITY WARNING: keep the secret key used in production secret!
 DOTENV_FILE = BASE_DIR / '.env'
-SECRET_KEY = os.environ.get('SECRET_KEY')
+CONFIG = dotenv_values(DOTENV_FILE)
+SECRET_KEY = CONFIG.get('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
@@ -21,8 +23,8 @@ SESSION_COOKIE_SECURE = False
 CSRF_COOKIE_SECURE = False
 
 ALLOWED_HOSTS = [
-    'localhost',
-    '127.0.0.1',
+    '45.79.52.230',
+    'housewars.c4thebomb101.com'
 ]
 
 # Application definition
@@ -77,10 +79,10 @@ WSGI_APPLICATION = 'CollegiateHouseWars.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'prod',
-        'USER': os.environ.get('DATABASE_USERNAME'),
-        'PASSWORD': os.environ.get('DATABASE_PASSWORD'),
-        'HOST': 'mysqldb',
+        'NAME': 'housewars',
+        'USER': CONFIG.get('DATABASE_USERNAME'),
+        'PASSWORD': CONFIG.get('DATABASE_PASSWORD'),
+        'HOST': 'localhost',
         'PORT': '3306'
     }
 }
@@ -121,7 +123,7 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/4.0/howto/static-files/
 
 STATIC_URL = 'static/'
-STATIC_ROOT = '/var/www/housewars/static/'
+STATIC_ROOT = '/var/www/housewars/files/static/'
 
 STATICFILES_DIRS = [
     BASE_DIR / "static"
diff --git a/CollegiateHouseWars/settings/test.py b/CollegiateHouseWars/settings/test.py
index 4466a06..add8b6d 100644
--- a/CollegiateHouseWars/settings/test.py
+++ b/CollegiateHouseWars/settings/test.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 import os
 from django.contrib.messages import constants
+from dotenv import dotenv_values
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent.parent
@@ -10,7 +11,8 @@ BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 # SECURITY WARNING: keep the secret key used in production secret!
 DOTENV_FILE = BASE_DIR / '.env'
-SECRET_KEY = os.environ.get('SECRET_KEY')
+CONFIG = dotenv_values(DOTENV_FILE)
+SECRET_KEY = CONFIG.get('SECRET_KEY')
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
diff --git a/CollegiateHouseWars/wsgi.py b/CollegiateHouseWars/wsgi.py
index 60e7c54..e844c48 100644
--- a/CollegiateHouseWars/wsgi.py
+++ b/CollegiateHouseWars/wsgi.py
@@ -11,6 +11,7 @@ import os
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'CollegiateHouseWars.settings')
+os.environ.setdefault('DJANGO_SETTINGS_MODULE',
+                      'CollegiateHouseWars.settings.prod')
 
 application = get_wsgi_application()
diff --git a/housewars/tests/__init__.py b/housewars/tests/__init__.py
new file mode 100644
index 0000000..e69de29