Merge branch 'fix/event-cancel-after-start' into 'master'

Disallow cancellation after event start

See merge request thalia/concrexit!837

website/events/models.py

@@ -193,7 +193,7 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
     def cancellation_allowed(self):
         now = timezone.now()
         return ((self.registration_start or self.registration_end)
-                and now >= self.registration_start)
+                and self.registration_start <= now < self.start)
 
     def is_pizza_event(self):
         try:

website/events/templates/events/event.html

@@ -172,7 +172,7 @@
                             {% elif not event.registration_allowed %}
                                 {% blocktrans %}Registration is not possible anymore.{% endblocktrans %}
                             {% endif %}
-                            {% if event.after_cancel_deadline %}
+                            {% if event.after_cancel_deadline and permissions.cancel_registration %}
                                 {% blocktrans with costs=event.fine %}Cancellation isn't possible anymore without having to pay the full costs of €{{ costs }}. Also note that you will be unable to re-register.{% endblocktrans %}
                             {% endif %}
                         {% endif %}

website/events/tests/test_models.py

@@ -207,58 +207,69 @@ class EventTest(TestCase):
             self.event.clean()
 
     def test_cancellation_allowed(self):
-        # Open
-        self.event.registration_start = (timezone.now() -
-                                         datetime.timedelta(hours=1))
-        self.event.registration_end = (timezone.now() +
-                                       datetime.timedelta(hours=1))
-        self.event.cancel_deadline = (timezone.now() +
-                                      datetime.timedelta(hours=1))
-        self.assertTrue(self.event.cancellation_allowed)
-
-        # No cancel
-        self.event.registration_start = (timezone.now() -
-                                         datetime.timedelta(hours=2))
-        self.event.registration_end = (timezone.now() +
-                                       datetime.timedelta(hours=1))
-        self.event.cancel_deadline = (timezone.now() -
-                                      datetime.timedelta(hours=1))
-        # Allow since cancellation after deadline is possible
-        self.assertTrue(self.event.cancellation_allowed)
-
-        # Not yet open
-        self.event.registration_start = (timezone.now() +
-                                         datetime.timedelta(hours=1))
-        self.event.registration_end = (timezone.now() +
-                                       datetime.timedelta(hours=2))
-        self.event.cancel_deadline = (timezone.now() +
-                                      datetime.timedelta(hours=1))
-        self.assertFalse(self.event.cancellation_allowed)
-
-        # Cancel only
-        self.event.registration_start = (timezone.now() -
-                                         datetime.timedelta(hours=2))
-        self.event.registration_end = (timezone.now() -
-                                       datetime.timedelta(hours=1))
-        self.event.cancel_deadline = (timezone.now() +
-                                      datetime.timedelta(hours=1))
-        self.assertTrue(self.event.cancellation_allowed)
-
-        # Registration is closed
-        self.event.registration_start = (timezone.now() -
-                                         datetime.timedelta(hours=2))
-        self.event.registration_end = (timezone.now() -
-                                       datetime.timedelta(hours=1))
-        self.event.cancel_deadline = (timezone.now() -
-                                      datetime.timedelta(hours=1))
-        # Allow since cancellation after deadline is possible
-        self.assertTrue(self.event.cancellation_allowed)
-
-        # Registration not needed
-        self.event.registration_start = None
-        self.event.registration_end = None
-        self.event.cancel_deadline = None
-        self.assertFalse(self.event.cancellation_allowed)
+        with self.subTest("Open"):
+            self.event.registration_start = (timezone.now() -
+                                             datetime.timedelta(hours=1))
+            self.event.registration_end = (timezone.now() +
+                                           datetime.timedelta(hours=1))
+            self.event.cancel_deadline = (timezone.now() +
+                                          datetime.timedelta(hours=1))
+            self.assertTrue(self.event.cancellation_allowed)
+
+        with self.subTest("No cancel"):
+            self.event.registration_start = (timezone.now() -
+                                             datetime.timedelta(hours=2))
+            self.event.registration_end = (timezone.now() +
+                                           datetime.timedelta(hours=1))
+            self.event.cancel_deadline = (timezone.now() -
+                                          datetime.timedelta(hours=1))
+            # Allow since cancellation after deadline is possible
+            self.assertTrue(self.event.cancellation_allowed)
+
+        with self.subTest("Not yet open (now < registration start)"):
+            self.event.registration_start = (timezone.now() +
+                                             datetime.timedelta(hours=1))
+            self.event.registration_end = (timezone.now() +
+                                           datetime.timedelta(hours=2))
+            self.event.cancel_deadline = (timezone.now() +
+                                          datetime.timedelta(hours=1))
+            self.assertFalse(self.event.cancellation_allowed)
+
+        with self.subTest("Cancel only"):
+            self.event.registration_start = (timezone.now() -
+                                             datetime.timedelta(hours=2))
+            self.event.registration_end = (timezone.now() -
+                                           datetime.timedelta(hours=1))
+            self.event.cancel_deadline = (timezone.now() +
+                                          datetime.timedelta(hours=1))
+            self.assertTrue(self.event.cancellation_allowed)
+
+        with self.subTest("Registration is closed"):
+            self.event.registration_start = (timezone.now() -
+                                             datetime.timedelta(hours=2))
+            self.event.registration_end = (timezone.now() -
+                                           datetime.timedelta(hours=1))
+            self.event.cancel_deadline = (timezone.now() -
+                                          datetime.timedelta(hours=1))
+            # Allow since cancellation after deadline is possible
+            self.assertTrue(self.event.cancellation_allowed)
+
+        with self.subTest("After event start"):
+            self.event.registration_start = (timezone.now() -
+                                             datetime.timedelta(hours=4))
+            self.event.registration_end = (timezone.now() -
+                                           datetime.timedelta(hours=3))
+            self.event.cancel_deadline = (timezone.now() -
+                                          datetime.timedelta(hours=3))
+            self.event.start = timezone.now()
+            self.event.end = (timezone.now() + datetime.timedelta(hours=2))
+            self.assertFalse(self.event.cancellation_allowed)
+
+        with self.subTest("Registration not required"):
+            self.event.registration_start = None
+            self.event.registration_end = None
+            self.event.cancel_deadline = None
+            self.assertFalse(self.event.cancellation_allowed)
 
 
 class RegistrationTest(TestCase):