fix: stable and correct ordering of agenda items (ietf-tools#4621)

* fix: align session sorting across functions

* fix: sessions of a group can have different types

Author: rjsparks

ietf/meeting/models.py

@@ -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()
+                # 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]