From 83aaf7ee393160e82fcd0a20473b06f3d851451f Mon Sep 17 00:00:00 2001
From: Max Yakovenko <mxyakovenko9@gmail.com>
Date: Mon, 16 Jul 2018 22:35:48 +0300
Subject: [PATCH] reffactor db settings. make them common

---
 eshop_project/settings/base.py        | 17 +++++++++++++++++
 eshop_project/settings/development.py | 22 ----------------------
 eshop_project/settings/production.py  | 15 ---------------
 3 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/eshop_project/settings/base.py b/eshop_project/settings/base.py
index dc1583d..ba64516 100644
--- a/eshop_project/settings/base.py
+++ b/eshop_project/settings/base.py
@@ -131,6 +131,14 @@ DATABASES = {
     'extra': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR,'eshop.sqlite.db')
+    },
+    'default': {
+        'ENGINE': env.str('DB_ENGINE'),
+        'NAME': env.str('DB_NAME'),
+        'USER': env.str('DB_USER'),
+        'PASSWORD': env.str('DB_PASSWORD'),
+        'HOST': env.str('DB_HOST'),
+        'PORT': env.str('DB_PORT')
     }
 }
 
@@ -176,6 +184,15 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
+
+# Email config
+EMAIL_USE_TLS = EMAIL_CONFIG.get('EMAIL_USE_TLS',True)
+EMAIL_USE_SSL = EMAIL_CONFIG.get("EMAIL_USE_SSL", False)
+EMAIL_HOST = EMAIL_CONFIG.get('EMAIL_HOST')
+EMAIL_PORT = EMAIL_CONFIG.get('EMAIL_PORT')
+EMAIL_HOST_USER = EMAIL_CONFIG.get('EMAIL_HOST_USER')
+EMAIL_HOST_PASSWORD = EMAIL_CONFIG.get('EMAIL_HOST_PASSWORD')
+
 # Logging
 LOGGING = {
     'version': 1,
diff --git a/eshop_project/settings/development.py b/eshop_project/settings/development.py
index 33a8079..4f18907 100644
--- a/eshop_project/settings/development.py
+++ b/eshop_project/settings/development.py
@@ -1,26 +1,4 @@
 from .base import *
-_ = lambda s:s
-# Database settings
-
-DATABASES = {
-    **DATABASES,
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': env.str('DB_NAME'),
-        'USER': env.str('DB_USER'),
-        'PASSWORD': env.str('DB_PASSWORD'),
-        'HOST': env.str('DB_HOST'),
-        'PORT': env.str('DB_PORT')
-    }
-}
-
-# Email server settings
-EMAIL_USE_TLS = env.bool('EMAIL_USE_TLS')
-EMAIL_USE_SSL = env.bool("EMAIL_USE_SSL")
-EMAIL_HOST = env.str('EMAIL_HOST')
-EMAIL_PORT = env.int('EMAIL_PORT')
-EMAIL_HOST_USER = env.str('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = env.str('EMAIL_HOST_PASSWORD')
 
 # Logging settings
 
diff --git a/eshop_project/settings/production.py b/eshop_project/settings/production.py
index 72328ff..f42658b 100644
--- a/eshop_project/settings/production.py
+++ b/eshop_project/settings/production.py
@@ -1,11 +1,5 @@
 from .base import *
 
-# Database settings. There must a database url
-DATABASES = {
-    **DATABASES,
-    'default': env.db()
-}
-
 # Email user settings
 ADMINS = (
     ('Dmitriy Belousov', 'dimkasp@mail.ru'),
@@ -14,15 +8,6 @@ ADMINS = (
 MANAGERS = ADMINS
 DEFAULT_FROM_EMAIL = 'notreply@russianprograms'
 
-# Email config
-EMAIL_CONFIG = env.email_url('EMAIL_URL')
-EMAIL_USE_TLS = EMAIL_CONFIG.get('EMAIL_USE_TLS',True)
-EMAIL_USE_SSL = EMAIL_CONFIG.get("EMAIL_USE_SSL", False)
-EMAIL_HOST = EMAIL_CONFIG.get('EMAIL_HOST')
-EMAIL_PORT = EMAIL_CONFIG.get('EMAIL_PORT')
-EMAIL_HOST_USER = EMAIL_CONFIG.get('EMAIL_HOST_USER')
-EMAIL_HOST_PASSWORD = EMAIL_CONFIG.get('EMAIL_HOST_PASSWORD')
-
 # Logging
 LOGGING['handlers']['production_file']['filename'] = os.path.join(os.path.dirname(BASE_DIR),'logs/eshop_main_prod.log')
 LOGGING['handlers']['debug_file']['filename'] = os.path.join(os.path.dirname(BASE_DIR),'logs/eshop_main_dev.log')