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

API: Fix using invoice address attributes in "include"

Browse Source
This commit is contained in:
Raphael Michel
2022-12-16 15:23:20 +01:00
parent 8dd83e5a35
commit 6a4b792501
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pretix/api/serializers/order.py
View File

@@ -636,7 +636,7 @@ class OrderSerializer(I18nAwareModelSerializer):
for fname, field in list(self.fields.items()):
if fname in includes:
continue
elif hasattr(field, 'child'):
elif hasattr(field, 'child'): # Nested list serializers
found_any = False
for childfname, childfield in list(field.child.fields.items()):
if f'{fname}.{childfname}' not in includes:
@@ -645,6 +645,15 @@ class OrderSerializer(I18nAwareModelSerializer):
found_any = True
if not found_any:
self.fields.pop(fname)
elif isinstance(field, serializers.Serializer): # Nested serializers
found_any = False
for childfname, childfield in list(field.fields.items()):
if f'{fname}.{childfname}' not in includes:
field.fields.pop(childfname)
else:
found_any = True
if not found_any:
self.fields.pop(fname)
else:
self.fields.pop(fname)

10
src/tests/api/test_orders.py
View File

@@ -479,15 +479,19 @@ def test_include_exclude_fields(token_client, organizer, event, order, item, tax
assert 'url' not in resp.data
assert 'positions' not in resp.data
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/{}/?include=email&include=positions&exclude=positions.secret'.format(
organizer.slug, event.slug, order.code
))
resp = token_client.get(
'/api/v1/organizers/{}/events/{}/orders/{}/?include=email&include=positions&include=invoice_address.name&exclude=positions.secret'.format(
organizer.slug, event.slug, order.code
)
)
assert resp.status_code == 200
assert 'email' in resp.data
assert 'url' not in resp.data
assert 'positions' in resp.data
assert 'subevent' in resp.data['positions'][0]
assert 'secret' not in resp.data['positions'][0]
assert 'city' not in resp.data['invoice_address']
assert 'name' in resp.data['invoice_address']
resp = token_client.get('/api/v1/organizers/{}/events/{}/orders/{}/?include=email&include=positions.subevent'.format(
organizer.slug, event.slug, order.code