diff --git a/src/pretix/base/reldate.py b/src/pretix/base/reldate.py index cf80b595ce..4450e46165 100644 --- a/src/pretix/base/reldate.py +++ b/src/pretix/base/reldate.py @@ -71,6 +71,7 @@ class RelativeDateWrapper: else: base_date = getattr(event, self.data.base_date_name) or event.date_from + oldoffset = base_date.utcoffset() new_date = base_date.astimezone(tz) - datetime.timedelta(days=self.data.days_before) if self.data.time: new_date = new_date.replace( @@ -78,6 +79,10 @@ class RelativeDateWrapper: minute=self.data.time.minute, second=self.data.time.second ) + new_date = new_date.astimezone(tz) + newoffset = new_date.utcoffset() + new_date += oldoffset - newoffset + return new_date def to_string(self) -> str: diff --git a/src/tests/base/test_reldate.py b/src/tests/base/test_reldate.py index 01e1d45f6a..2f99482087 100644 --- a/src/tests/base/test_reldate.py +++ b/src/tests/base/test_reldate.py @@ -7,6 +7,7 @@ from pretix.base.models import Event, Organizer from pretix.base.reldate import RelativeDate, RelativeDateWrapper TOKYO = pytz.timezone('Asia/Tokyo') +BERLIN = pytz.timezone('Europe/Berlin') @pytest.fixture @@ -14,8 +15,8 @@ def event(): o = Organizer.objects.create(name='Dummy', slug='dummy') event = Event.objects.create( organizer=o, name='Dummy', slug='dummy', - date_from=datetime(2017, 12, 27, 5, 0, 0, tzinfo=TOKYO), - presale_start=datetime(2017, 12, 1, 5, 0, 0, tzinfo=TOKYO), + date_from=TOKYO.localize(datetime(2017, 12, 27, 5, 0, 0)), + presale_start=TOKYO.localize(datetime(2017, 12, 1, 5, 0, 0)), plugins='pretix.plugins.banktransfer' ) @@ -34,40 +35,64 @@ def test_absolute_date(event): @pytest.mark.django_db def test_relative_date_without_time(event): rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='date_from')) - assert rdw.datetime(event).astimezone(TOKYO) == datetime(2017, 12, 26, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(event).astimezone(TOKYO) == TOKYO.localize(datetime(2017, 12, 26, 5, 0, 0)) assert rdw.to_string() == 'RELDATE/1/-/date_from/' @pytest.mark.django_db def test_relative_date_other_base_point(event): rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='presale_start')) - assert rdw.datetime(event) == datetime(2017, 11, 30, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(event) == TOKYO.localize(datetime(2017, 11, 30, 5, 0, 0)) assert rdw.to_string() == 'RELDATE/1/-/presale_start/' # presale_end is unset, defaults to date_from rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='presale_end')) - assert rdw.datetime(event) == datetime(2017, 12, 26, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(event) == TOKYO.localize(datetime(2017, 12, 26, 5, 0, 0)) assert rdw.to_string() == 'RELDATE/1/-/presale_end/' # subevent base - se = event.subevents.create(name="SE1", date_from=datetime(2017, 11, 27, 5, 0, 0, tzinfo=TOKYO)) + se = event.subevents.create(name="SE1", date_from=TOKYO.localize(datetime(2017, 11, 27, 5, 0, 0))) rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='date_from')) - assert rdw.datetime(se) == datetime(2017, 11, 26, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(se) == TOKYO.localize(datetime(2017, 11, 26, 5, 0, 0)) # presale_start is unset on subevent, default to event rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='presale_start')) - assert rdw.datetime(se) == datetime(2017, 11, 30, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(se) == TOKYO.localize(datetime(2017, 11, 30, 5, 0, 0)) # presale_end is unset on all, default to date_from of subevent rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=None, base_date_name='presale_end')) - assert rdw.datetime(se) == datetime(2017, 11, 26, 5, 0, 0, tzinfo=TOKYO) + assert rdw.datetime(se) == TOKYO.localize(datetime(2017, 11, 26, 5, 0, 0)) @pytest.mark.django_db def test_relative_date_with_time(event): rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=time(8, 5, 13), base_date_name='date_from')) assert rdw.to_string() == 'RELDATE/1/08:05:13/date_from/' - assert rdw.datetime(event) == datetime(2017, 12, 26, 8, 5, 13, tzinfo=TOKYO) + assert rdw.datetime(event) == TOKYO.localize(datetime(2017, 12, 26, 8, 5, 13)) + + +@pytest.mark.django_db +def test_relative_date_with_time_around_dst(event): + event.settings.timezone = "Europe/Berlin" + event.date_from = BERLIN.localize(datetime(2020, 3, 29, 18, 0, 0)) + + rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=time(18, 0, 0), base_date_name='date_from')) + assert rdw.to_string() == 'RELDATE/1/18:00:00/date_from/' + assert rdw.datetime(event) == BERLIN.localize(datetime(2020, 3, 28, 18, 0, 0)) + + rdw = RelativeDateWrapper(RelativeDate(days_before=0, time=time(2, 30, 0), base_date_name='date_from')) + assert rdw.to_string() == 'RELDATE/0/02:30:00/date_from/' + assert rdw.datetime(event) == BERLIN.localize(datetime(2020, 3, 29, 2, 30, 0)) + + event.date_from = BERLIN.localize(datetime(2020, 10, 25, 18, 0, 0)) + + rdw = RelativeDateWrapper(RelativeDate(days_before=1, time=time(18, 0, 0), base_date_name='date_from')) + assert rdw.to_string() == 'RELDATE/1/18:00:00/date_from/' + assert rdw.datetime(event) == BERLIN.localize(datetime(2020, 10, 24, 18, 0, 0)) + + rdw = RelativeDateWrapper(RelativeDate(days_before=0, time=time(2, 30, 0), base_date_name='date_from')) + assert rdw.to_string() == 'RELDATE/0/02:30:00/date_from/' + assert rdw.datetime(event) == BERLIN.localize(datetime(2020, 10, 25, 2, 30, 0)) def test_unserialize():