Merged in [18724] from jennifer@painless-security.com:

    Allow cancellation of individual sessions of multi-session interim meeting. Fixes ietf-tools#2959.
 - Legacy-Id: 18757
Note: SVN reference [18724] has been migrated to Git commit 79971e1

Author: rjsparks

ietf/meeting/ajax.py

@@ -11,8 +11,6 @@
 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.utils import only_sessions_that_can_meet
-from ietf.meeting.utils import add_event_info_to_session_qs
 
 import debug                            # pyflakes:ignore
 
@@ -433,11 +431,7 @@ def session_json(request, num, sessionid):
 def sessions_json(request, num):
     meeting = get_meeting(num)
 
-    sessions = add_event_info_to_session_qs(
-        only_sessions_that_can_meet(meeting.session_set),
-        requested_time=True,
-        requested_by=True,
-    )
+    sessions = meeting.session_set.that_can_meet().with_requested_time().with_requested_by()
 
     sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in sessions ]
     return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2),

ietf/meeting/helpers.py

@@ -468,7 +468,8 @@ def get_announcement_initial(meeting, is_change=False):
         type = 'BOF'
 
     assignments = SchedTimeSessAssignment.objects.filter(
-        schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None]
+        schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None],
+        session__in=meeting.session_set.not_canceled()
     ).order_by('timeslot__time')
 
     initial['subject'] = '{name} ({acronym}) {type} {desc} Meeting: {date}{change}'.format(
@@ -615,7 +616,7 @@ def send_interim_announcement_request(meeting):
               context,
               cc_list)
 
-def send_interim_cancellation_notice(meeting):
+def send_interim_meeting_cancellation_notice(meeting):
     """Sends an email that a scheduled interim meeting has been cancelled."""
     session = meeting.session_set.first()
     group = session.group
@@ -628,9 +629,39 @@ def send_interim_cancellation_notice(meeting):
         date=meeting.date.strftime('%Y-%m-%d'))
     start_time = session.official_timeslotassignment().timeslot.time
     end_time = start_time + session.requested_duration
-    from ietf.meeting.utils import add_event_info_to_session_qs
-    is_multi_day = add_event_info_to_session_qs(meeting.session_set.all()).filter(current_status='sched').count() > 1
-    template = 'meeting/interim_cancellation_notice.txt'
+    is_multi_day = session.meeting.session_set.with_current_status().filter(current_status='sched').count() > 1
+    template = 'meeting/interim_meeting_cancellation_notice.txt'
+    context = locals()
+    send_mail(None,
+              to_email,
+              from_email,
+              subject,
+              template,
+              context,
+              cc=cc_list)
+
+
+def send_interim_session_cancellation_notice(session):
+    """Sends an email that one session of a scheduled interim meeting has been cancelled."""
+    group = session.group
+    start_time = session.official_timeslotassignment().timeslot.time
+    end_time = start_time + session.requested_duration
+    (to_email, cc_list) = gather_address_lists('interim_cancelled',group=group)
+    from_email = settings.INTERIM_ANNOUNCE_FROM_EMAIL_PROGRAM if group.type_id=='program' else settings.INTERIM_ANNOUNCE_FROM_EMAIL_DEFAULT
+
+    if session.name:
+        description = '"%s" session' % session.name
+    else:
+        description = 'interim meeting session'
+
+    subject = '{group} ({acronym}) {type} {description} cancelled (was {date})'.format(
+        group=group.name,
+        acronym=group.acronym,
+        type=group.type.slug.upper(),
+        description=description,
+        date=start_time.date().strftime('%Y-%m-%d'))
+    is_multi_day = session.meeting.session_set.with_current_status().filter(current_status='sched').count() > 1
+    template = 'meeting/interim_session_cancellation_notice.txt'
     context = locals()
     send_mail(None,
               to_email,

ietf/meeting/models.py

@@ -17,7 +17,8 @@
 
 from django.core.validators import MinValueValidator, RegexValidator
 from django.db import models
-from django.db.models import Max
+from django.db.models import Max, Subquery, OuterRef, TextField, Value
+from django.db.models.functions import Coalesce
 from django.conf import settings
 # mostly used by json_dict()
 #from django.template.defaultfilters import slugify, date as date_format, time as time_format
@@ -930,12 +931,78 @@ def __str__(self):
 constraint_cache_uses = 0
 constraint_cache_initials = 0
 
+class SessionQuerySet(models.QuerySet):
+    def with_current_status(self):
+        """Annotate session with its current status
+        
+        Adds current_status, containing the text representation of the status.
+        """
+        return self.annotate(
+            # coalesce with '' to avoid nulls which give funny
+            # results, e.g. .exclude(current_status='canceled') also
+            # skips rows with null in them
+            current_status=Coalesce(
+                Subquery(
+                    SchedulingEvent.objects.filter(
+                        session=OuterRef('pk')
+                    ).order_by(
+                        '-time', '-id'
+                    ).values('status')[:1]),
+                Value(''), 
+                output_field=TextField()),
+        )
+
+    def with_requested_by(self):
+        """Annotate session with requested_by field
+        
+        Adds requested_by field - pk of the Person who made the request
+        """
+        return self.annotate(
+            requested_by=Subquery(
+                SchedulingEvent.objects.filter(
+                    session=OuterRef('pk')
+                ).order_by(
+                    'time', 'id'
+                ).values('by')[:1]),
+        )
+
+    def with_requested_time(self):
+        """Annotate session with requested_time field"""
+        return self.annotate(
+            requested_time=Subquery(
+                SchedulingEvent.objects.filter(
+                    session=OuterRef('pk')
+                ).order_by(
+                    'time', 'id'
+                ).values('time')[:1]),
+        )
+
+    def not_canceled(self):
+        """Queryset containing all sessions not canceled
+                
+        Results annotated with current_status
+        """
+        return self.with_current_status().exclude(current_status__in=Session.CANCELED_STATUSES)
+
+    def that_can_meet(self):
+        """Queryset containing sessions that can meet
+        
+        Results annotated with current_status
+        """
+        return self.with_current_status().exclude(
+            current_status__in=['notmeet', 'disappr', 'deleted', 'apprw']
+        ).filter(
+            type__slug='regular'
+        )
+
+
 class Session(models.Model):
     """Session records that a group should have a session on the
     meeting (time and location is stored in a TimeSlot) - if multiple
     timeslots are needed, multiple sessions will have to be created.
     Training sessions and similar are modeled by filling in a
     responsible group (e.g. Edu team) and filling in the name."""
+    objects = SessionQuerySet.as_manager()  # sets default query manager
     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.")
@@ -957,6 +1024,8 @@ class Session(models.Model):
 
     unique_constraints_dict = None
 
+    CANCELED_STATUSES = ['canceled', 'canceledpa']
+    
     # Should work on how materials are captured so that deleted things are no longer associated with the session
     # (We can keep the information about something being added to and removed from a session in the document's history)
     def get_material(self, material_type, only_one):