update sorting and heroku db configuration

core/settings.py

@@ -12,6 +12,7 @@
 import os
 from pathlib import Path
 
+import dj_database_url
 import environ
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -140,7 +141,7 @@
     ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.TokenAuthentication',
-        # 'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
     ),
     'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
     'DEFAULT_VERSIONING_CLASS': 'rest_framework.versioning.NamespaceVersioning',
@@ -233,6 +234,13 @@
 
 if DEBUG is False:
 
+
+    # DATABASES['default'] = dj_database_url.config(conn_max_age=600, ssl_require=True)
+
     STATIC_LOCATION = 'static'
     STATIC_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/{STATIC_LOCATION}/'
     STATICFILES_STORAGE = 'core.storage_backends.StaticStorage'
+
+    DATABASES['default'] = dj_database_url.config(
+        default=env('DATABASE_URL'),ssl_require=True
+    )

core/urls.py

@@ -13,13 +13,13 @@
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
-from django.contrib import admin
-from django.urls import path, include
 from django.conf.urls.static import static
+from django.contrib import admin
+from django.urls import include, path
 from django.views.generic.base import TemplateView
 from rest_framework.schemas import get_schema_view
-from . import settings
 
+from . import settings
 
 urlpatterns = [
     path('admin/', admin.site.urls),

module/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from .models import Module
 
 admin.site.site_header = 'Biomed Admin Panel'

module/models.py

@@ -1,5 +1,7 @@
 import uuid
+
 from django.db import models
+
 # from topic.models import Topic
 
 course_type = [('C', 'Core'), ('F', 'Fundamental')]

module/serializers.py

@@ -1,5 +1,7 @@
 from rest_framework import serializers
+
 from topic.serializers import TopicSerializer
+
 from .models import Module
 
 

module/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 from rest_framework.routers import DefaultRouter
-from .views import ModuleViewSet, ListAll, ModuleTopic
+
+from .views import ListAll, ModuleTopic, ModuleViewSet
 
 module_list = ModuleViewSet.as_view({
     'get': 'list',

module/views.py

@@ -1,8 +1,8 @@
 from django.shortcuts import render
+from rest_framework.generics import GenericAPIView
 from rest_framework.renderers import TemplateHTMLRenderer
 from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
-from rest_framework.generics import GenericAPIView
 
 from .models import Module
 from .serializers import ModuleSerializer

requirements/base.txt

@@ -11,4 +11,5 @@ django-environ
 whitenoise
 django-ses
 djoser
-django-smtp-ssl
+django-smtp-ssl
+dj_database_url

resources/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from .models import Resource
 
 admin.site.register(Resource)

resources/models.py

@@ -1,7 +1,9 @@
 import uuid
+
 from django.db import models
-from topic.models import Topic
+
 from core.storage_backends import PublicMediaStorage
+from topic.models import Topic
 
 
 class Resource(models.Model):

resources/serializers.py

@@ -1,4 +1,5 @@
 from rest_framework import serializers
+
 from .models import Resource
 
 

resources/urls.py

@@ -1,5 +1,6 @@
 from django.urls import re_path as url
 from rest_framework.routers import DefaultRouter
+
 from .views import ResourceViewSet, download_from_s3, view_from_s3
 
 resource_list = ResourceViewSet.as_view({

resources/views.py

@@ -1,9 +1,10 @@
 import boto3
 from django.conf import settings
-from rest_framework.viewsets import ModelViewSet
-from rest_framework.decorators import api_view
-from rest_framework import request, response
 from django.http import HttpResponseRedirect
+from rest_framework import request, response
+from rest_framework.decorators import api_view
+from rest_framework.viewsets import ModelViewSet
+
 from .models import Resource
 from .serializers import ResourceSerializer
 

topic/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from .models import Topic
 
 admin.site.register(Topic)

topic/models.py

@@ -1,5 +1,7 @@
 import uuid
+
 from django.db import models
+
 from module.models import Module
 
 

topic/serializers.py

@@ -1,7 +1,9 @@
 from rest_framework import serializers
-from .models import Topic
+
 from resources.serializers import ResourceSerializer
 
+from .models import Topic
+
 
 class TopicSerializer(serializers.ModelSerializer):
     module = serializers.SlugRelatedField(

topic/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 from rest_framework.routers import DefaultRouter
-from .views import TopicViewSet, ShowTopicResources
+
+from .views import ShowTopicResources, TopicViewSet
 
 topic_list = TopicViewSet.as_view({
     'get': 'list',

topic/views.py

@@ -1,8 +1,8 @@
 from django.shortcuts import render
-from rest_framework.response import Response
+from rest_framework.generics import GenericAPIView
 from rest_framework.renderers import TemplateHTMLRenderer
+from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
-from rest_framework.generics import GenericAPIView
 
 from .models import Topic
 from .serializers import TopicSerializer

users/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+
 from .models import User
 
 # Register your models here.

users/management/commands/seed_groups.py

@@ -1,11 +1,12 @@
 from unicodedata import name
-from django.core.management.base import BaseCommand
-from django.contrib.auth.models import Group,Permission
+
+from django.contrib.auth.models import Group, Permission
 from django.contrib.contenttypes.models import ContentType
+from django.core.management.base import BaseCommand
 
-from topic.models import Topic
-from resources.models import Resource
 from module.models import Module
+from resources.models import Resource
+from topic.models import Topic
 
 
 class Command(BaseCommand):

users/models.py

@@ -1,9 +1,9 @@
 import email
 import uuid
-from django.contrib.auth.models import AbstractUser,Group
-from django.dispatch import receiver
-from django.db import models
 
+from django.contrib.auth.models import AbstractUser, Group
+from django.db import models
+from django.dispatch import receiver
 
 # TODO: Setup email verification
 

users/serializers.py

@@ -1,7 +1,9 @@
 
+from djoser.serializers import \
+    UserCreateSerializer as BaseUserRegistrationSerializer
 from rest_framework import serializers
 from rest_framework.validators import UniqueValidator
-from djoser.serializers import UserCreateSerializer as BaseUserRegistrationSerializer
+
 from .models import User
 
 

users/urls.py

@@ -1,8 +1,8 @@
 
 from django.urls import re_path as url
 from rest_framework.routers import DefaultRouter
-from .views import UserViewSet
 
+from .views import UserViewSet
 
 users_list = UserViewSet.as_view({
     'get': 'list',

users/views.py

@@ -1,8 +1,9 @@
-from rest_framework.viewsets import ModelViewSet
+from rest_framework.permissions import IsAuthenticatedOrReadOnly
 from rest_framework.views import APIView
+from rest_framework.viewsets import ModelViewSet
+
 from .models import User
 from .serializers import UserSerializer
-from rest_framework.permissions import IsAuthenticatedOrReadOnly
 
 
 class UserViewSet(ModelViewSet):