altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

refactor: simplify I-D cutoff calculations and make TZ more explicit

Browse source
This commit is contained in:
Jennifer Richards 2022-10-19 17:47:07 -03:00
parent e461f70297
commit 0346271578
No known key found for this signature in database
GPG key ID: 26801E4DC0928410
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ietf/meeting/models.py
View file

@ -147,45 +147,38 @@ class Meeting(models.Model):
return datetime_from_date(self.get_meeting_date(self.days), self.tz())
def get_00_cutoff(self):
start_date = datetime.datetime(
year=self.date.year,
month=self.date.month,
day=self.date.day,
tzinfo=datetime.timezone.utc,
)
"""Get the I-D submission 00 cutoff in UTC"""
importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
if not importantdate:
importantdate = self.importantdate_set.filter(name_id='00cutoff').first()
if importantdate:
cutoff_date = importantdate.date
else:
cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
cutoff_time = datetime_from_date(cutoff_date) + self.idsubmit_cutoff_time_utc
cutoff_date = self.date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
cutoff_time = datetime_from_date(cutoff_date, datetime.timezone.utc) + self.idsubmit_cutoff_time_utc
return cutoff_time
def get_01_cutoff(self):
start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
"""Get the I-D submission 01 cutoff in UTC"""
importantdate = self.importantdate_set.filter(name_id='idcutoff').first()
if not importantdate:
importantdate = self.importantdate_set.filter(name_id='01cutoff').first()
if importantdate:
cutoff_date = importantdate.date
else:
cutoff_date = start_date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
cutoff_time = datetime_from_date(cutoff_date) + self.idsubmit_cutoff_time_utc
cutoff_date = self.date + datetime.timedelta(days=ImportantDateName.objects.get(slug='idcutoff').default_offset_days)
cutoff_time = datetime_from_date(cutoff_date, datetime.timezone.utc) + self.idsubmit_cutoff_time_utc
return cutoff_time
def get_reopen_time(self):
start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day)
local_tz = pytz.timezone(self.time_zone)
local_date = local_tz.localize(start_date)
"""Get the I-D submission reopening time in meeting-local time"""
cutoff = self.get_00_cutoff()
if cutoff.date() == start_date:
if cutoff.date() == self.date:
# no cutoff, so no local-time re-open
reopen_time = cutoff
else:
# reopen time is in local timezone. May need policy change?? XXX
reopen_time = local_date + self.idsubmit_cutoff_time_utc
reopen_time = datetime_from_date(self.date, self.tz()) + self.idsubmit_cutoff_time_utc
return reopen_time
@classmethod

2
ietf/utils/timezone.py
View file

@ -22,7 +22,7 @@ RPC_TZINFO = ZoneInfo('PST8PDT')
def _tzinfo(tz: Union[str, datetime.tzinfo, None]):
"""Helper to convert a tz param into a tzinfo
Accepts Defaults to UTC.
Accepts a tzinfo or string containing a timezone name. Defaults to UTC if tz is None.
"""
if tz is None:
return datetime.timezone.utc