Fixing workflow (#1)

* Fake production value to make settings work * Added use of django-dotenv to ease the usage * Fixing test
adamspd · Jan 17, 2024 · 66f014f · 66f014f
1 parent c2379f6
commit 66f014f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -138,7 +138,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+django_payment_manager/.env
 .venv
 env/
 venv/
@@ -179,4 +179,3 @@ cython_debug/
 .DS_Store
 **/.DS_Store
 **/**/.DS_Store
-productions.py
diff --git a/django_payment_manager/settings.py b/django_payment_manager/settings.py
@@ -9,10 +9,11 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.0/ref/settings/
 """
-
+import os
 from pathlib import Path
+import dotenv
 
-from django_payment_manager.productions import PAYPAL_CLIENT_ID, PAYPAL_CLIENT_SECRET, PAYPAL_ENVIRONMENT
+dotenv.read_dotenv(override=True)
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -127,9 +128,9 @@
 
 DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
-PAYMENT_PAYPAL_ENVIRONMENT = PAYPAL_ENVIRONMENT
-PAYMENT_PAYPAL_CLIENT_ID = PAYPAL_CLIENT_ID
-PAYMENT_PAYPAL_CLIENT_SECRET = PAYPAL_CLIENT_SECRET
+PAYMENT_PAYPAL_ENVIRONMENT = os.environ.get("PAYPAL_ENVIRONMENT", "sandbox")
+PAYMENT_PAYPAL_CLIENT_ID = os.environ.get("PAYPAL_CLIENT_ID", "")
+PAYMENT_PAYPAL_CLIENT_SECRET = os.environ.get("PAYPAL_CLIENT_SECRET", "")
 
 PAYMENT_BASE_TEMPLATE = 'homepage/base.html'
 PAYMENT_WEBSITE_NAME = 'CruelTouch'  # or your website name

diff --git a/payment/tests/__init__.py b/payment/tests/__init__.py
diff --git a/payment/tests/test_models.py b/payment/tests/test_models.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 Django==5.0.1
 requests==2.31.0
 setuptools~=69.0.3
-django-appointment==3.0.1
+django-appointment==3.0.1
+django-dotenv==1.4.2