Add support for not-meeting meeting sessions

 - Legacy-Id: 3744

Author: OleLaursen

ietf/meeting/models.py

@@ -138,7 +138,7 @@ class Session(models.Model):
     attendees = models.IntegerField(null=True, blank=True)
     agenda_note = models.CharField(blank=True, max_length=255)
     #
-    requested = models.DateTimeField()
+    requested = models.DateTimeField(default=datetime.datetime.now)
     requested_by = models.ForeignKey(Person)
     requested_duration = TimedeltaField()
     comments = models.TextField()

ietf/proceedings/models.py

@@ -584,6 +584,12 @@ def __unicode__(self):
     class Meta:
         db_table = u'meeting_hours'
 
+class NotMeetingGroup(models.Model):
+    # note: phony key, there's no primary key in db
+    group_acronym = models.ForeignKey(Acronym, primary_key=True, null=True, blank=True)
+    meeting = models.ForeignKey(Meeting, db_column='meeting_num', null=True, blank=True)
+    class Meta:
+        db_table = u'not_meeting_groups'
 
 if settings.USE_DB_REDESIGN_PROXY_CLASSES:
     MeetingOld = Meeting

redesign/importing/import-meetings.py

@@ -17,7 +17,7 @@
 
 from ietf.idtracker.models import AreaDirector, IETFWG, Acronym, IRTF, PersonOrOrgInfo
 from ietf.meeting.models import *
-from ietf.proceedings.models import Meeting as MeetingOld, MeetingVenue, MeetingRoom, NonSession, WgMeetingSession, WgAgenda, Minute, Slide, WgProceedingsActivities
+from ietf.proceedings.models import Meeting as MeetingOld, MeetingVenue, MeetingRoom, NonSession, WgMeetingSession, WgAgenda, Minute, Slide, WgProceedingsActivities, NotMeetingGroup
 from redesign.person.models import *
 from redesign.doc.models import Document, DocAlias, State, DocEvent
 from redesign.importing.utils import old_person_to_person, dont_save_queries
@@ -28,7 +28,7 @@
 
 # imports Meeting, MeetingVenue, MeetingRoom, NonSession,
 # WgMeetingSession, WgAgenda, Minute, Slide, upload events from
-# WgProceedingsActivities
+# WgProceedingsActivities, NotMeetingGroup
 
 # assumptions:
 #  - persons have been imported
@@ -46,6 +46,8 @@
     6: name(SessionStatusName, "disappr", "Disapproved"),
     }
 
+status_not_meeting = name(SessionStatusName, "notmeet", "Not meeting")
+
 session_status_mapping[0] = session_status_mapping[1] # assume broken statuses of 0 are actually cancelled
 
 session_slot = name(TimeSlotTypeName, "session", "Session")
@@ -133,6 +135,12 @@
 
     m.save()
 
+meeting_cache = {}
+def get_meeting(num):
+    if not num in meeting_cache:
+        meeting_cache[num] = Meeting.objects.get(number="%s" % num)
+    return meeting_cache[num]
+
 for o in MeetingRoom.objects.all():
     print "importing MeetingRoom", o.pk
 
@@ -141,7 +149,7 @@
     except Room.DoesNotExist:
         r = Room(pk=o.pk)
 
-    r.meeting = Meeting.objects.get(number="%s" % o.meeting_id)
+    r.meeting = get_meeting(o.meeting_id)
     r.name = o.room_name
     r.save()
 
@@ -265,7 +273,7 @@ def import_material_kind(kind, doctype):
             s = Session.objects.get(pk=pk)
         except:
             s = Session(pk=pk)
-        s.meeting = Meeting.objects.get(number=o.meeting_id)
+        s.meeting = get_meeting(o.meeting_id)
 
         def get_timeslot(attr):
             meeting_time = getattr(o, attr)
@@ -375,7 +383,7 @@ def get_timeslot(attr):
         print "IGNORING non-scheduled NonSession", o.non_session_ref.name
         continue
 
-    meeting = Meeting.objects.get(number=o.meeting_id)
+    meeting = get_meeting(o.meeting_id)
 
     # some non-sessions are scheduled every day, but only if there's a
     # session nearby, figure out which days this corresponds to
@@ -408,3 +416,25 @@ def get_timeslot(attr):
         slot.duration = ends - starts
         slot.show_location = o.show_break_location
         slot.save()
+
+
+for o in NotMeetingGroup.objects.all().select_related('group_acronym'):
+    if o.group_acronym_id == None or o.group_acronym == None:
+        print "SKIPPING NotMeetingGroup with group_acronym_id", o.group_acronym_id
+        continue # bogus data
+
+    print "importing NotMeetingGroup", o.group_acronym.acronym, o.meeting_id
+    try:
+        group = Group.objects.get(acronym=o.group_acronym.acronym)
+    except Group.DoesNotExist:
+        print "SKIPPING", o.group_acronym.acronym
+        continue
+    meeting = get_meeting(o.meeting_id)
+
+    if not Session.objects.filter(meeting=meeting, group=group):
+        Session.objects.get_or_create(meeting=meeting,
+                                      group=group,
+                                      status=status_not_meeting,
+                                      defaults=dict(requested_by=system_person,
+                                                    requested_duration=0))
+