Cleanup + localhost does not redirect 🙏

Signed-off-by: Bojan Jovanovic <[email protected]>

Author: Bojan Jovanovic

pyconbalkan/conference/middleware.py

@@ -11,11 +11,17 @@ def __init__(self, get_response):
         self.get_response = get_response
 
     def __call__(self, request):
-        # Code to be executed for each request before
-        # the view (and later middleware) are called.
+        """
+        Code to be executed for each request before
+        the view (and later middleware) are called.
+        Domain format : 2019.pyconbalkan.com
 
-        # Domain format : 2019.pyconbalkan.com
-        domain = request.META['HTTP_HOST']
+        Every request will have an atribute `conference` in it
+        `conference` is the conference.models.Conference object for the
+        respective year fetched from it's domain.
+        """
+
+        domain = request.META.get('HTTP_HOST', 'localhost')
         try:
             domain_year = int(domain.split('.')[0])
             q = {
@@ -24,19 +30,20 @@ def __call__(self, request):
             if not request.user.is_superuser:
                 q['active'] = True
 
-            conference = Conference.objects.get(**q)
+            request.conference = Conference.objects.get(**q)
         except (Conference.DoesNotExist, ValueError):
-            conference = Conference.objects.filter(active=True).first()
+            request.conference = Conference.objects.filter(active=True).first()
+
+        conference_domain = "{}.{}".format(
+            request.conference.year,
+            settings.META_SITE_DOMAIN
+        )
 
-        conference_domain = conference.year + "." + settings.META_SITE_DOMAIN
-        if conference_domain != request.META['HTTP_HOST']:
+        if settings.DEBUG is False and conference_domain != request.META['HTTP_HOST']:
             return HttpResponseRedirect(
-                urljoin()
+                urljoin(
+                    "{}://{}".format(settings.META_SITE_PROTOCOL, conference_domain
+                ), "/")
             )
 
-        # Every request will have an atribute `conference` in it
-        # `conference` is the conference.models.Conference object for the
-        # respective year fetched from it's domain
-        request.conference = conference
-        response = self.get_response(request)
-        return response
+        return self.get_response(request)

pyconbalkan/core/views.py

@@ -1,12 +1,11 @@
 from django.shortcuts import render
 
-from pyconbalkan.conference.models import Conference, CountDown, MissionStatement
+from pyconbalkan.conference.models import CountDown, MissionStatement
 from pyconbalkan.speaker.models import Speaker
 from pyconbalkan.sponsors.models import Sponsor, SponsorshipLevel
 
 
 def home(request):
-    conference = request.conference
     count_down = CountDown.objects.filter(active=True)
     keynotes = Speaker.objects.filter(active=True, keynote=True).order_by('full_name')
 
@@ -27,6 +26,6 @@ def home(request):
         'partners': partners,
         'count_down': count_down.first() if count_down else None,
         'mission_statement': mission_statement.first() if mission_statement else None,
-        'meta': conference.as_meta(),
+        'meta': request.conference.as_meta(),
     }
     return render(request, 'home.html', context)

pyconbalkan/timetable/views.py

@@ -2,7 +2,6 @@
 from django.shortcuts import render, redirect
 from rest_framework import viewsets
 
-from pyconbalkan.conference.models import Conference
 from pyconbalkan.timetable.models import Room, Slot, Timetable
 from pyconbalkan.timetable.serializers import TimetableSerializer
 
@@ -13,9 +12,8 @@ class TimetableViewSet(viewsets.ModelViewSet):
 
 
 def timetable_pdf_view(request):
-    conference = request.conference
-    if conference and conference.timetable_pdf:
-        return redirect(conference.timetable_pdf.url)
+    if request.conference and request.conference.timetable_pdf:
+        return redirect(request.conference.timetable_pdf.url)
     return redirect('/')
 
 

pyconbalkan/urls.py

@@ -2,9 +2,8 @@
 from django.contrib import admin
 from django.urls import path
 from django.views.generic import TemplateView
-from django.views.static import serve
-
 from markdownx import urls as markdownx
+
 from pyconbalkan.about.api_urls import router as about
 from pyconbalkan.about.views import about_view
 from pyconbalkan.cfp.api_urls import router as cfp
@@ -15,21 +14,19 @@
 from pyconbalkan.contact.api_urls import router as contact
 from pyconbalkan.contact.views import contact_view
 from pyconbalkan.core import routers, views
+from pyconbalkan.faq.api_urls import router as faq
+from pyconbalkan.faq.views import faq_view
 from pyconbalkan.info.views import info_view
 from pyconbalkan.news.api_urls import router as news
 from pyconbalkan.news.views import *
 from pyconbalkan.organizers.api_urls import router as organizers
 from pyconbalkan.organizers.views import (organizer_view, organizers_list,
                                           volunteers_createview)
-from pyconbalkan.settings import PDF_ROOT
 from pyconbalkan.speaker.api_urls import router as speaker
 from pyconbalkan.speaker.views import *
 from pyconbalkan.sponsors.api_urls import router as sponsors
-
-from pyconbalkan.timetable.views import timetable_view, timetable_pdf_view
-from pyconbalkan.faq.views import faq_view
-from pyconbalkan.faq.api_urls import router as faq
 from pyconbalkan.sponsors.views import sponsor_view, sponsoring_view, sponsors_view
+from pyconbalkan.timetable.views import timetable_view, timetable_pdf_view
 
 router = routers.DefaultRouter()
 router.extend(conference)