From f1e4e1ce58f1bae8a22a2ab0ae641d0c3f2779a4 Mon Sep 17 00:00:00 2001
From: Roman Mogylatov <rmogilatov@gmail.com>
Date: Sun, 4 Oct 2020 14:00:02 -0400
Subject: [PATCH] Refactor settings

---
 examples/miniapps/django/githubnavigator/__init__.py   | 5 ++---
 examples/miniapps/django/githubnavigator/containers.py | 4 ++--
 examples/miniapps/django/githubnavigator/settings.py   | 8 ++++++++
 examples/miniapps/django/githubnavigator/web/views.py  | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/examples/miniapps/django/githubnavigator/__init__.py b/examples/miniapps/django/githubnavigator/__init__.py
index db87f629..7421382f 100644
--- a/examples/miniapps/django/githubnavigator/__init__.py
+++ b/examples/miniapps/django/githubnavigator/__init__.py
@@ -1,9 +1,8 @@
 """Main package."""
 
 from .containers import Container
+from . import settings
 
 
 container = Container()
-container.config.github.request_timeout.override(5)
-container.config.default.query.override('Dependency Injector')
-container.config.default.limit.override(5)
+container.config.from_dict(settings.__dict__)
diff --git a/examples/miniapps/django/githubnavigator/containers.py b/examples/miniapps/django/githubnavigator/containers.py
index d2a0e7ca..99b7eafc 100644
--- a/examples/miniapps/django/githubnavigator/containers.py
+++ b/examples/miniapps/django/githubnavigator/containers.py
@@ -12,8 +12,8 @@ class Container(containers.DeclarativeContainer):
 
     github_client = providers.Factory(
         Github,
-        login_or_token=config.github.auth_token,
-        timeout=config.github.request_timeout,
+        login_or_token=config.GITHUB_TOKEN,
+        timeout=config.GITHUB_REQUEST_TIMEOUT,
     )
 
     search_service = providers.Factory(
diff --git a/examples/miniapps/django/githubnavigator/settings.py b/examples/miniapps/django/githubnavigator/settings.py
index 3a55dbcb..6959bd37 100644
--- a/examples/miniapps/django/githubnavigator/settings.py
+++ b/examples/miniapps/django/githubnavigator/settings.py
@@ -119,3 +119,11 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = '/static/'
+
+# Github client settings
+GITHUB_TOKEN = os.getenv('GITHUB_TOKEN')
+GITHUB_REQUEST_TIMEOUT = 10
+
+# Default search settings
+DEFAULT_LIMIT = 5
+DEFAULT_QUERY = 'Dependency Injector'
diff --git a/examples/miniapps/django/githubnavigator/web/views.py b/examples/miniapps/django/githubnavigator/web/views.py
index 68345491..87174d4f 100644
--- a/examples/miniapps/django/githubnavigator/web/views.py
+++ b/examples/miniapps/django/githubnavigator/web/views.py
@@ -9,8 +9,8 @@ from githubnavigator.services import SearchService
 def index(
         request: HttpRequest,
         search_service: SearchService = Provide[Container.search_service],
-        default_query: str = Provide[Container.config.default.query],
-        default_limit: int = Provide[Container.config.default.limit.as_int()],
+        default_query: str = Provide[Container.config.DEFAULT_QUERY],
+        default_limit: int = Provide[Container.config.DEFAULT_LIMIT.as_int()],
 ) -> HttpResponse:
     query = request.GET.get('query', default_query)
     limit = int(request.GET.get('limit', default_limit))