CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Prepare the pretixdroid API for an async mode in the app

Browse Source
This commit is contained in:
Raphael Michel
2017-05-03 18:06:32 +02:00
parent c45b709d54
commit dc32bdc474
4 changed files with 97 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/plugins/pretixdroid/signals.py
View File

@@ -1,7 +1,9 @@
import json
import dateutil.parser
from django.core.urlresolvers import resolve, reverse
from django.dispatch import receiver
from django.utils.formats import date_format
from django.utils.translation import ugettext_lazy as _
from pretix.base.signals import logentry_display
@@ -37,6 +39,14 @@ def pretixcontrol_logentry_display(sender, logentry, **kwargs):
posid=data.get('positionid')
))
else:
if data.get('forced'):
return _(
'A scan for position #{posid} at {datetime} has been uploaded even though it has '
'been scanned already.'.format(
posid=data.get('positionid'),
datetime=date_format(dateutil.parser.parse(data.get('datetime')), "SHORT_DATETIME_FORMAT")
)
)
return _('Position #{posid} has been scanned and rejected because it has already been scanned before.'.format(
posid=data.get('positionid')
))

2
src/pretix/plugins/pretixdroid/urls.py
View File

@@ -9,6 +9,8 @@ urlpatterns = [
name='api.redeem'),
url(r'^pretixdroid/api/(?P<organizer>[^/]+)/(?P<event>[^/]+)/search/', views.ApiSearchView.as_view(),
name='api.search'),
url(r'^pretixdroid/api/(?P<organizer>[^/]+)/(?P<event>[^/]+)/download/', views.ApiDownloadView.as_view(),
name='api.download'),
url(r'^pretixdroid/api/(?P<organizer>[^/]+)/(?P<event>[^/]+)/status/', views.ApiStatusView.as_view(),
name='api.status'),
]

62
src/pretix/plugins/pretixdroid/views.py
View File

@@ -2,6 +2,7 @@ import json
import logging
import string
import dateutil.parser
from django.db import transaction
from django.db.models import Count, Q
from django.http import (
@@ -9,6 +10,7 @@ from django.http import (
)
from django.utils.crypto import get_random_string
from django.utils.decorators import method_decorator
from django.utils.timezone import now
from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView, View
@@ -67,10 +69,16 @@ class ApiView(View):
class ApiRedeemView(ApiView):
def post(self, request, **kwargs):
secret = request.POST.get('secret', '!INVALID!')
force = request.POST.get('force', 'false') in ('true', 'True')
response = {
'version': API_VERSION
}
if 'datetime' in request.POST:
dt = dateutil.parser.parse(request.POST.get('datetime'))
else:
dt = now()
try:
with transaction.atomic():
created = False
@@ -79,6 +87,9 @@ class ApiRedeemView(ApiView):
)
if op.order.status == Order.STATUS_PAID:
ci, created = Checkin.objects.get_or_create(position=op)
if created and 'datetime' in request.POST:
ci.datetime = dt
ci.save()
else:
response['status'] = 'error'
response['reason'] = 'unpaid'
@@ -90,14 +101,21 @@ class ApiRedeemView(ApiView):
'position': op.id,
'positionid': op.positionid,
'first': True,
'forced': False,
'datetime': dt,
})
else:
response['status'] = 'error'
response['reason'] = 'already_redeemed'
if force:
response['status'] = 'ok'
else:
response['status'] = 'error'
response['reason'] = 'already_redeemed'
op.order.log_action('pretix.plugins.pretixdroid.scan', data={
'position': op.id,
'positionid': op.positionid,
'first': False,
'forced': force,
'datetime': dt,
})
response['data'] = {
@@ -115,6 +133,18 @@ class ApiRedeemView(ApiView):
return JsonResponse(response)
def serialize_op(op):
return {
'secret': op.secret,
'order': op.order.code,
'item': str(op.item),
'variation': str(op.variation) if op.variation else None,
'attendee_name': op.attendee_name or (op.addon_to.attendee_name if op.addon_to else ''),
'redeemed': bool(op.checkin_cnt),
'paid': op.order.status == Order.STATUS_PAID,
}
class ApiSearchView(ApiView):
def get(self, request, **kwargs):
query = request.GET.get('query', '!INVALID!')
@@ -128,25 +158,29 @@ class ApiSearchView(ApiView):
& Q(
Q(secret__istartswith=query) | Q(attendee_name__icontains=query) | Q(order__code__istartswith=query)
)
).prefetch_related('checkins')[:25]
).annotate(checkin_cnt=Count('checkins'))[:25]
response['results'] = [
{
'secret': op.secret,
'order': op.order.code,
'item': str(op.item),
'variation': str(op.variation) if op.variation else None,
'attendee_name': op.attendee_name or (op.addon_to.attendee_name if op.addon_to else ''),
'redeemed': bool(op.checkins.all()),
'paid': op.order.status == Order.STATUS_PAID,
} for op in ops
]
response['results'] = [serialize_op(op) for op in ops]
else:
response['results'] = []
return JsonResponse(response)
class ApiDownloadView(ApiView):
def get(self, request, **kwargs):
response = {
'version': API_VERSION
}
ops = OrderPosition.objects.select_related('item', 'variation', 'order').filter(
Q(order__event=self.event)
).annotate(checkin_cnt=Count('checkins'))
response['results'] = [serialize_op(op) for op in ops]
return JsonResponse(response)
class ApiStatusView(ApiView):
def get(self, request, **kwargs):
response = {

37
src/tests/plugins/test_pretixdroid.py
View File

@@ -56,6 +56,18 @@ def test_flush_key(client, env):
env[0].settings.get('pretixdroid_key') != 'abcdefg'
@pytest.mark.django_db
def test_custom_datetime(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')
dt = now() - timedelta(days=1)
resp = client.post('/pretixdroid/api/%s/%s/redeem/?key=%s' % (env[0].organizer.slug, env[0].slug, 'abcdefg'),
data={'secret': '1234', 'datetime': dt.isoformat()})
jdata = json.loads(resp.content.decode("utf-8"))
assert jdata['version'] == 2
assert jdata['status'] == 'ok'
assert Checkin.objects.last().datetime == dt
@pytest.mark.django_db
def test_only_once(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')
@@ -72,6 +84,21 @@ def test_only_once(client, env):
assert jdata['reason'] == 'already_redeemed'
@pytest.mark.django_db
def test_forced_multiple(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')
resp = client.post('/pretixdroid/api/%s/%s/redeem/?key=%s' % (env[0].organizer.slug, env[0].slug, 'abcdefg'),
data={'secret': '1234'})
jdata = json.loads(resp.content.decode("utf-8"))
assert jdata['version'] == 2
assert jdata['status'] == 'ok'
resp = client.post('/pretixdroid/api/%s/%s/redeem/?key=%s' % (env[0].organizer.slug, env[0].slug, 'abcdefg'),
data={'secret': '1234', 'force': 'true'})
jdata = json.loads(resp.content.decode("utf-8"))
assert jdata['status'] == 'ok'
@pytest.mark.django_db
def test_require_paid(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')
@@ -120,6 +147,16 @@ def test_search(client, env):
assert jdata['results'][0]['secret'] == '5678910'
@pytest.mark.django_db
def test_download_all_data(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')
resp = client.get('/pretixdroid/api/%s/%s/download/?key=%s' % (env[0].organizer.slug, env[0].slug, 'abcdefg'))
jdata = json.loads(resp.content.decode("utf-8"))
assert len(jdata['results']) == 2
assert jdata['results'][0]['secret'] == '1234'
assert jdata['results'][1]['secret'] == '5678910'
@pytest.mark.django_db
def test_status(client, env):
env[0].settings.set('pretixdroid_key', 'abcdefg')