Merge pull request pycontw#1133 from pycontw/clean-sponsor-app

chore(sponsor): remove sponsor-related deprecated code

src/attendee/tests.py

@@ -1,6 +1,7 @@
 import pytest
 from django.conf import settings
 from registry.helper import reg
+from rest_framework.test import APIClient
 
 from attendee.models import Attendee
 from core.models import Token
@@ -13,9 +14,10 @@
  ('1234', 200, 2),
 ])
 @pytest.mark.django_db
-def test_attendee(drf_api_client, bare_user, attendee_token, status, num_channel):
+def test_attendee(bare_user, attendee_token, status, num_channel):
+ api_client = APIClient()
  token = Token.objects.get_or_create(user=bare_user)
- drf_api_client.credentials(HTTP_AUTHORIZATION="Token " + str(token[0]))
+ api_client.credentials(HTTP_AUTHORIZATION="Token " + str(token[0]))
  attendee = Attendee(token="1234")
  attendee.save() # insert to database
  # add slug
@@ -25,7 +27,7 @@ def test_attendee(drf_api_client, bare_user, attendee_token, status, num_channel
  reg[f"{key_prefix}r{i}"] = f"video_id_{i}"
 
  # test
- response = drf_api_client.post('/api/attendee/verify/', data={"token": attendee_token})
+ response = api_client.post('/api/attendee/verify/', data={"token": attendee_token})
  assert response.status_code == status
  if status == 200:
  assert len(response.json()["youtube_infos"]) == num_channel

src/ccip/urls.py

@@ -5,6 +5,5 @@
 urlpatterns = [
  # API for CCIP
  url(r'^$', views.CCIPAPIView.as_view()),
- url(r'^sponsors/$', views.CCIPSponsorsView.as_view()),
  url(r'^staff/$', views.CCIPStaffView.as_view()),
 ]

src/ccip/views.py

@@ -9,7 +9,6 @@
 from django.views.generic import TemplateView, View
 
 from core.utils import TemplateExistanceStatusResponse
-from core.views import IndexView
 from events.models import (
  CustomEvent,
  KeynoteEvent,
@@ -287,11 +286,6 @@ def _room_sort_key(v):
  }, safe=False)
 
 
-class CCIPSponsorsView(IndexView):
- template_name = 'ccip/sponsors.html'
- response_class = TemplateExistanceStatusResponse
-
-
 class CCIPStaffView(TemplateView):
  template_name = 'ccip/staff.html'
  response_class = TemplateExistanceStatusResponse

src/conftest.py

@@ -8,8 +8,9 @@
 from django.test.html import parse_html
 from rest_framework.test import APIClient
 
+from core.models import Token
 from proposals.models import TalkProposal
-from users.models import CocRecord
+from users.models import CocRecord, User
 
 
 class HTMLParser:
@@ -206,5 +207,8 @@ def accepted_talk_proposal(talk_proposal):
 
 
 @pytest.fixture
-def drf_api_client():
- return APIClient()
+def api_client(bare_user: User) -> APIClient:
+ api_client = APIClient()
+ token, _ = Token.objects.get_or_create(user=bare_user)
+ api_client.credentials(HTTP_AUTHORIZATION=f"Token {token.key}")
+ yield api_client

src/core/context_processors.py

@@ -1,11 +1,5 @@
-import itertools
-import operator
-
 from django.conf import settings
 from django.urls import get_script_prefix
-from django.utils.translation import get_language
-
-from sponsors.models import Sponsor
 
 
 def _build_google_form_url(uid):
@@ -19,40 +13,17 @@ def script_prefix(request):
 
 
 def pycontw(request):
- lang = get_language()
- if lang and lang.startswith('zh'):
- sponsor_id = '1FAIpQLScEIeCrTHNvwbdNbZt4nK1mteC6NzHtXgF5bVn1KTtR0_sorA'
- volun_id = '1FAIpQLScYhMAg4_T4Shi-W0vt9EkGyrpTMHemvcY55ZKc2-MfVqDzGg'
- else:
- sponsor_id = '1FAIpQLScEIeCrTHNvwbdNbZt4nK1mteC6NzHtXgF5bVn1KTtR0_sorA'
- volun_id = '1FAIpQLScYhMAg4_T4Shi-W0vt9EkGyrpTMHemvcY55ZKc2-MfVqDzGg'
+ volun_id = '1FAIpQLScYhMAg4_T4Shi-W0vt9EkGyrpTMHemvcY55ZKc2-MfVqDzGg'
  return {
  'GTM_TRACK_ID': settings.GTM_TRACK_ID,
  'KKTIX_URL': {
  'RSVD': 'https://pycontw.kktix.cc/events/20200905-reserved',
  'INDI': 'https://pycontw.kktix.cc/events/20200905-individual',
  'CORP': 'https://pycontw.kktix.cc/events/20200905-corporate',
  },
- 'SPONSOR_FORM_URL': _build_google_form_url(sponsor_id),
  'VOLUNTEER_FORM_URL': _build_google_form_url(volun_id),
  }
 
 
-def _iter_sponsor_section():
- groups = itertools.groupby(
- Sponsor.objects.order_by('level'),
- key=operator.methodcaller('get_level_display'),
- )
- for k, v in groups:
- yield k, list(v)
-
-
-def sponsors(request):
- return {
- 'sponsors': Sponsor.objects.order_by('level'),
- 'sponsor_sections': _iter_sponsor_section(),
- }
-
-
 def frontend_host(request):
  return {'FRONTEND_HOST': settings.FRONTEND_HOST}

src/core/views.py

@@ -6,29 +6,21 @@
 from django.views.defaults import page_not_found, server_error
 from django.views.generic import TemplateView
 
-from .data import EXTRA_DATA
 from .utils import (
  TemplateExistanceStatusResponse,
  collect_language_codes,
 )
 
 
-class ExtraDataMixin:
- def get_context_data(self, **kwargs):
- data = super().get_context_data(**kwargs)
- data.update(EXTRA_DATA.get(self.path, {}))
- return data
-
-
-class IndexView(ExtraDataMixin, TemplateView):
+class IndexView(TemplateView):
  template_name = 'index.html'
  path = ''
 
  def dispatch(self, request, *args, **kwargs):
  return redirect(reverse('user_dashboard'))
 
 
-class FlatPageView(ExtraDataMixin, TemplateView):
+class FlatPageView(TemplateView):
 
  response_class = TemplateExistanceStatusResponse
 

src/events/templatetags/events.py

@@ -2,7 +2,6 @@
 from django.template import Library
 
 from events.models import KeynoteEvent
-from sponsors.models import OpenRole, Sponsor
 
 register = Library()
 
@@ -22,20 +21,3 @@ def event_date_display(event):
 @register.simple_tag
 def get_keynote_events():
  return KeynoteEvent.objects.order_by('begin_time')
-
-
-def _get_sponsors_with_open_roles():
- sponsor_has_open_role = set(OpenRole.objects.values_list('sponsor', flat=True))
- sponsor_set = Sponsor.objects.filter(id__in=sponsor_has_open_role).order_by('level')
-
- return sponsor_set
-
-
-@register.simple_tag
-def get_open_roles_of_sponsors():
- return _get_sponsors_with_open_roles()
-
-
-@register.simple_tag
-def get_open_roles():
- return OpenRole.objects.order_by('sponsor')

src/events/tests/api/test_list_speeches.py

@@ -1,7 +1,6 @@
 import pytest
 from django.urls import reverse
 
-from core.models import Token
 from events.models import ProposedTalkEvent, ProposedTutorialEvent, SponsoredEvent
 
 
@@ -34,11 +33,9 @@
  "INTNL",
  ],
 )
-def test_list_speeches_by_category(category, bare_user, drf_api_client):
+def test_list_speeches_by_category(category, api_client):
  url = reverse("events:speeches-category", kwargs={"category": category})
- token = Token.objects.get_or_create(user=bare_user)
- drf_api_client.credentials(HTTP_AUTHORIZATION="Token " + str(token[0]))
- response = drf_api_client.get(url)
+ response = api_client.get(url)
 
  for event in response.json():
  assert event["category"] == category