Eliminate the officehours timeslot type, update/renumber migrations, mark offagenda/reserved TimeSlotTypeNames as not used, add a 'none' SessionPurposeName and disallow null, update agenda filter keywords/filter helpers, fix broken tests and general debugging

 - Legacy-Id: 19550

Author: jennifer-richards

ietf/doc/tests.py

@@ -40,7 +40,7 @@
 from ietf.group.models import Group
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
+from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent
 from ietf.meeting.factories import ( MeetingFactory, SessionFactory, SessionPresentationFactory,
      ProceedingsMaterialFactory )
 
@@ -1473,12 +1473,12 @@ def test_document_material(self):
         )
         doc.set_state(State.objects.get(type="slides", slug="active"))
 
-        session = Session.objects.create(
+        session = SessionFactory(
             name = "session-72-mars-1",
             meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id = 'regular',
+            add_to_schedule=False,
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/doc/tests_material.py

@@ -17,8 +17,8 @@
 from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent
 from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
-from ietf.meeting.factories import MeetingFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
+from ietf.meeting.factories import MeetingFactory, SessionFactory
+from ietf.meeting.models import Meeting, SessionPresentation, SchedulingEvent
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
@@ -152,12 +152,11 @@ def test_edit_title(self):
     def test_revise(self):
         doc = self.create_slides()
 
-        session = Session.objects.create(
+        session = SessionFactory(
             name = "session-42-mars-1",
             meeting = Meeting.objects.get(number='42'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id='regular',
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/group/migrations/0051_groupfeatures_session_purposes.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('group', '0050_populate_groupfeatures_agenda_filter_type'),
-        ('name', '0035_sessionpurposename'),
+        ('name', '0034_sessionpurposename'),
     ]
 
     operations = [

ietf/group/migrations/0052_populate_groupfeatures_session_purposes.py

@@ -7,23 +7,23 @@
 
 default_purposes = dict(
     adhoc=['presentation'],
-    adm=['closed_meeting', 'office_hours'],
+    adm=['closed_meeting', 'officehours'],
     ag=['regular'],
     area=['regular'],
     dir=['open_meeting', 'presentation', 'regular', 'social', 'tutorial'],
     iab=['closed_meeting', 'regular'],
-    iabasg=['closed_meeting', 'open_meeting'],
-    iana=['office_hours'],
+    iabasg=['closed_meeting', 'officehours', 'open_meeting'],
+    iana=['officehours'],
     iesg=['closed_meeting', 'open_meeting'],
     ietf=['admin', 'plenary', 'presentation', 'social'],
     irtf=[],
-    ise=['office_hours'],
-    isoc=['office_hours', 'open_meeting', 'presentation'],
-    nomcom=['closed_meeting', 'office_hours'],
+    ise=['officehours'],
+    isoc=['officehours', 'open_meeting', 'presentation'],
+    nomcom=['closed_meeting', 'officehours'],
     program=['regular', 'tutorial'],
     rag=['regular'],
     review=['open_meeting', 'social'],
-    rfcedtyp=['office_hours'],
+    rfcedtyp=['officehours'],
     rg=['regular'],
     team=['coding', 'presentation', 'social', 'tutorial'],
     wg=['regular'],
@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('group', '0051_groupfeatures_session_purposes'),
-        ('name', '0036_populate_sessionpurposename'),
+        ('name', '0035_populate_sessionpurposename'),
 
     ]
 

ietf/meeting/ajax.py

@@ -10,7 +10,7 @@
 from ietf.ietfauth.utils import role_required, has_role
 from ietf.meeting.helpers import get_meeting, get_schedule, schedule_permissions, get_person_by_email, get_schedule_by_name
 from ietf.meeting.models import TimeSlot, Session, Schedule, Room, Constraint, SchedTimeSessAssignment, ResourceAssociation
-from ietf.meeting.views import edit_timeslots, edit_schedule
+from ietf.meeting.views import edit_timeslots, edit_meeting_schedule
 
 import debug                            # pyflakes:ignore
 
@@ -286,7 +286,7 @@ def schedule_add(request, meeting):
     if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
         return redirect(schedule_infourl, meeting.number, newschedule.owner_email(), newschedule.name)
     else:
-        return redirect(edit_schedule, meeting.number, newschedule.owner_email(), newschedule.name)
+        return redirect(edit_meeting_schedule, meeting.number, newschedule.owner_email(), newschedule.name)
 
 @require_POST
 def schedule_update(request, meeting, schedule):
@@ -325,7 +325,7 @@ def schedule_update(request, meeting, schedule):
         return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
                             content_type="application/json")
     else:
-        return redirect(edit_schedule, meeting.number, schedule.owner_email(), schedule.name)
+        return redirect(edit_meeting_schedule, meeting.number, schedule.owner_email(), schedule.name)
 
 @role_required('Secretariat')
 def schedule_del(request, meeting, schedule):

ietf/meeting/factories.py

@@ -12,7 +12,8 @@
 from ietf.meeting.models import (Meeting, Session, SchedulingEvent, Schedule,
     TimeSlot, SessionPresentation, FloorPlan, Room, SlideSubmission, Constraint,
     MeetingHost, ProceedingsMaterial)
-from ietf.name.models import ConstraintName, SessionStatusName, ProceedingsMaterialTypeName, TimerangeName
+from ietf.name.models import (ConstraintName, SessionStatusName, ProceedingsMaterialTypeName,
+                              TimerangeName, SessionPurposeName)
 from ietf.doc.factories import ProceedingsMaterialDocFactory
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
@@ -104,9 +105,11 @@ class Meta:
         model = Session
 
     meeting = factory.SubFactory(MeetingFactory)
-    type_id='regular'
+    purpose_id = 'regular'
+    type_id = 'regular'
     group = factory.SubFactory(GroupFactory)
     requested_duration = datetime.timedelta(hours=1)
+    on_agenda = factory.lazy_attribute(lambda obj: SessionPurposeName.objects.get(pk=obj.purpose_id).on_agenda)
 
     @factory.post_generation
     def status_id(obj, create, extracted, **kwargs):
@@ -128,7 +131,7 @@ def status_id(obj, create, extracted, **kwargs):
                 status=SessionStatusName.objects.get(slug=extracted),
                 by=PersonFactory(),
             )
-                
+
     @factory.post_generation
     def add_to_schedule(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument
         '''

ietf/meeting/fields.py

@@ -5,7 +5,7 @@
 
 from ietf.name.models import SessionPurposeName, TimeSlotTypeName
 
-import debug
+import debug  # pyflakes: ignore
 
 class SessionPurposeAndTypeWidget(forms.MultiWidget):
     css_class = 'session_purpose_widget'  # class to apply to all widgets

ietf/meeting/helpers.py

@@ -310,7 +310,7 @@ def _session_name_keyword(self, session):
 
     @property
     def filterable_purposes(self):
-        return SessionPurposeName.objects.exclude(slug='regular').order_by('name')
+        return SessionPurposeName.objects.exclude(slug='none').order_by('name')
 
 
 class AgendaFilterOrganizer(AgendaKeywordTool):
@@ -336,7 +336,7 @@ class AgendaFilterOrganizer(AgendaKeywordTool):
     # group acronyms in this list will never be used as filter buttons
     exclude_acronyms = ('iesg', 'ietf', 'secretariat')
     # extra keywords to include in the no-heading column if they apply to any sessions
-    extra_labels = ('BoF', 'Plenary')
+    extra_labels = ('BoF',)
     # group types whose acronyms should be word-capitalized
     capitalized_group_types = ('team',)
     # group types whose acronyms should be all-caps
@@ -352,6 +352,8 @@ def __init__(self, *, single_category=False, **kwargs):
         # filled in when _organize_filters() is called
         self.filter_categories = None
         self.special_filters = None
+        if self._use_legacy_keywords():
+            self.extra_labels += ('Plenary',)  # need this when not using session purpose
 
     def get_non_area_keywords(self):
         """Get list of any 'non-area' (aka 'special') keywords
@@ -465,11 +467,14 @@ def _non_group_filters(self):
 
         # Call legacy version for older meetings
         if self._use_legacy_keywords():
-            return self._legacy_non_group_filters()
+            return self._legacy_non_group_filters(sessions)
 
         # Not using legacy version
         filter_cols = []
         for purpose in self.filterable_purposes:
+            if purpose.slug == 'regular':
+                continue
+
             # Map label to its keyword, discarding duplicate labels.
             # This does what we want as long as sessions with the same
             # name and purpose belong to the same group.
@@ -497,19 +502,16 @@ def _non_group_filters(self):
 
         return filter_cols
 
-    def _legacy_non_group_filters(self):
+    def _legacy_non_group_filters(self, sessions):
         """Get list of non-group filters for older meetings
 
         Returns a list of filter columns
         """
-        if self.assignments is None:
-            return []  # can only use timeslot type when we have assignments
-
         office_hours_items = set()
         suffix = ' office hours'
-        for a in self.assignments:
-            if a.session.name.lower().endswith(suffix):
-                office_hours_items.add((a.session.name[:-len(suffix)].strip(), a.session.group))
+        for s in sessions:
+            if s.name.lower().endswith(suffix):
+                office_hours_items.add((s.name[:-len(suffix)].strip(), s.group))
 
         headings = []
         # currently we only do office hours
@@ -640,8 +642,7 @@ def _tag_assignments_with_filter_keywords(self):
         Keywords are all lower case.
         """
         for a in self.assignments:
-            a.filter_keywords = {a.slot_type().slug.lower()}
-            a.filter_keywords.update(self._filter_keywords_for_assignment(a))
+            a.filter_keywords = self._filter_keywords_for_assignment(a)
             a.filter_keywords = sorted(list(a.filter_keywords))
 
     def _tag_sessions_with_filter_keywords(self):
@@ -652,14 +653,17 @@ def _tag_sessions_with_filter_keywords(self):
     @staticmethod
     def _legacy_extra_session_keywords(session):
         """Get extra keywords for a session at a legacy meeting"""
+        extra = []
+        if session.type_id == 'plenary':
+            extra.append('plenary')
         office_hours_match = re.match(r'^ *\w+(?: +\w+)* +office hours *$', session.name, re.IGNORECASE)
         if office_hours_match is not None:
             suffix = 'officehours'
-            return [
+            extra.extend([
                 'officehours',
                 session.name.lower().replace(' ', '')[:-len(suffix)] + '-officehours',
-            ]
-        return []
+            ])
+        return extra
 
     def _filter_keywords_for_session(self, session):
         keywords = set()

ietf/meeting/migrations/0050_populate_session_on_agenda.py

@@ -15,7 +15,9 @@ def forward(apps, schema_editor):
         ),
         timeslot__type__private=True,
     )
-    Session.objects.filter(timeslotassignments__in=private_assignments).update(on_agenda=False)
+    for pa in private_assignments:
+        pa.session.on_agenda = False
+        pa.session.save()
     # Also update any sessions to match their purpose's default setting (this intentionally
     # overrides the timeslot settings above, but that is unlikely to matter because the
     # purposes will roll out at the same time as the on_agenda field)

ietf/meeting/models.py

@@ -1162,7 +1162,7 @@ class Session(models.Model):
     meeting = ForeignKey(Meeting)
     name = models.CharField(blank=True, max_length=255, help_text="Name of session, in case the session has a purpose rather than just being a group meeting.")
     short = models.CharField(blank=True, max_length=32, help_text="Short version of 'name' above, for use in filenames.")
-    purpose = ForeignKey(SessionPurposeName, null=True, help_text='Purpose of the session')
+    purpose = ForeignKey(SessionPurposeName, null=False, help_text='Purpose of the session')
     type = ForeignKey(TimeSlotTypeName)
     group = ForeignKey(Group)    # The group type historically determined the session type.  BOFs also need to be added as a group. Note that not all meeting requests have a natural group to associate with.
     joint_with_groups = models.ManyToManyField(Group, related_name='sessions_joint_in',blank=True)