From bfeb3718f5dfb3e0b7250ff6bb63a2d93eab4993 Mon Sep 17 00:00:00 2001 From: Nathan Chapman Date: Tue, 1 Nov 2022 18:14:13 -0600 Subject: [PATCH] Update database settings and config for testing --- src/ptcoffee/config.py | 20 ++++++++++++++------ src/ptcoffee/settings.py | 15 +++------------ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/ptcoffee/config.py b/src/ptcoffee/config.py index 8701bbc..8d6e813 100644 --- a/src/ptcoffee/config.py +++ b/src/ptcoffee/config.py @@ -5,13 +5,21 @@ load_dotenv() DEBUG = os.environ.get('DEBUG', 'True') == 'True' -DATABASE_CONFIG = { - 'ENGINE': 'django.db.backends.postgresql', - 'OPTIONS': { - 'service': 'pg_service', - 'passfile': '.pgpass' +if DEBUG: + DATABASE_CONFIG = { + 'ENGINE': 'django.db.backends.postgresql', + 'USER': 'django', + 'NAME': 'ptcoffee_dev' } -} +else: + DATABASE_CONFIG = { + 'ENGINE': 'django.db.backends.postgresql', + 'OPTIONS': { + 'service': 'pg_service', + 'passfile': '.pgpass' + } + } + SECRET_KEY = os.environ.get('SECRET_KEY', '') CACHE_CONFIG = { 'LOCATION': 'redis://127.0.0.1:6379', diff --git a/src/ptcoffee/settings.py b/src/ptcoffee/settings.py index 70c3c49..39b2ebf 100644 --- a/src/ptcoffee/settings.py +++ b/src/ptcoffee/settings.py @@ -99,18 +99,9 @@ WSGI_APPLICATION = 'ptcoffee.wsgi.application' # Database # https://docs.djangoproject.com/en/3.2/ref/settings/#databases -if DEBUG: - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'USER': 'django', - 'NAME': 'ptcoffee_dev', - }, - } -else: - DATABASES = { - 'default': DATABASE_CONFIG - } +DATABASES = { + 'default': DATABASE_CONFIG +} CACHES = {'default': CACHE_CONFIG}