8b52d27b02
* refactor: replace datetime.now with timezone.now * refactor: migrate model fields to use timezone.now as default * refactor: replace datetime.today with timezone.now datetime.datetime.today() is equivalent to datetime.datetime.now(); both return a naive datetime with the current local time. * refactor: rephrase datetime.now(tz) as timezone.now().astimezone(tz) This is effectively the same, but is less likely to encourage accidental use of naive datetimes. * refactor: revert datetime.today() change to old migrations * refactor: change a missed datetime.now to timezone.now * chore: renumber timezone_now migration * chore: add migration to change timestamps to UTC * refactor: move tz instantiation/caching from TimeSlot to Meeting * fix: assume utc if meeting.time_zone is blank * chore: make datetime.combine() calls tz aware in the meeting app * ci: correctly use meeting.tz in TimeSlotFactory * chore: compute TimeSlot utc / local times assuming tz-aware times * chore: use tzaware math for agenda editor timeslot layout * chore: fill in Meeting.time_zone where it is blank Nearly all interim meetings on or before 2016-07-01 have blank time_zone values. This migration fills these in with PST8PDT. * chore: disallow blank Meeting.time_zone value * refactor: no need to handle blank time_zone case in TZ migration * refactor: remove now-unnecessary checks that meeting has time_zone * chore: fix timezone handling in agenda.ics and Meeting.updated() * chore: fix tz handling in interim_request_details, exercise in tests * chore: fix timezone handling for test_interim_send_announcement * chore: fix timezone handling in agenda_json() * chore: fix timezone handling in old agenda * chore: fix timezone handling for EditTimeslotsTests * refactor: refactor a few fixes for more consistent timezone handling * chore: add timezone info to timestamps in fixtures * chore: remove naive datetime warnings found in meetings.tests_views * chore: fix a few more test failures in meetings.tests_views All tests in meetings.tests_views now passing * chore: remove unused import * chore: fix timezone handling in test_schedule_generator.py * chore: fix timezone handling affecting meeting.tests_js * chore: fix timeslot test bug when local date != UTC date * test: fix a few failing tests, all meetings tests now pass (for me, anyway) * chore: renumber migrations * chore: update timestamp conversion migration The django-celery-beat package introduces tables with timestamp columns. These columns are stored in CELERY_TIMEZONE. Because we run with this set to UTC, the migration ignores these columns. * chore: fix pytz-related change in migration * chore: remove duplicate migrations * chore: remove CELERY_BEAT_TZ_AWARE setting now that USE_TZ is True * test: avoid failure in test with bogus timezone
251 lines
14 KiB
Python
251 lines
14 KiB
Python
# Copyright The IETF Trust 2013-2020, All Rights Reserved
|
|
# -*- coding: utf-8 -*-
|
|
|
|
|
|
import datetime
|
|
|
|
from django.utils.text import slugify
|
|
|
|
import debug # pyflakes:ignore
|
|
|
|
|
|
from ietf.doc.factories import DocumentFactory
|
|
from ietf.group.factories import GroupFactory, RoleFactory
|
|
from ietf.group.models import Group
|
|
from ietf.meeting.factories import SessionFactory
|
|
from ietf.meeting.models import (Meeting, Room, TimeSlot, Schedule, SchedTimeSessAssignment,
|
|
ResourceAssociation, SessionPresentation, UrlResource, SchedulingEvent)
|
|
from ietf.meeting.helpers import create_interim_meeting
|
|
from ietf.name.models import RoomResourceName
|
|
from ietf.person.factories import PersonFactory
|
|
from ietf.person.models import Person
|
|
from ietf.utils.test_data import make_test_data
|
|
|
|
def make_interim_meeting(group,date,status='sched',tz='UTC'):
|
|
system_person = Person.objects.get(name="(System)")
|
|
meeting = create_interim_meeting(group=group,date=date,timezone=tz)
|
|
time = meeting.tz().localize(
|
|
datetime.datetime.combine(date, datetime.time(9))
|
|
)
|
|
session = SessionFactory(meeting=meeting, group=group,
|
|
attendees=10,
|
|
requested_duration=datetime.timedelta(minutes=20),
|
|
remote_instructions='http://webex.com',
|
|
add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=session, status_id=status, by=system_person)
|
|
slot = TimeSlot.objects.create(
|
|
meeting=meeting,
|
|
type_id='regular',
|
|
duration=session.requested_duration,
|
|
time=time)
|
|
SchedTimeSessAssignment.objects.create(
|
|
timeslot=slot,
|
|
session=session,
|
|
schedule=session.meeting.schedule)
|
|
# agenda
|
|
name = "agenda-%s-%s-%s" % (meeting.number, group.acronym, "01")
|
|
rev = '00'
|
|
file = "%s-%s.txt" % (name, rev)
|
|
doc = DocumentFactory.create(name=name, type_id='agenda', title="Agenda",
|
|
uploaded_filename=file, group=group, rev=rev, states=[('draft','active')])
|
|
pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
|
|
session.sessionpresentation_set.add(pres)
|
|
# minutes
|
|
name = "minutes-%s-%s" % (meeting.number, time.strftime("%Y%m%d%H%M"))
|
|
rev = '00'
|
|
file = "%s-%s.txt" % (name, rev)
|
|
doc = DocumentFactory.create(name=name, type_id='minutes', title="Minutes",
|
|
uploaded_filename=file, group=group, rev=rev, states=[('draft','active')])
|
|
pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
|
|
session.sessionpresentation_set.add(pres)
|
|
# slides
|
|
title = "Slideshow"
|
|
|
|
name = "slides-%s-sessa-%s" % (meeting.number, slugify(title))
|
|
rev = '00'
|
|
file = "%s-%s.txt" % (name, rev)
|
|
doc = DocumentFactory.create(name=name, type_id='slides', title=title,
|
|
uploaded_filename=file, group=group, rev=rev,
|
|
states=[('slides','active'), ('reuse_policy', 'single')])
|
|
pres = SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
|
|
session.sessionpresentation_set.add(pres)
|
|
#
|
|
return meeting
|
|
|
|
def make_meeting_test_data(meeting=None, create_interims=False):
|
|
if not Group.objects.filter(acronym='mars'):
|
|
make_test_data()
|
|
system_person = Person.objects.get(name="(System)")
|
|
plainman = Person.objects.get(user__username="plain")
|
|
#secretary = Person.objects.get(user__username="secretary") ## not used
|
|
|
|
if not meeting:
|
|
meeting = Meeting.objects.get(number="72", type="ietf")
|
|
base_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="base", visible=True, public=True)
|
|
schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-schedule", visible=True, public=True, base=base_schedule)
|
|
unofficial_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-unofficial-schedule", visible=True, public=True, base=base_schedule)
|
|
|
|
# test room
|
|
pname = RoomResourceName.objects.create(name='projector',slug='proj')
|
|
projector = ResourceAssociation.objects.create(name=pname,icon="notfound.png",desc="Basic projector")
|
|
room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123, functional_name="Testing Ground")
|
|
room.session_types.add('regular')
|
|
room.resources.add(projector)
|
|
asname = RoomResourceName.objects.get(slug='audiostream')
|
|
UrlResource.objects.create(name=asname, room=room, url='http://ietf{number}streaming.dnsalias.net/ietf/ietf{number}1.m3u'.format(number=meeting.number))
|
|
|
|
# other rooms
|
|
breakfast_room = Room.objects.create(meeting=meeting, name="Breakfast Room", capacity=40)
|
|
breakfast_room.session_types.add("lead")
|
|
break_room = Room.objects.create(meeting=meeting, name="Break Area", capacity=500)
|
|
break_room.session_types.add("break")
|
|
reg_room = Room.objects.create(meeting=meeting, name="Registration Area", capacity=500)
|
|
reg_room.session_types.add("reg")
|
|
|
|
# slots
|
|
session_date = meeting.date + datetime.timedelta(days=1)
|
|
tz = meeting.tz()
|
|
slot1 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
|
|
duration=datetime.timedelta(minutes=60),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(9, 30))
|
|
))
|
|
slot2 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
|
|
duration=datetime.timedelta(minutes=60),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(10, 50))
|
|
))
|
|
breakfast_slot = TimeSlot.objects.create(meeting=meeting, type_id="lead", location=breakfast_room,
|
|
duration=datetime.timedelta(minutes=90),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(7,0))
|
|
))
|
|
reg_slot = TimeSlot.objects.create(meeting=meeting, type_id="reg", location=reg_room,
|
|
duration=datetime.timedelta(minutes=480),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(9,0))
|
|
))
|
|
break_slot = TimeSlot.objects.create(meeting=meeting, type_id="break", location=break_room,
|
|
duration=datetime.timedelta(minutes=90),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(7,0))
|
|
))
|
|
plenary_slot = TimeSlot.objects.create(meeting=meeting, type_id="plenary", location=room,
|
|
duration=datetime.timedelta(minutes=60),
|
|
time=tz.localize(
|
|
datetime.datetime.combine(session_date, datetime.time(11,0))
|
|
))
|
|
# mars WG
|
|
mars = Group.objects.get(acronym='mars')
|
|
mars_session = SessionFactory(meeting=meeting, group=mars,
|
|
attendees=10, requested_duration=datetime.timedelta(minutes=50),
|
|
add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=mars_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=slot1, session=mars_session, schedule=schedule)
|
|
SchedTimeSessAssignment.objects.create(timeslot=slot2, session=mars_session, schedule=unofficial_schedule)
|
|
|
|
# ames WG
|
|
ames_session = SessionFactory(meeting=meeting, group=Group.objects.get(acronym="ames"),
|
|
attendees=10,
|
|
requested_duration=datetime.timedelta(minutes=60),
|
|
add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=ames_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=slot2, session=ames_session, schedule=schedule)
|
|
SchedTimeSessAssignment.objects.create(timeslot=slot1, session=ames_session, schedule=unofficial_schedule)
|
|
|
|
# IESG breakfast
|
|
iesg_session = SessionFactory(meeting=meeting, group=Group.objects.get(acronym="iesg"),
|
|
name="IESG Breakfast", attendees=25,
|
|
requested_duration=datetime.timedelta(minutes=60),
|
|
type_id="lead", purpose_id='closed_meeting', add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=iesg_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=breakfast_slot, session=iesg_session, schedule=schedule)
|
|
# No breakfast on unofficial schedule
|
|
|
|
# Registration
|
|
reg_session = SessionFactory(meeting=meeting, group=Group.objects.get(acronym="secretariat"),
|
|
name="Registration", attendees=250,
|
|
requested_duration=datetime.timedelta(minutes=480),
|
|
type_id="reg", purpose_id='admin', add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=reg_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=reg_slot, session=reg_session, schedule=base_schedule)
|
|
|
|
# Break
|
|
break_session = SessionFactory(meeting=meeting, group=Group.objects.get(acronym="secretariat"),
|
|
name="Morning Break", attendees=250,
|
|
requested_duration=datetime.timedelta(minutes=30),
|
|
type_id="break", purpose_id='social', add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=break_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=break_slot, session=break_session, schedule=base_schedule)
|
|
|
|
# IETF Plenary
|
|
plenary_session = SessionFactory(meeting=meeting, group=Group.objects.get(acronym="ietf"),
|
|
name="IETF Plenary", attendees=250,
|
|
requested_duration=datetime.timedelta(minutes=60),
|
|
type_id="plenary", purpose_id='plenary', add_to_schedule=False)
|
|
SchedulingEvent.objects.create(session=plenary_session, status_id='schedw', by=system_person)
|
|
SchedTimeSessAssignment.objects.create(timeslot=plenary_slot, session=plenary_session, schedule=schedule)
|
|
|
|
meeting.schedule = schedule
|
|
meeting.save()
|
|
|
|
# Convenience for the tests
|
|
meeting.unofficial_schedule = unofficial_schedule
|
|
|
|
|
|
doc = DocumentFactory.create(name='agenda-72-mars', type_id='agenda', title="Agenda",
|
|
uploaded_filename="agenda-72-mars.txt", group=mars, rev='00', states=[('agenda','active')])
|
|
pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
|
|
mars_session.sessionpresentation_set.add(pres) #
|
|
|
|
doc = DocumentFactory.create(name='minutes-72-mars', type_id='minutes', title="Minutes",
|
|
uploaded_filename="minutes-72-mars.md", group=mars, rev='00', states=[('minutes','active')])
|
|
pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
|
|
mars_session.sessionpresentation_set.add(pres)
|
|
|
|
doc = DocumentFactory.create(name='slides-72-mars-1-active', type_id='slides', title="Slideshow",
|
|
uploaded_filename="slides-72-mars.txt", group=mars, rev='00',
|
|
states=[('slides','active'), ('reuse_policy', 'single')])
|
|
pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
|
|
mars_session.sessionpresentation_set.add(pres)
|
|
|
|
doc = DocumentFactory.create(name='slides-72-mars-2-deleted', type_id='slides',
|
|
title="Bad Slideshow", uploaded_filename="slides-72-mars-2-deleted.txt", group=mars, rev='00',
|
|
states=[('slides','deleted'), ('reuse_policy', 'single')])
|
|
pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
|
|
mars_session.sessionpresentation_set.add(pres)
|
|
|
|
# Future Interim Meetings
|
|
date = datetime.date.today() + datetime.timedelta(days=365)
|
|
date2 = datetime.date.today() + datetime.timedelta(days=1000)
|
|
ames = Group.objects.get(acronym="ames")
|
|
|
|
if create_interims:
|
|
make_interim_meeting(group=mars,date=date,status='sched')
|
|
make_interim_meeting(group=mars,date=date2,status='apprw')
|
|
make_interim_meeting(group=ames,date=date,status='canceled')
|
|
make_interim_meeting(group=ames,date=date2,status='apprw')
|
|
|
|
return meeting
|
|
|
|
def make_interim_test_data(meeting_tz='UTC'):
|
|
date = datetime.date.today() + datetime.timedelta(days=365)
|
|
date2 = datetime.date.today() + datetime.timedelta(days=1000)
|
|
PersonFactory(user__username='plain')
|
|
area = GroupFactory(type_id='area')
|
|
ad = Person.objects.get(user__username='ad')
|
|
RoleFactory(group=area,person=ad,name_id='ad')
|
|
mars = GroupFactory(acronym='mars',parent=area,name='Martian Special Interest Group')
|
|
ames = GroupFactory(acronym='ames',parent=area,name='Asteroid Mining Equipment Standardization Group')
|
|
RoleFactory(group=mars,person__user__username='marschairman',name_id='chair')
|
|
RoleFactory(group=ames,person__user__username='ameschairman',name_id='chair')
|
|
|
|
make_interim_meeting(group=mars,date=date,status='sched',tz=meeting_tz)
|
|
make_interim_meeting(group=mars,date=date2,status='apprw',tz=meeting_tz)
|
|
make_interim_meeting(group=ames,date=date,status='canceled',tz=meeting_tz)
|
|
make_interim_meeting(group=ames,date=date2,status='apprw',tz=meeting_tz)
|
|
|
|
return
|
|
|
|
|