Skip to content

fix: stable and correct ordering of agenda items #4621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 2 commits into from
Oct 21, 2022
Merged

fix: stable and correct ordering of agenda items #4621

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ff9f61
fix: align session sorting across functions
rjsparks Oct 20, 2022
5ad0e63
fix: sessions of a group can have different types
rjsparks Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions ietf/meeting/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,8 +1105,18 @@ def all_meeting_sessions_for_group(self):
from ietf.meeting.utils import add_event_info_to_session_qs
if self.group.features.has_meetings:
if not hasattr(self, "_all_meeting_sessions_for_group_cache"):
sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group,type=self.type)) if s.official_timeslotassignment()]
self._all_meeting_sessions_for_group_cache = sorted(sessions, key = lambda x: x.official_timeslotassignment().timeslot.time)
sessions = [s for s in add_event_info_to_session_qs(self.meeting.session_set.filter(group=self.group)) if s.official_timeslotassignment()]
for s in sessions:
s.ota = s.official_timeslotassignment()

@jennifer-richards jennifer-richards Oct 21, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After approving, noticed that this means official_timeslotassignment() is called twice for each session. Is that cheap enough (or cached effectively by the ORM) not to worry about it? There are only a couple dozen sessions filtered out in the list comprehension so it'd probably be preferable to filter the list after caching s.ota.

# Align this sort with SchedTimeSessAssignment default sort order since many views base their order on that
self._all_meeting_sessions_for_group_cache = sorted(
sessions, key = lambda x: (
x.ota.timeslot.time,
x.ota.timeslot.type.slug,
x.ota.session.group.parent.name if x.ota.session.group.parent else None,
x.ota.session.name
)
)
return self._all_meeting_sessions_for_group_cache
else:
return [self]
Expand Down