Merge pull request pycontw#1132 from pycontw/rm-schedule-model-and-views

chore: remove deprecated schedule model, views, page, ...etc

pyproject.toml

@@ -29,7 +29,6 @@ psycopg2 = "2.9.9"
 pytz = "2024.1"
 requests = "2.31.0"
 sorl-thumbnail = "12.10.0"
-sortedcontainers = "2.4.0"
 tabulate = "0.9.0"
 uwsgi = "2.0.24"
 Pillow = "10.3.0"

src/core/context_processors.py

@@ -54,9 +54,5 @@ def sponsors(request):
  }
 
 
-def events(request):
- return {'schedule_redirect_url': settings.SCHEDULE_REDIRECT_URL}
-
-
 def frontend_host(request):
  return {'FRONTEND_HOST': settings.FRONTEND_HOST}

src/core/tests/test_views.py

@@ -2,11 +2,7 @@
 import os
 
 import pytest
-from django.conf import settings
 from django.utils.translation import activate
-from pytest_django.asserts import assertRedirects
-
-from events.models import Schedule
 
 
 @pytest.mark.django_db
@@ -97,14 +93,8 @@ def test_content_pages(client, parser, content_page_full_path):
  assert response.status_code == 200, content_page_full_path
 
 
-@pytest.fixture
-def schedule(db):
- """Generate a schedule to prevent the schedule page from returning 404.
- """
- return Schedule.objects.create(html='<div></div>')
-
-
-def test_content_pages_links(client, parser, schedule, content_page_full_path):
+@pytest.mark.django_db
+def test_content_pages_links(client, parser, content_page_full_path):
  """Test to make sure all in-site links in a content page work.
  """
  if '/surveys/conference/' in content_page_full_path:
@@ -116,14 +106,6 @@ def test_content_pages_links(client, parser, schedule, content_page_full_path):
  link_status_codes = []
  for tag in link_tags:
  link = tag.get('href')
- if "/events/schedule/" in link \
- and settings.SCHEDULE_REDIRECT_URL:
- assertRedirects(
- client.get(link),
- settings.SCHEDULE_REDIRECT_URL,
- fetch_redirect_response=False
- )
- continue
  try:
  status = client.get(link, follow=True).status_code
  except Exception: # Catch internal server error for better reporting.

src/events/admin.py

@@ -23,7 +23,6 @@
  KeynoteEvent,
  ProposedTalkEvent,
  ProposedTutorialEvent,
- Schedule,
  SponsoredEvent,
  Time,
 )
@@ -208,10 +207,3 @@ class SponsoredEventAdmin(admin.ModelAdmin):
  search_fields = ['title', 'abstract']
  prepopulated_fields = {'slug': ['title']}
  raw_id_fields = ['host']
-
-
-@admin.register(Schedule)
-class ScheduleAdmin(admin.ModelAdmin):
- fields = ['html', 'created_at']
- readonly_fields = ['created_at']
- list_display = ['created_at']

src/events/forms.py

@@ -1,12 +1,6 @@
 from django import forms
 
-from .models import CustomEvent, Schedule
-
-
-class ScheduleCreationForm(forms.ModelForm):
- class Meta:
- model = Schedule
- fields = ['html']
+from .models import CustomEvent
 
 
 class CustomEventForm(forms.ModelForm):

src/events/management/commands/import_events.py

@@ -7,11 +7,11 @@
 from django.core.management.base import BaseCommand
 from django.utils.dateparse import parse_time
 
-from events.models import Location, Time
-from events.renderers import EVENT_CLASSES
+from events.models import CustomEvent, KeynoteEvent, Location, ProposedTalkEvent, SponsoredEvent, Time
 
 cst = pytz.timezone('Asia/Taipei')
 
+EVENT_CLASSES = (CustomEvent, KeynoteEvent, ProposedTalkEvent, SponsoredEvent)
 DAYS = list(settings.EVENTS_DAY_NAMES.keys())
 
 

src/events/migrations/0053_delete_schedule.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.25 on 2024-04-15 09:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('events', '0052_remove_sponsoredevent_prefer_time'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='Schedule',
+ ),
+ ]

src/events/models.py

@@ -117,22 +117,6 @@ class Location:
  R4 = '7-r4'
  OTHER = '8-oth'
 
- @classmethod
- def get_md_width(cls, value):
- return {
- '2-all': 4,
- '3-r012': 3,
- '4-r0': 1,
- '5-r1': 1,
- '6-r2': 1,
- '1-r3': 1,
- '7-r4': 1,
- '8-oth': 1,
- }[value]
-
-
-EVENT_ROOMS = {Location.R0, Location.R1, Location.R2, Location.R3, Location.R4}
-
 
 class BaseEvent(ConferenceRelated):
  """Base interface for all events in the schedule.
@@ -455,23 +439,3 @@ def get_absolute_url(self):
  return reverse('events_tutorial_detail', kwargs={
  'pk': self.proposal.pk,
  })
-
-
-class Schedule(ConferenceRelated):
-
- html = models.TextField(
- verbose_name=_('HTML'),
- )
- created_at = models.DateTimeField(
- verbose_name=_('created at'),
- auto_now_add=True,
- )
-
- class Meta:
- verbose_name = _('Schedule')
- verbose_name_plural = _('Schedules')
- ordering = ['-created_at']
- get_latest_by = 'created_at'
-
- def __str__(self):
- return gettext('Schedule created at {}').format(self.created_at)