diff --git a/requirements.txt b/requirements.txt index c017551..e33176a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,3 +12,4 @@ djangorestframework==3.9.2 # Packages needed for running the tests. Needed by contributors. # ============================================================== factory-boy==2.11.1 +python-environ==0.4.54 diff --git a/tinylinks/management/commands/_config.py b/tinylinks/management/commands/_config.py index 96b7551..6f24106 100644 --- a/tinylinks/management/commands/_config.py +++ b/tinylinks/management/commands/_config.py @@ -1,15 +1,13 @@ -user = "" -password = "" -host = "127.0.0.1" -database = "" -raise_on_warnings = True +import environ +env = environ.Env() +env.read_env(".env") config = { - "user": user, - "password": password, - "host": host, - "database": database, - "raise_on_warnings": raise_on_warnings, + "user": env.str("MYSQL_USER", ""), + "password": env.str("MYSQL_PASSWORD", ""), + "host": env.str("MYSQL_HOSTNAME", ""), + "database": env.str("MYSQL_DATABASE", ""), + "raise_on_warnings": env.bool("MYSQL_RAISE_ON_WARNING", ""), } diff --git a/tinylinks/views.py b/tinylinks/views.py index 60c5ca6..38fb69c 100644 --- a/tinylinks/views.py +++ b/tinylinks/views.py @@ -235,7 +235,7 @@ def create(self, request, *args, **kwargs): headers = self.get_success_headers(serializer.data) data = { "id": instance.id, - "short_url": request.build_absolute_uri("/%s" % instance.short_url), + "short_url": request.build_absolute_uri("/%s" % instance.get_short_url()), "long_url": instance.long_url, }