Fetch sponsor data synchronously on the homepage.

Author: umgelurgel

conference/homepage.py

@@ -1,9 +1,7 @@
 from django.conf import settings
-from django.http import JsonResponse
 from django.template.response import TemplateResponse
 from django.utils.lorem_ipsum import words, paragraphs
 
-
 from .models import Sponsor
 
 
@@ -30,15 +28,6 @@ def homepage(request):
  )
 
 
-def homepage_sponsors(request):
- # Sponsor data to be rendered on the homepage
- sponsors = Sponsor.objects.filter(
- sponsorincome__conference=settings.CONFERENCE_CONFERENCE
- ).values('sponsor', 'url', 'logo', 'alt_text', 'title_text')
-
- return JsonResponse({'sponsors': list(sponsors)})
-
-
 def generic_content_page(request):
  return TemplateResponse(
  request, 'conference/content/generic_content_page.html', {

conference/templatetags/conference.py

@@ -2,6 +2,7 @@
 import re
 
 from django import template
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.urls import reverse
 
@@ -102,6 +103,13 @@ def profile_data(uid):
  return dataaccess.profile_data(uid)
 
 
+@register.simple_tag()
+def sponsor_data():
+ return models.Sponsor.objects.filter(
+ sponsorincome__conference=settings.CONFERENCE_CONFERENCE
+ )
+
+
 @register.filter
 def attrib_(ob, attrib):
  try:

pycon/urls.py

@@ -12,7 +12,6 @@
 from conference.homepage import (
  generic_content_page,
  generic_content_page_with_sidebar,
- homepage_sponsors,
 )
 from conference.news import news_list
 from conference.talk_voting import urlpatterns as talk_voting_urls
@@ -26,7 +25,6 @@
 admin.site.index_template = 'p3/admin/index.html'
 
 urlpatterns = [
- re_path(r'^sponsors/$', homepage_sponsors, name='homepage_sponsors'),
  re_path(r'^generic-content-page/$', generic_content_page),
  re_path(r'^generic-content-page/with-sidebar/$', generic_content_page_with_sidebar),
  re_path(r'^user-panel/', include((user_panel_urls, 'conference'), namespace="user_panel")),

templates/conference/homepage/_sponsors_cms.html

@@ -1,5 +1,7 @@
 {% extends "conference/base.html" %}
 
+{% load conference %}
+
 {% block body %}
 
 {% include "conference/header/_with_jumbotron.html" %}
@@ -8,7 +10,8 @@
 
 {% include "conference/homepage/_venue.html" with CCD_GOOGLEMAPS_URL="https://goo.gl/maps/X57SxAPbiJV3Fcig9" CCD_OSM_URL="https://www.openstreetmap.org/way/60270053" %}
 
-{% include "conference/homepage/_sponsors_cms.html" %}
+{% sponsor_data as sponsors %}
+{% include "conference/homepage/_sponsors.html" with sponsors=sponsors%}
 
 {% include "conference/footer/footer.html" %}
 

templates/conference/homepage/home_template.html

@@ -1,5 +1,3 @@
-import pytest
-
 from django.conf import settings
 
 from tests.common_tools import template_used
@@ -15,7 +13,7 @@ def test_get_homepage(db, client):
  assert response.status_code == 200
  assert template_used(response, "conference/homepage/home_template.html")
  assert template_used(response, "conference/homepage/_venue.html")
- assert template_used(response, "conference/homepage/_sponsors_cms.html")
+ assert template_used(response, "conference/homepage/_sponsors.html")
  assert template_used(response, "conference/homepage/_schedule_overview.html")
  assert template_used(response, "conference/header/_with_jumbotron.html")
  assert b"EuroPython 2020" in response.content
@@ -51,9 +49,6 @@ def test_homepage_doesnt_contain_sponsor_if_income_for_different_conference(
  assert sponsor.title_text not in response.content.decode()
 
 
-@pytest.mark.skip(
- reason="Sponsor data is fetched asynchronously via JS; need a different way to tests this"
-)
 def test_homepage_contains_sponsors_if_income_for_current_conference(
  db, client
 ):