Add waiting list

src/tests/base/test_models.py

@@ -13,7 +13,7 @@ from django.utils.timezone import now
 
 from pretix.base.models import (
     CachedFile, CartPosition, Event, Item, ItemCategory, ItemVariation, Order,
-    OrderPosition, Organizer, Question, Quota, User, Voucher,
+    OrderPosition, Organizer, Question, Quota, User, Voucher, WaitingListEntry,
 )
 from pretix.base.services.orders import (
     OrderError, cancel_order, mark_order_paid, perform_order,
@@ -316,6 +316,104 @@ class QuotaTestCase(BaseQuotaTestCase):
         self.assertEqual(self.quota.count_in_cart(), 1)
         self.assertEqual(self.item1.check_quotas(), (Quota.AVAILABILITY_OK, 1))
 
+    def test_waitinglist_item_active(self):
+        self.quota.items.add(self.item1)
+        self.quota.size = 1
+        self.quota.save()
+        WaitingListEntry.objects.create(
+            event=self.event, item=self.item1, email='foo@bar.com'
+        )
+        self.assertEqual(self.item1.check_quotas(), (Quota.AVAILABILITY_RESERVED, 0))
+        self.assertEqual(self.item1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+    def test_waitinglist_variation_active(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 1
+        self.quota.save()
+        WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_RESERVED, 0))
+        self.assertEqual(self.var1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+    def test_waitinglist_variation_fulfilled(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 1
+        self.quota.save()
+        v = Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, redeemed=1)
+        WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com', voucher=v
+        )
+        self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_OK, 1))
+        self.assertEqual(self.var1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+    def test_waitinglist_variation_other(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 1
+        self.quota.save()
+        WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var2, email='foo@bar.com'
+        )
+        self.assertEqual(self.var1.check_quotas(), (Quota.AVAILABILITY_OK, 1))
+        self.assertEqual(self.var1.check_quotas(count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+    def test_quota_cache(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 1
+        self.quota.save()
+        WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+
+        cache = {}
+
+        self.assertEqual(self.var1.check_quotas(_cache=cache), (Quota.AVAILABILITY_RESERVED, 0))
+
+        with self.assertNumQueries(1):
+            self.assertEqual(self.var1.check_quotas(_cache=cache), (Quota.AVAILABILITY_RESERVED, 0))
+
+        # Do not reuse cache for count_waitinglist=False
+        self.assertEqual(self.var1.check_quotas(_cache=cache, count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+        with self.assertNumQueries(1):
+            self.assertEqual(self.var1.check_quotas(_cache=cache, count_waitinglist=False), (Quota.AVAILABILITY_OK, 1))
+
+
+class WaitingListTestCase(BaseQuotaTestCase):
+
+    def test_duplicate(self):
+        w1 = WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        w1.clean()
+        w2 = WaitingListEntry(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        with self.assertRaises(ValidationError):
+            w2.clean()
+
+    def test_duplicate_of_successful(self):
+        v = Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, redeemed=1)
+        w1 = WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com',
+            voucher=v
+        )
+        w1.clean()
+        w2 = WaitingListEntry(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        w2.clean()
+
+    def test_missing_variation(self):
+        w2 = WaitingListEntry(
+            event=self.event, item=self.item2, email='foo@bar.com'
+        )
+        with self.assertRaises(ValidationError):
+            w2.clean()
+
+
+class VoucherTestCase(BaseQuotaTestCase):
+
     def test_voucher_reuse(self):
         self.quota.items.add(self.item1)
         v = Voucher.objects.create(quota=self.quota, event=self.event, valid_until=now() + timedelta(days=5))
@@ -396,9 +494,6 @@ class QuotaTestCase(BaseQuotaTestCase):
             v = Voucher(variation=self.var1, event=self.event)
             v.clean()
 
-
-class VoucherTestCase(BaseQuotaTestCase):
-
     def test_calculate_price_none(self):
         v = Voucher.objects.create(event=self.event, price_mode='none', value=Decimal('10.00'))
         v.calculate_price(Decimal('23.42')) == Decimal('23.42')

src/tests/base/test_waitinglist.py

@@ -0,0 +1,132 @@
+from django.core import mail as djmail
+from django.test import TestCase
+from django.utils.timezone import now
+
+from pretix.base.models import (
+    Event, Item, ItemVariation, Organizer, Quota, Voucher, WaitingListEntry,
+)
+from pretix.base.models.waitinglist import WaitingListException
+from pretix.base.services.waitinglist import (
+    assign_automatically, process_waitinglist,
+)
+
+
+class WaitingListTestCase(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        o = Organizer.objects.create(name='Dummy', slug='dummy')
+        cls.event = Event.objects.create(
+            organizer=o, name='Dummy', slug='dummy',
+            date_from=now(),
+        )
+
+    def setUp(self):
+        djmail.outbox = []
+        self.quota = Quota.objects.create(name="Test", size=2, event=self.event)
+        self.item1 = Item.objects.create(event=self.event, name="Ticket", default_price=23,
+                                         admission=True)
+        self.item2 = Item.objects.create(event=self.event, name="T-Shirt", default_price=23)
+        self.item3 = Item.objects.create(event=self.event, name="Goodie", default_price=23)
+        self.var1 = ItemVariation.objects.create(item=self.item2, value='S')
+        self.var2 = ItemVariation.objects.create(item=self.item2, value='M')
+        self.var3 = ItemVariation.objects.create(item=self.item3, value='Fancy')
+
+    def test_send_unavailable(self):
+        self.quota.items.add(self.item1)
+        self.quota.size = 0
+        self.quota.save()
+        wle = WaitingListEntry.objects.create(
+            event=self.event, item=self.item1, email='foo@bar.com'
+        )
+        with self.assertRaises(WaitingListException):
+            wle.send_voucher()
+
+    def test_send_double(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 1
+        self.quota.save()
+        v = Voucher.objects.create(quota=self.quota, event=self.event, block_quota=True, redeemed=1)
+        wle = WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com', voucher=v
+        )
+        with self.assertRaises(WaitingListException):
+            wle.send_voucher()
+
+    def test_send_variation(self):
+        wle = WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        wle.send_voucher()
+        wle.refresh_from_db()
+
+        assert wle.voucher
+        assert wle.voucher.item == wle.item
+        assert wle.voucher.variation == wle.variation
+        assert wle.email in wle.voucher.comment
+        assert wle.voucher.block_quota
+        assert wle.voucher.max_usages == 1
+        assert wle.voucher.event == self.event
+
+        assert len(djmail.outbox) == 1
+        assert djmail.outbox[0].to == [wle.email]
+
+    def test_send_custom_validity(self):
+        self.event.settings.set('waiting_list_hours', 24)
+        wle = WaitingListEntry.objects.create(
+            event=self.event, item=self.item2, variation=self.var1, email='foo@bar.com'
+        )
+        wle.send_voucher()
+        wle.refresh_from_db()
+
+        assert 3600 * 23 < (wle.voucher.valid_until - now()).seconds < 3600 * 24
+
+    def test_send_auto(self):
+        self.quota.variations.add(self.var1)
+        self.quota.size = 7
+        self.quota.save()
+        for i in range(10):
+            WaitingListEntry.objects.create(
+                event=self.event, item=self.item2, variation=self.var1, email='foo{}@bar.com'.format(i)
+            )
+            WaitingListEntry.objects.create(
+                event=self.event, item=self.item1, email='bar{}@bar.com'.format(i)
+            )
+
+        assign_automatically.apply(args=(self.event.pk,))
+        assert WaitingListEntry.objects.filter(voucher__isnull=True).count() == 3
+        assert Voucher.objects.count() == 17
+        assert sorted(list(WaitingListEntry.objects.filter(voucher__isnull=True).values_list('email', flat=True))) == [
+            'foo7@bar.com', 'foo8@bar.com', 'foo9@bar.com'
+        ]
+
+    def test_send_periodic(self):
+        self.event.settings.set('waiting_list_enabled', True)
+        self.event.settings.set('waiting_list_auto', True)
+        for i in range(5):
+            WaitingListEntry.objects.create(
+                event=self.event, item=self.item2, variation=self.var1, email='foo{}@bar.com'.format(i)
+            )
+        process_waitinglist(None)
+        assert Voucher.objects.count() == 5
+
+    def test_send_periodic_disabled(self):
+        self.event.settings.set('waiting_list_enabled', True)
+        self.event.settings.set('waiting_list_auto', False)
+        for i in range(5):
+            WaitingListEntry.objects.create(
+                event=self.event, item=self.item2, variation=self.var1, email='foo{}@bar.com'.format(i)
+            )
+        process_waitinglist(None)
+        assert WaitingListEntry.objects.filter(voucher__isnull=True).count() == 5
+        assert Voucher.objects.count() == 0
+
+    def test_send_periodic_disabled2(self):
+        self.event.settings.set('waiting_list_enabled', False)
+        self.event.settings.set('waiting_list_auto', True)
+        for i in range(5):
+            WaitingListEntry.objects.create(
+                event=self.event, item=self.item2, variation=self.var1, email='foo{}@bar.com'.format(i)
+            )
+        process_waitinglist(None)
+        assert WaitingListEntry.objects.filter(voucher__isnull=True).count() == 5
+        assert Voucher.objects.count() == 0

src/tests/control/test_permissions.py

@@ -67,6 +67,8 @@ event_urls = [
     "orders/ABC/contact",
     "orders/ABC/",
     "orders/",
+    "waitinglist/",
+    "waitinglist/auto_assign",
     "invoice/1",
 ]
 
@@ -154,6 +156,8 @@ event_permission_urls = [
     ("can_view_vouchers", "vouchers/tags/", 200),
     ("can_change_vouchers", "vouchers/1234/", 404),
     ("can_change_vouchers", "vouchers/1234/delete", 404),
+    ("can_view_orders", "waitinglist/", 200),
+    ("can_change_orders", "waitinglist/auto_assign", 405),
 ]
 
 

src/tests/control/test_views.py

@@ -123,6 +123,8 @@ def logged_in_client(client, event):
     ('/control/event/{orga}/{event}/orders/export/', 200),
     ('/control/event/{orga}/{event}/orders/go', 302),
     ('/control/event/{orga}/{event}/orders/', 200),
+    ('/control/event/{orga}/{event}/waitinglist/', 200),
+    ('/control/event/{orga}/{event}/waitinglist/auto_assign', 405),
 ])
 @pytest.mark.django_db
 def test_one_view(logged_in_client, url, expected, event, item, item_category, order, question, quota, voucher):

src/tests/control/test_waitinglist.py

@@ -0,0 +1,87 @@
+import pytest
+from django.utils.timezone import now
+
+from pretix.base.models import (
+    Event, EventPermission, Item, Organizer, Quota, User, Voucher,
+    WaitingListEntry,
+)
+from pretix.control.views.dashboards import waitinglist_widgets
+
+
+@pytest.fixture
+def env():
+    o = Organizer.objects.create(name='Dummy', slug='dummy')
+    event = Event.objects.create(
+        organizer=o, name='Dummy', slug='dummy',
+        date_from=now(), plugins='pretix.plugins.banktransfer,tests.testdummy'
+    )
+    event.settings.set('ticketoutput_testdummy__enabled', True)
+    user = User.objects.create_user('dummy@dummy.dummy', 'dummy')
+    item1 = Item.objects.create(event=event, name="Ticket", default_price=23,
+                                admission=True)
+    item2 = Item.objects.create(event=event, name="Ticket", default_price=23,
+                                admission=True)
+
+    for i in range(5):
+        WaitingListEntry.objects.create(
+            event=event, item=item1, email='foo{}@bar.com'.format(i)
+        )
+    v = Voucher.objects.create(item=item1, event=event, block_quota=True, redeemed=1)
+    WaitingListEntry.objects.create(
+        event=event, item=item1, email='success@example.org', voucher=v
+    )
+    WaitingListEntry.objects.create(
+        event=event, item=item2, email='item2@example.org'
+    )
+
+    EventPermission.objects.create(
+        event=event,
+        user=user,
+        can_view_orders=True,
+        can_change_orders=True
+    )
+    return event, user, o, item1
+
+
+@pytest.mark.django_db
+def test_list(client, env):
+    client.login(email='dummy@dummy.dummy', password='dummy')
+
+    response = client.get('/control/event/dummy/dummy/waitinglist/')
+    assert 'success@example.org' not in response.rendered_content
+    assert 'item2@example.org' in response.rendered_content
+    assert 'foo0@bar.com' in response.rendered_content
+    assert response.context['estimate'] == 23 * 6
+
+    response = client.get('/control/event/dummy/dummy/waitinglist/?status=a')
+    assert 'success@example.org' in response.rendered_content
+    assert 'foo0@bar.com' in response.rendered_content
+
+    response = client.get('/control/event/dummy/dummy/waitinglist/?status=s')
+    assert 'success@example.org' in response.rendered_content
+    assert 'foo0@bar.com' not in response.rendered_content
+
+    response = client.get('/control/event/dummy/dummy/waitinglist/?item=%d' % env[3].pk)
+    assert 'item2@example.org' not in response.rendered_content
+    assert 'foo0@bar.com' in response.rendered_content
+
+
+@pytest.mark.django_db
+def test_assign_single(client, env):
+    client.login(email='dummy@dummy.dummy', password='dummy')
+    wle = WaitingListEntry.objects.filter(voucher__isnull=True).last()
+
+    client.post('/control/event/dummy/dummy/waitinglist/', {
+        'assign': wle.pk
+    })
+    wle.refresh_from_db()
+    assert wle.voucher
+
+
+@pytest.mark.django_db
+def test_dashboard(client, env):
+    quota = Quota.objects.create(name="Test", size=2, event=env[0])
+    quota.items.add(env[3])
+    w = waitinglist_widgets(env[0])
+    assert '3' in w[0]['content']
+    assert '7' in w[1]['content']

src/tests/presale/test_event.py

@@ -9,7 +9,7 @@ from tests.base import SoupTest
 
 from pretix.base.models import (
     Event, EventPermission, Item, ItemCategory, ItemVariation, Order,
-    Organizer, Quota, User,
+    Organizer, Quota, User, WaitingListEntry,
 )
 
 
@@ -343,6 +343,72 @@ class VoucherRedeemItemDisplayTest(EventTestMixin, SoupTest):
         assert "alert-danger" in html.rendered_content
 
 
+class WaitingListTest(EventTestMixin, SoupTest):
+    def setUp(self):
+        super().setUp()
+        self.q = Quota.objects.create(event=self.event, name='Quota', size=0)
+        self.v = self.event.vouchers.create(quota=self.q)
+        self.item = Item.objects.create(event=self.event, name='Early-bird ticket', default_price=Decimal('12.00'),
+                                        active=True)
+        self.q.items.add(self.item)
+        self.event.settings.set('waiting_list_enabled', True)
+
+    def test_disabled(self):
+        self.event.settings.set('waiting_list_enabled', False)
+        response = self.client.get(
+            '/%s/%s/' % (self.orga.slug, self.event.slug)
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertNotIn('waitinglist', response.rendered_content)
+        response = self.client.get(
+            '/%s/%s/waitinglist?item=%d' % (self.orga.slug, self.event.slug, self.item.pk + 1)
+        )
+        self.assertEqual(response.status_code, 302)
+
+    def test_display_link(self):
+        response = self.client.get(
+            '/%s/%s/' % (self.orga.slug, self.event.slug)
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('waitinglist', response.rendered_content)
+
+    def test_submit_form(self):
+        response = self.client.get(
+            '/%s/%s/waitinglist?item=%d' % (self.orga.slug, self.event.slug, self.item.pk)
+        )
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('waiting list', response.rendered_content)
+        response = self.client.post(
+            '/%s/%s/waitinglist?item=%d' % (self.orga.slug, self.event.slug, self.item.pk), {
+                'email': 'foo@bar.com'
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+        wle = WaitingListEntry.objects.get(email='foo@bar.com')
+        assert wle.event == self.event
+        assert wle.item == self.item
+        assert wle.variation is None
+        assert wle.voucher is None
+        assert wle.locale == 'en'
+
+    def test_invalid_item(self):
+        response = self.client.get(
+            '/%s/%s/waitinglist?item=%d' % (self.orga.slug, self.event.slug, self.item.pk + 1)
+        )
+        self.assertEqual(response.status_code, 302)
+
+    def test_available(self):
+        self.q.size = 1
+        self.q.save()
+        response = self.client.post(
+            '/%s/%s/waitinglist?item=%d' % (self.orga.slug, self.event.slug, self.item.pk), {
+                'email': 'foo@bar.com'
+            }
+        )
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(WaitingListEntry.objects.filter(email='foo@bar.com').exists())
+
+
 class DeadlineTest(EventTestMixin, TestCase):
     def setUp(self):
         super().setUp()